post merge fixes

mysql-test/t/merge.test:
  additional test
sql/item.h:
  parameter to detect need of saving view field names
sql/item_subselect.cc:
  arena fix
  used nearest thd pointer
sql/item_sum.cc:
  after merge fix
sql/mysql_priv.h:
  after merge fix
sql/sql_base.cc:
  fixed unique test
  fixed postmerge arena mamgement
sql/sql_class.h:
  mey method to detect conventional execution
sql/sql_handler.cc:
  new parameter
sql/sql_lex.cc:
  fixed postmerge arena mamgement
sql/sql_parse.cc:
  fixed unique test
sql/sql_select.cc:
  fixed postmerge arena mamgement
sql/sql_union.cc:
  fixed postmerge arena mamgement
sql/sql_view.cc:
  fixed postmerge arena mamgement
sql/table.cc:
  fixed postmerge arena mamgement

1 files changed, 1 insertions, 1 deletions

diff --git a/sql/sql_view.cc b/sql/sql_view.cc
index 649953897e7..91b66251fd0 100644
--- a/sql/sql_view.cc
+++ b/sql/sql_view.cc
@@ -523,7 +523,7 @@ mysql_make_view(File_parser *parser, TABLE_LIST *table)
     will be TRUE as far as we make new table cache).
   */
   Item_arena *arena= thd->current_arena, backup;
-  if (!arena->is_stmt_prepare())
+  if (arena->is_conventional())
     arena= 0;
   else
     thd->set_n_backup_item_arena(arena, &backup);