diff options
| author | Seppo Jaakola <seppo.jaakola@codership.com> | 2012-11-30 13:36:29 +0200 |
|---|---|---|
| committer | Seppo Jaakola <seppo.jaakola@codership.com> | 2012-11-30 13:36:29 +0200 |
| commit | 4df29fef362389f3fe64da4880af7050396baa94 (patch) | |
| tree | 473488ed8a09fc3cc857fbfa1872013cfeaf8c52 /sql/sql_show.cc | |
| parent | fc6cd855e9dd1b89a45f6584b3bd21ddc1f60607 (diff) | |
| parent | 7c5f62a313d7dd3047ed29f4007c73b53541c482 (diff) | |
| download | mariadb-git-4df29fef362389f3fe64da4880af7050396baa94.tar.gz | |
References: lp:1066784 - Merged with MariaDB 5.5.28a
bzr merge -r tag:mariadb-5.5.28a lp:maria/5.5
...no conflicts
Diffstat (limited to 'sql/sql_show.cc')
| -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 1952a0c58b3..d585521fc99 100644 --- a/sql/sql_show.cc +++ b/sql/sql_show.cc @@ -3883,8 +3883,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 |