Rename:

- current_arena to stmt_arena: the thread may have more than one
'current' arenas: one for runtime data, and one for the parsed 
tree of a statement. Only one of them is active at any moment.
- set_item_arena -> set_query_arena, because Item_arena was renamed to 
Query_arena a while ago
- set_n_backup_item_arena -> set_n_backup_active_arena;
the active arena is the arena thd->mem_root and thd->free_list
are currently pointing at.
- restore_backup_item_arena -> restore_active_arena (with the same
rationale)
- change_arena_if_needed -> activate_stmt_arena_if_needed; this
method sets thd->stmt_arena active if it's not done yet.


sql/item.cc:
  Rename.
sql/item_cmpfunc.cc:
  Rename.
sql/item_func.cc:
  Rename.
sql/item_subselect.cc:
  Rename.
sql/item_subselect.h:
  Remove an unused forward declaration.
sql/item_sum.h:
  Remove an unused forward declaration.
sql/mysql_priv.h:
  Remove an unused forward declaration.
sql/sp.cc:
  Rename.
sql/sp_head.cc:
  Rename.
sql/sql_base.cc:
  Rename.
sql/sql_class.cc:
  Rename.
sql/sql_class.h:
  Rename.
sql/sql_lex.cc:
  Rename.
sql/sql_parse.cc:
  Rename.
sql/sql_prepare.cc:
  Rename.
sql/sql_select.cc:
  Rename.
sql/sql_show.cc:
  Rename.
sql/sql_union.cc:
  Rename.
sql/sql_view.cc:
  Rename.
sql/table.cc:
  Rename.

1 files changed, 4 insertions, 4 deletions

diff --git a/sql/sql_union.cc b/sql/sql_union.cc
index 72c96e81682..556493f4fc8 100644
--- a/sql/sql_union.cc
+++ b/sql/sql_union.cc
@@ -287,7 +287,7 @@ bool st_select_lex_unit::prepare(THD *thd_arg, select_result *sel_result,
       all collations together for UNION.
     */
     List_iterator_fast<Item> tp(types);
-    Query_arena *arena= thd->current_arena;
+    Query_arena *arena= thd->stmt_arena;
     Item *type;
     ulonglong create_options;
 
@@ -332,7 +332,7 @@ bool st_select_lex_unit::prepare(THD *thd_arg, select_result *sel_result,
     {
       Field **field;
       Query_arena *tmp_arena,backup;
-      tmp_arena= thd->change_arena_if_needed(&backup);
+      tmp_arena= thd->activate_stmt_arena_if_needed(&backup);
 
       for (field= table->field; *field; field++)
       {
@@ -340,12 +340,12 @@ bool st_select_lex_unit::prepare(THD *thd_arg, select_result *sel_result,
 	if (!item || item_list.push_back(item))
 	{
           if (tmp_arena)
-	    thd->restore_backup_item_arena(tmp_arena, &backup);
+	    thd->restore_active_arena(tmp_arena, &backup);
 	  DBUG_RETURN(TRUE);
 	}
       }
       if (tmp_arena)
-        thd->restore_backup_item_arena(tmp_arena, &backup);
+        thd->restore_active_arena(tmp_arena, &backup);
       if (arena->is_stmt_prepare_or_first_sp_execute())
       {
 	/* prepare fake select to initialize it correctly */