← Back to branch summary

~mdcallag/+junk/5.1-map

« back to all changes in this revision

Viewing changes to sql/sql_union.cc

  • Committer: msvensson at pilot
  • Date: 2007-04-24 09:11:45 UTC
  • mfrom: (2469.1.106)
  • Revision ID: sp1r-msvensson@pilot.blaudden-20070424091145-10463
Merge pilot.blaudden:/home/msvensson/mysql/my51-m-mysql_upgrade
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint

Show diffs side-by-side

added added

removed removed

Lines of Context:
sql/sql_union.cc
623
623
      join->tables= 0;
624
624
    }
625
625
    error|= fake_select_lex->cleanup();
 
626
    if (fake_select_lex->order_list.elements)
 
627
    {
 
628
      ORDER *ord;
 
629
      for (ord= (ORDER*)fake_select_lex->order_list.first; ord; ord= ord->next)
 
630
        (*ord->item)->cleanup();
 
631
    }
626
632
  }
627
633
 
628
634
  DBUG_RETURN(error);
739
745
    error= (bool) ((uint) error | (uint) lex_unit->cleanup());
740
746
  }
741
747
  non_agg_fields.empty();
 
748
  inner_refs_list.empty();
742
749
  DBUG_RETURN(error);
743
750
}
744
751