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

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

1 files changed, 6 insertions, 2 deletions

diff --git a/libmysqld/lib_sql.cc b/libmysqld/lib_sql.cc
index 2640910990e..40966be46a5 100644
--- a/libmysqld/lib_sql.cc
+++ b/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;