diff --git a/sql/sql_base.cc b/sql/sql_base.cc
index 283d56f6d48..2b0f0daf554 100644
--- a/sql/sql_base.cc
+++ b/sql/sql_base.cc
@@ -7843,12 +7843,9 @@ bool setup_tables(THD *thd, Name_resolution_context *context,
     {
       DBUG_ASSERT(table_list->view &&
                   table_list->effective_algorithm == VIEW_ALGORITHM_MERGE);
-      Query_arena *arena= thd->stmt_arena, backup;
+      Query_arena *arena, backup;
+      arena= thd->activate_stmt_arena_if_needed(&backup);
       bool res;
-      if (arena->is_conventional())
-        arena= 0;                                   // For easier test
-      else
-        thd->set_n_backup_active_arena(arena, &backup);
       res= table_list->setup_underlying(thd);
       if (arena)
         thd->restore_active_arena(arena, &backup);
diff --git a/sql/sql_select.cc b/sql/sql_select.cc
index d8bbabd5f63..6434c045da0 100644
--- a/sql/sql_select.cc
+++ b/sql/sql_select.cc
@@ -882,11 +882,8 @@ JOIN::optimize()
       MEMROOT for prepared statements and stored procedures.
     */
 
-    Query_arena *arena= thd->stmt_arena, backup;
-    if (arena->is_conventional())
-      arena= 0;                                   // For easier test
-    else
-      thd->set_n_backup_active_arena(arena, &backup);
+    Query_arena *arena, backup;
+    arena= thd->activate_stmt_arena_if_needed(&backup);
 
     sel->first_cond_optimization= 0;
 
diff --git a/sql/sql_view.cc b/sql/sql_view.cc
index 27bdfed6bea..8dde595f401 100644
--- a/sql/sql_view.cc
+++ b/sql/sql_view.cc
@@ -1121,11 +1121,7 @@ bool mysql_make_view(THD *thd, File_parser *parser, TABLE_LIST *table,
     will be TRUE as far as we make new table cache).
   */
   old_lex= thd->lex;
-  arena= thd->stmt_arena;
-  if (arena->is_conventional())
-    arena= 0;
-  else
-    thd->set_n_backup_active_arena(arena, &backup);
+  arena= thd->activate_stmt_arena_if_needed(&backup);
 
   /* init timestamp */
   if (!table->timestamp.str)