database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-07 00:04:31 +03:00
Code Activity

Merge fixes

Browse Source
This commit is contained in:
Sinisa@sinisa.nasamreza.org
2003-08-27 15:32:52 +03:00
parent deae76be75
commit 375b9aec15
1 changed files with 25 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
sql/sql_union.cc
View File

@@ -185,8 +185,6 @@ int st_select_lex_unit::prepare(THD *thd, select_result *sel_result,
union_result->not_describe=1;
union_result->tmp_table_param=tmp_table_param;
for (SELECT_LEX *sl= select_cursor; sl; sl= sl->next_select())
{
for (SELECT_LEX *sl= select_cursor; sl; sl= sl->next_select())
{
JOIN *join= new JOIN(thd, sl->item_list,
@@ -215,7 +213,6 @@ int st_select_lex_unit::prepare(THD *thd, select_result *sel_result,
if (res || thd->is_fatal_error)
goto err;
}
}
item_list.empty();
thd->lex.current_select= lex_select_save;