diff options
| author | Tor Didriksen <tor.didriksen@oracle.com> | 2012-09-05 17:43:58 +0200 |
|---|---|---|
| committer | Tor Didriksen <tor.didriksen@oracle.com> | 2012-09-05 17:43:58 +0200 |
| commit | e7f38f11ebef5cb23a0b2665df8c008054d643d3 (patch) | |
| tree | 70b5d580206d5f4042b163d43faec32180e23ca5 | |
| parent | 9d41d7c57b4566b86ef2b623ed93ada50a359781 (diff) | |
| parent | 50e8ac0b831f9cc02bdc7cbe3b465c295b453d5d (diff) | |
| download | mariadb-git-e7f38f11ebef5cb23a0b2665df8c008054d643d3.tar.gz | |
merge 5.1 => 5.5
| -rw-r--r-- | sql/sql_show.cc | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/sql/sql_show.cc b/sql/sql_show.cc index e9873d2325f..6c940661763 100644 --- a/sql/sql_show.cc +++ b/sql/sql_show.cc @@ -3155,8 +3155,9 @@ end: /* Restore original LEX value, statement's arena and THD arena values. */ lex_end(thd->lex); - if (i_s_arena.free_list) - i_s_arena.free_items(); + // Free items, before restoring backup_arena below. + DBUG_ASSERT(i_s_arena.free_list == NULL); + thd->free_items(); /* For safety reset list of open temporary tables before closing |