~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/sql_parse.cc

  • Committer: Olaf van der Spek
  • Date: 2011-06-24 15:25:06 UTC
  • mto: This revision was merged to the branch mainline in revision 2349.
  • Revision ID: olafvdspek@gmail.com-20110624152506-zivk37gp51e9w84u
Refactor

Show diffs side-by-side

added added

removed removed

Lines of Context:
666
666
  if (lex->nest_level > (int) MAX_SELECT_NESTING)
667
667
  {
668
668
    my_error(ER_TOO_HIGH_LEVEL_OF_NESTING_FOR_SELECT,MYF(0),MAX_SELECT_NESTING);
669
 
    return(1);
 
669
    return 1;
670
670
  }
671
671
 
672
672
  select_lex->nest_level= lex->nest_level;
675
675
    Select_Lex_Unit *unit;
676
676
    /* first select_lex of subselect or derived table */
677
677
    if (!(unit= new (session->mem_root) Select_Lex_Unit()))
678
 
      return(1);
 
678
      return 1;
679
679
 
680
680
    unit->init_query();
681
681
    unit->init_select();
1280
1280
  assert(!fake_select_lex);
1281
1281
 
1282
1282
  if (!(fake_select_lex= new (session_arg->mem_root) Select_Lex()))
1283
 
      return(1);
 
1283
      return 1;
1284
1284
  fake_select_lex->include_standalone(this,
1285
1285
                                      (Select_Lex_Node**)&fake_select_lex);
1286
1286
  fake_select_lex->select_number= INT_MAX;