bk commit into 5.0 tree (holyfoot:1.2217)

[holyfoot]

Below is the list of changes that have just been committed into a local
5.0 repository of hf. When hf does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet@stripped, 2006-07-25 13:50:17+05:00, holyfoot@stripped +2 -0
  Merge mysql.com:/home/hf/work/mysql-4.1.mrg
  into  mysql.com:/home/hf/work/mysql-5.0.mrg
  MERGE: 1.1616.2144.171

  libmysqld/lib_sql.cc@stripped, 2006-07-25 13:48:02+05:00, holyfoot@stripped +0 -0
    Auto merged
    MERGE: 1.75.1.53

  tests/mysql_client_test.c@stripped, 2006-07-25 13:50:04+05:00, holyfoot@stripped +2 -2
    merging
    MERGE: 1.51.1.118

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	holyfoot
# Host:	deer.(none)
# Root:	/home/hf/work/mysql-5.0.mrg/RESYNC

--- 1.113/libmysqld/lib_sql.cc	2006-07-25 13:50:23 +05:00
+++ 1.114/libmysqld/lib_sql.cc	2006-07-25 13:50:23 +05:00
@@ -890,10 +890,14 @@
     }
     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;

--- 1.191/tests/mysql_client_test.c	2006-07-25 13:50:23 +05:00
+++ 1.192/tests/mysql_client_test.c	2006-07-25 13:50:23 +05:00
@@ -15291,7 +15291,9 @@
   { "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 },