← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/sql_union.cc

  • Committer: Mark Atwood
  • Date: 2011-06-27 19:01:37 UTC
  • mfrom: (2318.6.90 refactor16)
  • Revision ID: me@mark.atwood.name-20110627190137-iflt3vku0kw77l8a
merge lp:~olafvdspek/drizzle/refactor17

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/sql_union.cc
242
242
 
243
243
  if (is_union_select)
244
244
  {
245
 
    if (!(tmp_result= union_result= new select_union))
246
 
      goto err;
 
245
    tmp_result= union_result= new select_union;
247
246
    if (describe)
248
247
      tmp_result= sel_result;
249
248
  }
522
521
          don't let it allocate the join. Perhaps this is because we need
523
522
          some special parameter values passed to join constructor?
524
523
        */
525
 
        if (!(fake_select_lex->join= new Join(session, item_list,
526
 
                                              fake_select_lex->options, result)))
527
 
        {
528
 
          fake_select_lex->table_list.clear();
529
 
          return true;
530
 
        }
531
 
        fake_select_lex->join->no_const_tables= true;
 
524
        fake_select_lex->join= new Join(session, item_list, fake_select_lex->options, result);
 
525
  fake_select_lex->join->no_const_tables= true;
532
526
 
533
527
        /*
534
528
          Fake Select_Lex should have item list for correctref_array