Merge mysql.com:/home/psergey/mysql-5.0-latest-pull

into mysql.com:/dbdata/psergey/mysql-5.0-imerge-unique


BitKeeper/etc/logging_ok:
  auto-union
include/my_global.h:
  Auto merged
sql/filesort.cc:
  Auto merged
sql/ha_innodb.cc:
  Auto merged
sql/handler.h:
  Auto merged
sql/item_create.cc:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/opt_range.cc:
  Auto merged
sql/records.cc:
  Auto merged
sql/sql_class.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_union.cc:
  Auto merged
sql/sql_update.cc:
  Auto merged
sql/uniques.cc:
  Auto merged

1 files changed, 21 insertions, 25 deletions

diff --git a/sql/item_func.cc b/sql/item_func.cc
index 1552e3ec274..117ffcfca05 100644
--- a/sql/item_func.cc
+++ b/sql/item_func.cc
@@ -320,6 +320,7 @@ void Item_func::print_op(String *str)
   str->append(')');
 }
 
+
 bool Item_func::eq(const Item *item, bool binary_cmp) const
 {
   /* Assume we don't have rtti */
@@ -375,8 +376,7 @@ String *Item_real_func::val_str(String *str)
   double nr=val();
   if (null_value)
     return 0; /* purecov: inspected */
-  else
-    str->set(nr,decimals,default_charset());
+  str->set(nr,decimals, &my_charset_bin);
   return str;
 }
 
@@ -388,18 +388,17 @@ String *Item_num_func::val_str(String *str)
     longlong nr=val_int();
     if (null_value)
       return 0; /* purecov: inspected */
-    else if (!unsigned_flag)
-      str->set(nr,default_charset());
+    if (!unsigned_flag)
+      str->set(nr,&my_charset_bin);
     else
-      str->set((ulonglong) nr,default_charset());
+      str->set((ulonglong) nr,&my_charset_bin);
   }
   else
   {
     double nr=val();
     if (null_value)
       return 0; /* purecov: inspected */
-    else
-      str->set(nr,decimals,default_charset());
+    str->set(nr,decimals,&my_charset_bin);
   }
   return str;
 }
@@ -425,10 +424,10 @@ String *Item_int_func::val_str(String *str)
   longlong nr=val_int();
   if (null_value)
     return 0;
-  else if (!unsigned_flag)
-    str->set(nr,default_charset());
+  if (!unsigned_flag)
+    str->set(nr,&my_charset_bin);
   else
-    str->set((ulonglong) nr,default_charset());
+    str->set((ulonglong) nr,&my_charset_bin);
   return str;
 }
 
@@ -454,18 +453,17 @@ String *Item_num_op::val_str(String *str)
     longlong nr=val_int();
     if (null_value)
       return 0; /* purecov: inspected */
-    else if (!unsigned_flag)
-      str->set(nr,default_charset());
+    if (!unsigned_flag)
+      str->set(nr,&my_charset_bin);
     else
-      str->set((ulonglong) nr,default_charset());
+      str->set((ulonglong) nr,&my_charset_bin);
   }
   else
   {
     double nr=val();
     if (null_value)
       return 0; /* purecov: inspected */
-    else
-      str->set(nr,decimals,default_charset());
+    str->set(nr,decimals,&my_charset_bin);
   }
   return str;
 }
@@ -1035,10 +1033,10 @@ String *Item_func_min_max::val_str(String *str)
     longlong nr=val_int();
     if (null_value)
       return 0;
-    else if (!unsigned_flag)
-      str->set(nr,default_charset());
+    if (!unsigned_flag)
+      str->set(nr,&my_charset_bin);
     else
-      str->set((ulonglong) nr,default_charset());
+      str->set((ulonglong) nr,&my_charset_bin);
     return str;
   }
   case REAL_RESULT:
@@ -1046,8 +1044,7 @@ String *Item_func_min_max::val_str(String *str)
     double nr=val();
     if (null_value)
       return 0; /* purecov: inspected */
-    else
-      str->set(nr,decimals,default_charset());
+    str->set(nr,decimals,&my_charset_bin);
     return str;
   }
   case STRING_RESULT:
@@ -1682,8 +1679,7 @@ String *Item_func_udf_float::val_str(String *str)
   double nr=val();
   if (null_value)
     return 0;					/* purecov: inspected */
-  else
-    str->set(nr,decimals,default_charset());
+  str->set(nr,decimals,&my_charset_bin);
   return str;
 }
 
@@ -1703,10 +1699,10 @@ String *Item_func_udf_int::val_str(String *str)
   longlong nr=val_int();
   if (null_value)
     return 0;
-  else if (!unsigned_flag)
-    str->set(nr,default_charset());
+  if (!unsigned_flag)
+    str->set(nr,&my_charset_bin);
   else
-    str->set((ulonglong) nr,default_charset());
+    str->set((ulonglong) nr,&my_charset_bin);
   return str;
 }