diff options
| author | Igor Babaev <igor@askmonty.org> | 2012-12-04 19:04:25 -0800 |
|---|---|---|
| committer | Igor Babaev <igor@askmonty.org> | 2012-12-04 19:04:25 -0800 |
| commit | f8bfb65b132dae3472d3f4f88995e4cad7f72ebf (patch) | |
| tree | 618476ff0f99a8a0e949d7ba1bbd1699ec2374d2 /sql/sql_show.cc | |
| parent | e42024cd0aab425822ae9bf001fb57984e2ef12c (diff) | |
| parent | 5e345281e3599c793fdea771d0f23eb19f22d601 (diff) | |
| download | mariadb-git-f8bfb65b132dae3472d3f4f88995e4cad7f72ebf.tar.gz | |
Merge 5.5->mwl248
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 878faa189a2..19a25c28942 100644 --- a/sql/sql_show.cc +++ b/sql/sql_show.cc @@ -3880,8 +3880,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 |