diff options
author | unknown <gluh@mysql.com/eagle.(none)> | 2007-02-26 16:57:45 +0400 |
---|---|---|
committer | unknown <gluh@mysql.com/eagle.(none)> | 2007-02-26 16:57:45 +0400 |
commit | de5d4e32fbd82ad4bb3749920d5c779f8eba8ec6 (patch) | |
tree | ce94fd69807e8bbcf533f566abc9f22a2a3a72cf /sql/sql_union.cc | |
parent | 8c336fbc46fd3e8d1a7cc073883270c5a2ac3cc8 (diff) | |
parent | 90d4f80922c7f8873ed8c415303f8d7276f5e32d (diff) | |
download | mariadb-git-de5d4e32fbd82ad4bb3749920d5c779f8eba8ec6.tar.gz |
Merge mysql.com:/home/gluh/MySQL/Merge/5.0
into mysql.com:/home/gluh/MySQL/Merge/5.0-opt
sql/item.cc:
Auto merged
sql/item.h:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/sql_base.cc:
Auto merged
sql/sql_insert.cc:
Auto merged
sql/sql_lex.cc:
Auto merged
sql/sql_lex.h:
Auto merged
sql/sql_prepare.cc:
Auto merged
sql/sql_select.cc:
Auto merged
sql/sql_union.cc:
Auto merged
sql/sql_update.cc:
Auto merged
sql/sql_yacc.yy:
Auto merged
Diffstat (limited to 'sql/sql_union.cc')
-rw-r--r-- | sql/sql_union.cc | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/sql/sql_union.cc b/sql/sql_union.cc index c94a7e17e59..16df0059217 100644 --- a/sql/sql_union.cc +++ b/sql/sql_union.cc @@ -147,6 +147,8 @@ 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->get_table_list(); for (ORDER *order= (ORDER *)global_parameters->order_list.first; order; order=order->next) |