← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/sql_union.cc

  • Committer: Lee Bieber
  • Date: 2011-02-18 23:49:00 UTC
  • mfrom: (2182.1.4 build)
  • Revision ID: kalebral@gmail.com-20110218234900-7zxzvw9x7e7zwflr
Merge Brian - add safe_delete()
Merge Stewart - 720552: doStartIndexScan return code ignored in optimizer::sum_query() for MIN() optimization 
Merge Olaf - add register keyword
Merge Patrick - 720813: syntax error in dbqp that is breaking it

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/sql_union.cc
610
610
 
611
611
  if (union_result)
612
612
  {
613
 
    delete union_result;
614
 
    union_result=0; // Safety
 
613
    safe_delete(union_result);
615
614
    table= 0; // Safety
616
615
  }
617
616
 
713
712
  {
714
713
    assert((Select_Lex*)join->select_lex == this);
715
714
    error= join->destroy();
716
 
    delete join;
717
 
    join= 0;
 
715
    safe_delete(join);
718
716
  }
719
717
  for (Select_Lex_Unit *lex_unit= first_inner_unit(); lex_unit ;
720
718
       lex_unit= lex_unit->next_unit())