Renamed Item_user_var_as_out_param::name to org_name

Rename was done as the old 'name' hide the original item name.

sql/item_func.cc

@@ -5476,7 +5476,7 @@ bool Item_user_var_as_out_param::fix_fields(THD *thd, Item **ref)
   DBUG_ASSERT(fixed == 0);
   DBUG_ASSERT(thd->lex->exchange);
   if (Item::fix_fields(thd, ref) ||
-      !(entry= get_variable(&thd->user_vars, &name, 1)))
+      !(entry= get_variable(&thd->user_vars, &org_name, 1)))
     return TRUE;
   entry->type= STRING_RESULT;
   /*
@@ -5537,7 +5537,7 @@ my_decimal* Item_user_var_as_out_param::val_decimal(my_decimal *decimal_buffer)
 void Item_user_var_as_out_param::print_for_load(THD *thd, String *str)
 {
   str->append('@');
-  append_identifier(thd, str, name.str, name.length);
+  append_identifier(thd, str, &org_name);
 }
 
 

sql/item_func.h

@@ -2485,13 +2485,14 @@ class Item_func_get_user_var :public Item_func_user_var,
 */
 class Item_user_var_as_out_param :public Item
 {
-  LEX_CSTRING name;
+  LEX_CSTRING org_name;
   user_var_entry *entry;
 public:
   Item_user_var_as_out_param(THD *thd, const LEX_CSTRING *a)
-  :Item(thd), name(*a)
+  :Item(thd)
   {
     DBUG_ASSERT(a->length < UINT_MAX32);
+    org_name= *a;
     set_name(thd, a->str, (uint) a->length, system_charset_info);
   }
   /* We should return something different from FIELD_ITEM here */