diff options
| author | unknown <igor@olga.mysql.com> | 2007-05-14 17:06:05 -0700 |
|---|---|---|
| committer | unknown <igor@olga.mysql.com> | 2007-05-14 17:06:05 -0700 |
| commit | 7a02ef7d92681d558405caa27f287156e8c71a18 (patch) | |
| tree | a6386736ed9dc993385103a41fcbf92fc7ed1539 /sql/sql_union.cc | |
| parent | 879a0a746784264bb9710101796a45e61ed646eb (diff) | |
| parent | fca58c95566c5a7bf8abf7386aa2b03890d85e05 (diff) | |
| download | mariadb-git-7a02ef7d92681d558405caa27f287156e8c71a18.tar.gz | |
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
mysql-test/r/ps.result:
Manual merge
mysql-test/t/ps.test:
Manual merge
sql/sql_union.cc:
Manual merge
Diffstat (limited to 'sql/sql_union.cc')
| -rw-r--r-- | sql/sql_union.cc | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/sql/sql_union.cc b/sql/sql_union.cc index 7fb75732012..373b03d45e6 100644 --- a/sql/sql_union.cc +++ b/sql/sql_union.cc @@ -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) |