Merge branch '10.0' into 10.1mariadb-10.1.21

1 files changed, 0 insertions, 20 deletions

diff --git a/sql/sql_class.h b/sql/sql_class.h
index 3058d81496c..9ae1e5cf23b 100644
--- a/sql/sql_class.h
+++ b/sql/sql_class.h
@@ -3837,27 +3837,7 @@ public:
     }
   }
 
-private:
-  /* 
-    This reference points to the table arena when the expression
-    for a virtual column is being evaluated
-  */ 
-  Query_arena *arena_for_cached_items;
-
 public:
-  void reset_arena_for_cached_items(Query_arena *new_arena)
-  {
-    arena_for_cached_items= new_arena;
-  }
-  Query_arena *switch_to_arena_for_cached_items(Query_arena *backup)
-  {
-    if (!arena_for_cached_items)
-      return 0;
-    set_n_backup_active_arena(arena_for_cached_items, backup);
-    return backup;
-  }
-
-
   void clear_wakeup_ready() { wakeup_ready= false; }
   /*
     Sleep waiting for others to wake us up with signal_wakeup_ready().