diff options
| author | unknown <Sinisa@sinisa.nasamreza.org> | 2004-02-11 19:15:02 +0200 |
|---|---|---|
| committer | unknown <Sinisa@sinisa.nasamreza.org> | 2004-02-11 19:15:02 +0200 |
| commit | 8c225bca9682f1fdc02e9660cddef5f263a71d41 (patch) | |
| tree | 2d334f1117c6263ed219332515c5925f2b2399bf /sql/sql_union.cc | |
| parent | f2753fe9ac04edac1e8b968d29e77178b4e8c0a5 (diff) | |
| parent | 425ae9185d10c61b2b2b22e551dd9f96927b8efb (diff) | |
| download | mariadb-git-8c225bca9682f1fdc02e9660cddef5f263a71d41.tar.gz | |
merge fixes
sql/sql_class.h:
Auto merged
sql/sql_select.cc:
Auto merged
sql/sql_table.cc:
Auto merged
sql/sql_union.cc:
Auto merged
Diffstat (limited to 'sql/sql_union.cc')
| -rw-r--r-- | sql/sql_union.cc | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/sql/sql_union.cc b/sql/sql_union.cc index 75fd9be88bd..f2e9016aec3 100644 --- a/sql/sql_union.cc +++ b/sql/sql_union.cc @@ -206,6 +206,7 @@ int st_select_lex_unit::prepare(THD *thd_arg, select_result *sel_result, if (first_select->next_select()) { union_result->tmp_table_param.field_count= types.elements; + union_result->tmp_table_param.all_nulls= true; if (!(table= create_tmp_table(thd_arg, &union_result->tmp_table_param, types, (ORDER*) 0, !union_option, 1, @@ -315,6 +316,7 @@ int st_select_lex_unit::exec() if it use same tables */ uint tablenr=0; + ulong query_id= thd->query_id; for (TABLE_LIST *table_list= (TABLE_LIST*) sl->table_list.first; table_list; table_list= table_list->next, tablenr++) @@ -329,6 +331,8 @@ int st_select_lex_unit::exec() */ setup_table_map(table_list->table, table_list, tablenr); } + for (unsigned int i=0; i < table_list->table->fields; i++) + table_list->table->field[i]->query_id= query_id; } res= sl->join->optimize(); } |