1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixed a problem of merge from mysql-5.1 baseline.

Browse Source
This commit is contained in:
Igor Babaev 2010-04-08 13:55:17 -07:00
parent 4a4627104d
commit 5b8c42d91d
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
sql/sql_select.cc
View File

@ -2335,7 +2335,13 @@ JOIN::destroy()
tab->cleanup(); tab->cleanup();
} }
tmp_join->tmp_join= 0; tmp_join->tmp_join= 0;
/*
We need to clean up tmp_table_param for reusable JOINs (having non-zero
and different from self tmp_join) because it's not being cleaned up
anywhere else (as we need to keep the join is reusable).
*/
tmp_table_param.cleanup(); tmp_table_param.cleanup();
tmp_join->tmp_table_param.copy_field= 0;
DBUG_RETURN(tmp_join->destroy()); DBUG_RETURN(tmp_join->destroy());
} }
cond_equal= 0; cond_equal= 0;