All String->set() now have charset argument

1 files changed, 8 insertions, 8 deletions

diff --git a/sql/item_sum.cc b/sql/item_sum.cc
index 46e6b146380..ae1a86845bf 100644
--- a/sql/item_sum.cc
+++ b/sql/item_sum.cc
@@ -93,7 +93,7 @@ Item_sum_num::val_str(String *str)
   double nr=val();
   if (null_value)
     return 0;
-  str->set(nr,decimals);
+  str->set(nr,decimals,my_thd_charset);
   return str;
 }
 
@@ -359,13 +359,13 @@ Item_sum_hybrid::val_str(String *str)
   case STRING_RESULT:
     return &value;
   case REAL_RESULT:
-    str->set(sum,decimals);
+    str->set(sum,decimals,my_thd_charset);
     break;
   case INT_RESULT:
     if (unsigned_flag)
-      str->set((ulonglong) sum_int);
+      str->set((ulonglong) sum_int,my_thd_charset);
     else
-      str->set((longlong) sum_int);
+      str->set((longlong) sum_int,my_thd_charset);
     break;
   }
   return str;					// Keep compiler happy
@@ -810,7 +810,7 @@ String *Item_avg_field::val_str(String *str)
   double nr=Item_avg_field::val();
   if (null_value)
     return 0;
-  str->set(nr,decimals);
+  str->set(nr,decimals,my_thd_charset);
   return str;
 }
 
@@ -847,7 +847,7 @@ String *Item_std_field::val_str(String *str)
   double nr=val();
   if (null_value)
     return 0;
-  str->set(nr,decimals);
+  str->set(nr,decimals,my_thd_charset);
   return str;
 }
 
@@ -1174,7 +1174,7 @@ String *Item_sum_udf_float::val_str(String *str)
   if (null_value)
     return 0;					/* purecov: inspected */
   else
-    str->set(nr,decimals);
+    str->set(nr,decimals,my_thd_charset);
   return str;
 }
 
@@ -1193,7 +1193,7 @@ String *Item_sum_udf_int::val_str(String *str)
   if (null_value)
     return 0;
   else
-    str->set(nr);
+    str->set(nr,my_thd_charset);
   return str;
 }