Merge sanja.is.com.ua:/home/bell/mysql/mysql-4.1

into sanja.is.com.ua:/home/bell/mysql/work-in-4.1


sql/item.cc:
  Auto merged
sql/item.h:
  Auto merged
sql/item_subselect.cc:
  Auto merged
sql/item_sum.cc:
  Auto merged
sql/sql_lex.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged

1 files changed, 9 insertions, 9 deletions

diff --git a/sql/item_sum.cc b/sql/item_sum.cc
index 7aa7e13c7f7..0d8bca96ce7 100644
--- a/sql/item_sum.cc
+++ b/sql/item_sum.cc
@@ -96,7 +96,7 @@ Item_sum_num::val_str(String *str)
   double nr=val();
   if (null_value)
     return 0;
-  str->set(nr,decimals,my_thd_charset);
+  str->set(nr,decimals,thd_charset());
   return str;
 }
 
@@ -109,7 +109,7 @@ Item_sum_int::val_str(String *str)
     return 0;
   char buff[21];
   uint length= (uint) (longlong10_to_str(nr,buff,-10)-buff);
-  str->copy(buff,length);
+  str->copy(buff,length,thd_charset());
   return str;
 }
 
@@ -362,13 +362,13 @@ Item_sum_hybrid::val_str(String *str)
   case STRING_RESULT:
     return &value;
   case REAL_RESULT:
-    str->set(sum,decimals,my_thd_charset);
+    str->set(sum,decimals,thd_charset());
     break;
   case INT_RESULT:
     if (unsigned_flag)
-      str->set((ulonglong) sum_int,my_thd_charset);
+      str->set((ulonglong) sum_int,thd_charset());
     else
-      str->set((longlong) sum_int,my_thd_charset);
+      str->set((longlong) sum_int,thd_charset());
     break;
   }
   return str;					// Keep compiler happy
@@ -813,7 +813,7 @@ String *Item_avg_field::val_str(String *str)
   double nr=Item_avg_field::val();
   if (null_value)
     return 0;
-  str->set(nr,decimals,my_thd_charset);
+  str->set(nr,decimals,thd_charset());
   return str;
 }
 
@@ -850,7 +850,7 @@ String *Item_std_field::val_str(String *str)
   double nr=val();
   if (null_value)
     return 0;
-  str->set(nr,decimals,my_thd_charset);
+  str->set(nr,decimals,thd_charset());
   return str;
 }
 
@@ -1180,7 +1180,7 @@ String *Item_sum_udf_float::val_str(String *str)
   if (null_value)
     return 0;					/* purecov: inspected */
   else
-    str->set(nr,decimals,my_thd_charset);
+    str->set(nr,decimals,thd_charset());
   return str;
 }
 
@@ -1199,7 +1199,7 @@ String *Item_sum_udf_int::val_str(String *str)
   if (null_value)
     return 0;
   else
-    str->set(nr,my_thd_charset);
+    str->set(nr,thd_charset());
   return str;
 }