After merge fixes

Added push_back(void *, MEM_ROOT *) to make some list-handling code easier that needs to be allocated in a different mem-root
(Before one had to change thd->mem_root ; push_back(); restore mem_root.


mysql-test/t/range.test:
  After merge fixRecR
sql/item_func.cc:
  After merge fix
sql/item_sum.cc:
  After merge fix
sql/opt_range.cc:
  After merge fix
sql/parse_file.cc:
  After merge fix
sql/sp.cc:
  After merge fix
sql/sp_head.cc:
  After merge fix
sql/sp_head.h:
  After merge fix
sql/sql_base.cc:
  After merge fix
sql/sql_class.h:
  After merge fix
sql/sql_list.h:
  Added push_back(void *, MEM_ROOT *) to make some list-handling code easier that needs to be allocated in a different mem-root
  (Before one had to change thd->mem_root ; push_back(); restore mem_root.
sql/sql_prepare.cc:
  After merge fix
sql/sql_select.cc:
  After merge fix
sql/sql_table.cc:
  After merge fix
  Fixed problem with OPTIMIZE on INNODB tables
sql/sql_trigger.cc:
  After merge fix
sql/sql_union.cc:
  After merge fix
sql/sql_view.cc:
  After merge fix
sql/sql_yacc.yy:
  After merge fix
sql/table.cc:
  After merge fix

1 files changed, 1 insertions, 1 deletions

diff --git a/sql/sql_class.h b/sql/sql_class.h
index 987e557c37c..515c1c13b58 100644
--- a/sql/sql_class.h
+++ b/sql/sql_class.h
@@ -1174,7 +1174,7 @@ public:
       use new arena if we are in a prepared statements and we have not
       already changed to use this arena.
     */
-    if (current_arena->is_stmt_prepare() &&
+    if (!current_arena->is_conventional() &&
         mem_root != &current_arena->main_mem_root)
     {
       set_n_backup_item_arena(current_arena, backup);