← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/sql_yacc.yy

Merged Eric from lp:~eday/drizzle/eday-merge

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/sql_yacc.yy
5233
5233
        | ident '.' ident '.' '*'
5234
5234
          {
5235
5235
            Select_Lex *sel= Lex->current_select;
5236
 
            $$ = new Item_field(Lex->current_context(), (YYSession->client_capabilities &
5237
 
                                CLIENT_NO_SCHEMA ? NULL : $1.str),
5238
 
                                $3.str,"*");
 
5236
            $$ = new Item_field(Lex->current_context(), $1.str, $3.str,"*");
5239
5237
            sel->with_wild++;
5240
5238
          }
5241
5239
        ;
5323
5321
            }
5324
5322
            $$= (sel->parsing_place != IN_HAVING ||
5325
5323
                sel->get_in_sum_expr() > 0) ?
5326
 
                (Item*) new Item_field(Lex->current_context(),
5327
 
                                       (YYSession->client_capabilities &
5328
 
                                       CLIENT_NO_SCHEMA ? NULL : $1.str),
5329
 
                                       $3.str, $5.str) :
5330
 
                (Item*) new Item_ref(Lex->current_context(),
5331
 
                                     (YYSession->client_capabilities &
5332
 
                                     CLIENT_NO_SCHEMA ? NULL : $1.str),
5333
 
                                     $3.str, $5.str);
 
5324
                (Item*) new Item_field(Lex->current_context(), $1.str, $3.str,
 
5325
                                       $5.str) :
 
5326
                (Item*) new Item_ref(Lex->current_context(), $1.str, $3.str,
 
5327
                                     $5.str);
5334
5328
          }
5335
5329
        ;
5336
5330
 
5369
5363
 
5370
5364
table_ident:
5371
5365
          ident { $$=new Table_ident($1); }
5372
 
        | ident '.' ident { $$=new Table_ident(YYSession, $1,$3,0);}
 
5366
        | ident '.' ident { $$=new Table_ident($1,$3);}
5373
5367
        | '.' ident { $$=new Table_ident($2);} /* For Delphi */
5374
5368
        ;
5375
5369