bk commit into 4.1 tree (holyfoot:1.2488) BUG#19983

[holyfoot]

Below is the list of changes that have just been committed into a local
4.1 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
  1.2488 06/06/02 22:33:22 holyfoot@deer.(none) +2 -0
  bug #19983 (mysql_client_test_embedded fails)

  tests/mysql_client_test.c
    1.167 06/06/02 22:32:37 holyfoot@stripped +2 -0
    this test is not for embedded server as it tests kill command

  libmysqld/lib_sql.cc
    1.126 06/06/02 22:32:37 holyfoot@stripped +6 -2
    field length counting fixed

# 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-4.1.19983

--- 1.125/libmysqld/lib_sql.cc	Wed Sep 28 00:35:58 2005
+++ 1.126/libmysqld/lib_sql.cc	Fri Jun  2 22:32:37 2006
@@ -665,10 +665,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.166/tests/mysql_client_test.c	Thu Mar 30 05:11:35 2006
+++ 1.167/tests/mysql_client_test.c	Fri Jun  2 22:32:37 2006
@@ -12066,7 +12066,9 @@
   { "test_bug8378", test_bug8378 },
   { "test_bug9735", test_bug9735 },
   { "test_bug11183", test_bug11183 },
+#ifndef EMBEDDED_LIBRARY
   { "test_bug12744", test_bug12744 },
+#endif
   { "test_bug12001", test_bug12001 },
   { "test_bug11718", test_bug11718 },
   { "test_bug12925", test_bug12925 },