Merge mysql.com:/home/pz/mysql/mysql-4.1-root

into mysql.com:/home/pz/mysql/mysql-4.1


BitKeeper/etc/logging_ok:
  auto-union
include/mysql_com.h:
  Auto merged
sql/item_strfunc.cc:
  Auto merged
sql/item_strfunc.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged

1 files changed, 11 insertions, 3 deletions

diff --git a/sql/item_strfunc.h b/sql/item_strfunc.h
index 616c9b6a11f..c4b2534c7d0 100644
--- a/sql/item_strfunc.h
+++ b/sql/item_strfunc.h
@@ -411,7 +411,7 @@ class Item_func_char :public Item_str_func
 public:
   Item_func_char(List<Item> &list) :Item_str_func(list) {}
   String *val_str(String *);
-  void fix_length_and_dec() { maybe_null=0; max_length=arg_count; binary=0;}
+  void fix_length_and_dec() { maybe_null=0; max_length=arg_count; }
   const char *func_name() const { return "char"; }
 };
 
@@ -483,7 +483,11 @@ public:
     null_value=args[0]->null_value;
     return tmp;
    }
-  void fix_length_and_dec() { binary=1; max_length=args[0]->max_length; }
+  void fix_length_and_dec() 
+  { 
+    str_value.set_charset(my_charset_bin); 
+    max_length=args[0]->max_length; 
+  }
   void print(String *str) { print_op(str); }
 };
 
@@ -496,7 +500,11 @@ public:
   String *val_str(String *);
   const char *func_name() const { return "load_file"; }
   void fix_length_and_dec()
-  { binary=1; maybe_null=1; max_length=MAX_BLOB_WIDTH;}
+  { 
+    str_value.set_charset(my_charset_bin);
+    maybe_null=1; 
+    max_length=MAX_BLOB_WIDTH;
+  }
 };