MDEV-8718 - Obsolete sql_strmake() in favor of THD::strmake() and thd_strmake()

1 files changed, 10 insertions, 10 deletions

diff --git a/sql/sql_view.cc b/sql/sql_view.cc
index 85189fa481f..62e6790a142 100644
--- a/sql/sql_view.cc
+++ b/sql/sql_view.cc
@@ -58,7 +58,7 @@ static int mysql_register_view(THD *, TABLE_LIST *, enum_view_create_mode);
     NAME_LEN, it is truncated.
 */
 
-static void make_unique_view_field_name(Item *target,
+static void make_unique_view_field_name(THD *thd, Item *target,
                                         List<Item> &item_list,
                                         Item *last_element)
 {
@@ -96,7 +96,7 @@ static void make_unique_view_field_name(Item *target,
   }
 
   target->orig_name= target->name;
-  target->set_name(buff, name_len, system_charset_info);
+  target->set_name(thd, buff, name_len, system_charset_info);
 }
 
 
@@ -123,7 +123,7 @@ static void make_unique_view_field_name(Item *target,
           isn't allowed
 */
 
-bool check_duplicate_names(List<Item> &item_list, bool gen_unique_view_name)
+bool check_duplicate_names(THD *thd, List<Item> &item_list, bool gen_unique_view_name)
 {
   Item *item;
   List_iterator_fast<Item> it(item_list);
@@ -144,9 +144,9 @@ bool check_duplicate_names(List<Item> &item_list, bool gen_unique_view_name)
         if (!gen_unique_view_name)
           goto err;
         if (item->is_autogenerated_name)
-          make_unique_view_field_name(item, item_list, item);
+          make_unique_view_field_name(thd, item, item_list, item);
         else if (check->is_autogenerated_name)
-          make_unique_view_field_name(check, item_list, item);
+          make_unique_view_field_name(thd, check, item_list, item);
         else
           goto err;
       }
@@ -167,7 +167,7 @@ err:
   @param item_list  List of Items which should be checked
 */
 
-static void make_valid_column_names(List<Item> &item_list)
+static void make_valid_column_names(THD *thd, List<Item> &item_list)
 {
   Item *item;
   uint name_len;
@@ -181,7 +181,7 @@ static void make_valid_column_names(List<Item> &item_list)
       continue;
     name_len= my_snprintf(buff, NAME_LEN, "Name_exp_%u", column_no);
     item->orig_name= item->name;
-    item->set_name(buff, name_len, system_charset_info);
+    item->set_name(thd, buff, name_len, system_charset_info);
   }
 
   DBUG_VOID_RETURN;
@@ -539,16 +539,16 @@ bool mysql_create_view(THD *thd, TABLE_LIST *views,
     }
     while ((item= it++, name= nm++))
     {
-      item->set_name(name->str, (uint) name->length, system_charset_info);
+      item->set_name(thd, name->str, (uint) name->length, system_charset_info);
       item->is_autogenerated_name= FALSE;
     }
   }
 
   /* Check if the auto generated column names are conforming. */
   for (sl= select_lex; sl; sl= sl->next_select())
-    make_valid_column_names(sl->item_list);
+    make_valid_column_names(thd, sl->item_list);
 
-  if (check_duplicate_names(select_lex->item_list, 1))
+  if (check_duplicate_names(thd, select_lex->item_list, 1))
   {
     res= TRUE;
     goto err;