Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.0

into  sanja.is.com.ua:/home/bell/mysql/bk/work-bug3-5.0


sql/item.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_view.cc:
  Auto merged
sql/table.cc:
  Auto merged

1 files changed, 4 insertions, 4 deletions

diff --git a/sql/sql_view.cc b/sql/sql_view.cc
index 4f87706be17..eb5d64e0fe0 100644
--- a/sql/sql_view.cc
+++ b/sql/sql_view.cc
@@ -700,11 +700,11 @@ mysql_make_view(File_parser *parser, TABLE_LIST *table)
     For now we assume that tables will not be changed during PS life (it
     will be TRUE as far as we make new table cache).
   */
-  Query_arena *arena= thd->current_arena, backup;
+  Query_arena *arena= thd->stmt_arena, backup;
   if (arena->is_conventional())
     arena= 0;
   else
-    thd->set_n_backup_item_arena(arena, &backup);
+    thd->set_n_backup_active_arena(arena, &backup);
 
   /* init timestamp */
   if (!table->timestamp.str)
@@ -995,13 +995,13 @@ ok:
 
 ok2:
   if (arena)
-    thd->restore_backup_item_arena(arena, &backup);
+    thd->restore_active_arena(arena, &backup);
   thd->lex= old_lex;
   DBUG_RETURN(0);
 
 err:
   if (arena)
-    thd->restore_backup_item_arena(arena, &backup);
+    thd->restore_active_arena(arena, &backup);
   delete table->view;
   table->view= 0;	// now it is not VIEW placeholder
   thd->lex= old_lex;