Commit 25f5e7d9 authored by igor@olga.mysql.com's avatar igor@olga.mysql.com
Browse files

Merge olga.mysql.com:/home/igor/dev-opt/mysql-4.1-opt-bug27937 

into  olga.mysql.com:/home/igor/dev-opt/mysql-5.0-opt-bug27937
parents 10ab9144 d71043b8

sql/sql_union.cc

+9 −1
Original line number Diff line number Diff line
@@ -147,8 +147,16 @@ st_select_lex_unit::init_prepare_fake_select_lex(THD *thd_arg) 
  fake_select_lex->table_list.link_in_list((byte *)&result_table_list,

					   (byte **)

					   &result_table_list.next_local);

  fake_select_lex->context.table_list= fake_select_lex->context.first_name_resolution_table= 

  fake_select_lex->context.table_list= 

    fake_select_lex->context.first_name_resolution_table= 

    fake_select_lex->get_table_list();

  if (!fake_select_lex->first_execution)

  {

    for (ORDER *order= (ORDER *) global_parameters->order_list.first;

         order;

         order= order->next)

      order->item= &order->item_ptr;

  }

  for (ORDER *order= (ORDER *)global_parameters->order_list.first;

       order;

       order=order->next)