Commit ea7aa193 authored by unknown's avatar unknown
Browse files

bug #19983 (mysql_client_test_embedded fails) 


libmysqld/lib_sql.cc:
  field length counting fixed
tests/mysql_client_test.c:
  this test is not for embedded server as it tests kill command
parent ddd9fbac

libmysqld/lib_sql.cc

+6 −2
Original line number Diff line number Diff line
@@ -665,10 +665,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
@@ -12066,7 +12066,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 },