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

merge 5.1 => 5.5

Browse Source
This commit is contained in:
Tor Didriksen 2012-09-05 17:43:58 +02:00
commit 775b1aebc2
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
sql/sql_show.cc
View File

@ -3155,8 +3155,9 @@ end:
/* Restore original LEX value, statement's arena and THD arena values. */ /* Restore original LEX value, statement's arena and THD arena values. */
lex_end(thd->lex); lex_end(thd->lex);
if (i_s_arena.free_list) // Free items, before restoring backup_arena below.
i_s_arena.free_items(); DBUG_ASSERT(i_s_arena.free_list == NULL);
thd->free_items();
/* /*
For safety reset list of open temporary tables before closing For safety reset list of open temporary tables before closing