← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/sql_yacc.yy

  • Committer: Olaf van der Spek
  • Date: 2011-06-21 15:57:11 UTC
  • mto: This revision was merged to the branch mainline in revision 2346.
  • Revision ID: olafvdspek@gmail.com-20110621155711-98dr7fyae01qdbu6
Refactor

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/sql_yacc.yy
1148
1148
row_format_or_text:
1149
1149
          row_format
1150
1150
          {
1151
 
            $$.str= YYSession->mem.strmake_root($1.str, $1.length);
 
1151
            $$.str= YYSession->mem.strmake($1.str, $1.length);
1152
1152
            $$.length= $1.length;
1153
1153
          }
1154
1154
        ;
3569
3569
                sel->master_unit()->global_parameters=
3570
3570
                   sel->master_unit()->fake_select_lex;
3571
3571
            }
3572
 
            if ($2->init_nested_join(Lex.session))
3573
 
              DRIZZLE_YYABORT;
 
3572
            $2->init_nested_join(*Lex.session);
3574
3573
            $$= 0;
3575
3574
            /* incomplete derived tables return NULL, we must be
3576
3575
               nested in select_derived rule to be here. */
3691
3690
select_derived:
3692
3691
          get_select_lex
3693
3692
          {
3694
 
            if ($1->init_nested_join(Lex.session))
3695
 
              DRIZZLE_YYABORT;
 
3693
            $1->init_nested_join(*Lex.session);
3696
3694
          }
3697
3695
          derived_table_list
3698
3696
          {
5201
5199
          IDENT_sys    { $$=$1; }
5202
5200
        | keyword
5203
5201
          {
5204
 
            $$.str= YYSession->mem.strmake_root($1.str, $1.length);
 
5202
            $$.str= YYSession->mem.strmake($1.str, $1.length);
5205
5203
            $$.length= $1.length;
5206
5204
          }
5207
5205
        ;
5483
5481
internal_variable_ident:
5484
5482
          keyword_exception_for_variable
5485
5483
          {
5486
 
            $$.str= YYSession->mem.strmake_root($1.str, $1.length);
 
5484
            $$.str= YYSession->mem.strmake($1.str, $1.length);
5487
5485
            $$.length= $1.length;
5488
5486
          }
5489
5487
        | IDENT_sys    { $$=$1; }