database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

fix of the small bug in UNION's

Browse Source 
mysql-test/r/heap_btree.result:
  I donno why this changed, aint my fault
sql/sql_union.cc:
  fix of the small bug
This commit is contained in:
unknown
2002-10-16 22:27:47 +03:00
parent 61122db525
commit 620b2e6e8b
2 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
sql/sql_union.cc
View File

@ -109,7 +109,7 @@ int st_select_lex_unit::prepare(THD *thd, select_result *result)
if (prepared)
DBUG_RETURN(0);
prepared= 1;
union_result=0;
describe=(first_select()->options & SELECT_DESCRIBE) ? 1 : 0;
res= 0;
found_rows_for_union= false;
@ -309,10 +309,12 @@ int st_select_lex_unit::exec()
int st_select_lex_unit::cleanup()
{
DBUG_ENTER("st_select_lex_unit::cleanup");
delete union_result;
free_tmp_table(thd,table);
table= 0; // Safety
if (union_result)
{
delete union_result;
free_tmp_table(thd,table);
table= 0; // Safety
}
List_iterator<JOIN*> j(joins);
JOIN** join;
while ((join= j++))