Commit c988ef94 authored by unknown's avatar unknown
Browse files

Merge bk@192.168.21.1:mysql-4.1 

into  mysql.com:/home/hf/work/mysql-4.1.19983


libmysqld/lib_sql.cc:
  Auto merged
tests/mysql_client_test.c:
  Auto merged
parents b53e47a1 ea7aa193

libmysqld/lib_sql.cc

+6 −2
Original line number Diff line number Diff line
@@ -674,10 +674,14 @@ bool Protocol::send_fields(List<Item> *list, uint flag) 
    }

    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

+2 −0
Original line number Diff line number Diff line
@@ -12125,7 +12125,9 @@ static struct my_tests_st my_tests[]= { 
  { "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 },