merge 5.1 => 5.5

e7f38f11 · Tor Didriksen · 9d41d7c5 · 50e8ac0b · e7f38f11
Commit e7f38f11 authored Sep 05, 2012 by Tor Didriksen
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 2 deletions

sql/sql_show.cc sql/sql_show.cc +3 -2

No files found.
--- a/sql/sql_show.cc
+++ b/sql/sql_show.cc
@@ -3155,8 +3155,9 @@ fill_schema_table_by_open(THD *thd, bool is_show_fields_or_keys,
  /* 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