Stage 2 of MDEV-6152:

- Added mem_root to all calls to new Item
- Added private method operator new(size_t size) to Item to ensure that
  we always use a mem_root when creating an item.

This saves use once call to current_thd per Item creation

1 files changed, 1 insertions, 17 deletions

diff --git a/sql/set_var.h b/sql/set_var.h
index e559f6bf810..d10edb07133 100644
--- a/sql/set_var.h
+++ b/sql/set_var.h
@@ -286,23 +286,7 @@ public:
   LEX_STRING base; /**< for structured variables, like keycache_name.variable_name */
 
   set_var(THD *thd, enum_var_type type_arg, sys_var *var_arg,
-          const LEX_STRING *base_name_arg, Item *value_arg)
-    :var(var_arg), type(type_arg), base(*base_name_arg)
-  {
-    /*
-      If the set value is a field, change it to a string to allow things like
-      SET table_type=MYISAM;
-    */
-    if (value_arg && value_arg->type() == Item::FIELD_ITEM)
-    {
-      Item_field *item= (Item_field*) value_arg;
-      // names are utf8
-      if (!(value=new Item_string_sys(thd, item->field_name)))
-        value=value_arg;                        /* Give error message later */
-    }
-    else
-      value=value_arg;
-  }
+          const LEX_STRING *base_name_arg, Item *value_arg);
   virtual bool is_system() { return 1; }
   int check(THD *thd);
   int update(THD *thd);