merge with 4.0.5

BitKeeper/etc/logging_ok:
  auto-union
configure.in:
  Auto merged
Docs/manual.texi:
  Auto merged
myisam/mi_open.c:
  Auto merged
mysql-test/r/null_key.result:
  Auto merged
mysql-test/r/select.result:
  Auto merged
sql/field.h:
  Auto merged
sql/field_conv.cc:
  Auto merged
sql/ha_innodb.cc:
  Auto merged
sql/log.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/table.cc:
  Auto merged

1 files changed, 12 insertions, 9 deletions

diff --git a/sql/field_conv.cc b/sql/field_conv.cc
index 53b26920c14..efb7401779c 100644
--- a/sql/field_conv.cc
+++ b/sql/field_conv.cc
@@ -245,7 +245,7 @@ static void do_conv_blob(Copy_field *copy)
 {
   copy->from_field->val_str(&copy->tmp,&copy->tmp);
   ((Field_blob *) copy->to_field)->store(copy->tmp.ptr(),
-					 copy->tmp.length());
+					 copy->tmp.length(),default_charset_info);
 }
 
 /* Save blob in copy->tmp for GROUP BY */
@@ -253,20 +253,20 @@ static void do_conv_blob(Copy_field *copy)
 static void do_save_blob(Copy_field *copy)
 {
   char buff[MAX_FIELD_WIDTH];
-  String res(buff,sizeof(buff));
+  String res(buff,sizeof(buff),default_charset_info);
   copy->from_field->val_str(&res,&res);
   copy->tmp.copy(res);
   ((Field_blob *) copy->to_field)->store(copy->tmp.ptr(),
-					 copy->tmp.length());
+					 copy->tmp.length(),default_charset_info);
 }
 
 
 static void do_field_string(Copy_field *copy)
 {
   char buff[MAX_FIELD_WIDTH];
-  copy->tmp.set_quick(buff,sizeof(buff));
+  copy->tmp.set_quick(buff,sizeof(buff),default_charset_info);
   copy->from_field->val_str(&copy->tmp,&copy->tmp);
-  copy->to_field->store(copy->tmp.c_ptr_quick(),copy->tmp.length());
+  copy->to_field->store(copy->tmp.c_ptr_quick(),copy->tmp.length(),default_charset_info);
 }
 
 
@@ -293,7 +293,7 @@ static void do_cut_string(Copy_field *copy)
        ptr != end ;
        ptr++)
   {
-    if (!isspace(*ptr))
+    if (!my_isspace(system_charset_info, *ptr))
     {
       current_thd->cuted_fields++;		// Give a warning
       break;
@@ -525,7 +525,8 @@ void field_conv(Field *to,Field *from)
     if (!blob->value.is_alloced() &&
 	from->real_type() != FIELD_TYPE_STRING)
       blob->value.copy();
-    blob->store(blob->value.ptr(),blob->value.length());
+    blob->store(blob->value.ptr(),blob->value.length(),
+      to->binary()?default_charset_info:((Field_str*)to)->charset());
     return;
   }
   if ((from->result_type() == STRING_RESULT &&
@@ -535,9 +536,11 @@ void field_conv(Field *to,Field *from)
       to->type() == FIELD_TYPE_DECIMAL)
   {
     char buff[MAX_FIELD_WIDTH];
-    String result(buff,sizeof(buff));
+    String result(buff,sizeof(buff),default_charset_info);
     from->val_str(&result,&result);
-    to->store(result.c_ptr_quick(),result.length());
+    to->store(result.c_ptr_quick(),result.length(),
+	to->binary()?default_charset_info:((Field_str*)to)->charset());
+    // QQ: what to do if "from" and "to" are of dirrent charsets?
   }
   else if (from->result_type() == REAL_RESULT)
     to->store(from->val_real());