Merge mysql.com:/home/hf/work/mysql-4.1.mrg

into  mysql.com:/home/hf/work/mysql-5.0.mrg


libmysqld/lib_sql.cc:
  Auto merged
tests/mysql_client_test.c:
  merging

libmysqld/lib_sql.cc

@@ -890,10 +890,14 @@ bool Protocol::send_fields(List<Item> *list, uint flags)
     }
     else
     {
+      uint max_char_len;
       /* With conversion */
       client_field->charsetnr= thd_cs->number;
-      uint char_len= server_field.length / item->collation.collation->mbmaxlen;
-      client_field->length= char_len * thd_cs->mbmaxlen;
+      max_char_len= (server_field.type >= (int) MYSQL_TYPE_TINY_BLOB &&
+                     server_field.type <= (int) MYSQL_TYPE_BLOB) ?
+                     server_field.length / item->collation.collation->mbminlen :
+                     server_field.length / item->collation.collation->mbmaxlen;
+      client_field->length= max_char_len * thd_cs->mbmaxlen;
     }
     client_field->type=   server_field.type;
     client_field->flags= server_field.flags;

tests/mysql_client_test.c

@@ -15291,7 +15291,9 @@ static struct my_tests_st my_tests[]= {
   { "test_bug14845", test_bug14845 },
   { "test_bug15510", test_bug15510 },
   { "test_opt_reconnect", test_opt_reconnect },
+#ifndef EMBEDDED_LIBRARY
   { "test_bug12744", test_bug12744 },
+#endif
   { "test_bug16143", test_bug16143 },
   { "test_bug15613", test_bug15613 },
   { "test_bug20152", test_bug20152 },