← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/sql_yacc.yy

  • Committer: Brian Aker
  • Date: 2009-08-11 20:22:59 UTC
  • mfrom: (1093.1.59 captain)
  • Revision ID: brian@gaz-20090811202259-5a92huu2yqmzdx1u
MErge Jay

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/sql_yacc.yy
5284
5284
        | ident '.' ident '.' '*'
5285
5285
          {
5286
5286
            Select_Lex *sel= Lex->current_select;
5287
 
            $$ = new Item_field(Lex->current_context(), (YYSession->client_capabilities &
5288
 
                                CLIENT_NO_SCHEMA ? NULL : $1.str),
5289
 
                                $3.str,"*");
 
5287
            $$ = new Item_field(Lex->current_context(), $1.str, $3.str,"*");
5290
5288
            sel->with_wild++;
5291
5289
          }
5292
5290
        ;
5374
5372
            }
5375
5373
            $$= (sel->parsing_place != IN_HAVING ||
5376
5374
                sel->get_in_sum_expr() > 0) ?
5377
 
                (Item*) new Item_field(Lex->current_context(),
5378
 
                                       (YYSession->client_capabilities &
5379
 
                                       CLIENT_NO_SCHEMA ? NULL : $1.str),
5380
 
                                       $3.str, $5.str) :
5381
 
                (Item*) new Item_ref(Lex->current_context(),
5382
 
                                     (YYSession->client_capabilities &
5383
 
                                     CLIENT_NO_SCHEMA ? NULL : $1.str),
5384
 
                                     $3.str, $5.str);
 
5375
                (Item*) new Item_field(Lex->current_context(), $1.str, $3.str,
 
5376
                                       $5.str) :
 
5377
                (Item*) new Item_ref(Lex->current_context(), $1.str, $3.str,
 
5378
                                     $5.str);
5385
5379
          }
5386
5380
        ;
5387
5381
 
5420
5414
 
5421
5415
table_ident:
5422
5416
          ident { $$=new Table_ident($1); }
5423
 
        | ident '.' ident { $$=new Table_ident(YYSession, $1,$3,0);}
 
5417
        | ident '.' ident { $$=new Table_ident($1,$3);}
5424
5418
        | '.' ident { $$=new Table_ident($2);} /* For Delphi */
5425
5419
        ;
5426
5420