Commit 10cb018b authored by unknown's avatar unknown

Merge bk-internal.mysql.com:/data0/bk/mysql-5.0

into  bk-internal.mysql.com:/data0/bk/mysql-5.0-kt
parents eaf279df af3674cc
...@@ -890,10 +890,14 @@ bool Protocol::send_fields(List<Item> *list, uint flags) ...@@ -890,10 +890,14 @@ bool Protocol::send_fields(List<Item> *list, uint flags)
} }
else else
{ {
uint max_char_len;
/* With conversion */ /* With conversion */
client_field->charsetnr= thd_cs->number; client_field->charsetnr= thd_cs->number;
uint char_len= server_field.length / item->collation.collation->mbmaxlen; max_char_len= (server_field.type >= (int) MYSQL_TYPE_TINY_BLOB &&
client_field->length= char_len * thd_cs->mbmaxlen; 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->type= server_field.type;
client_field->flags= server_field.flags; client_field->flags= server_field.flags;
......
...@@ -15291,7 +15291,9 @@ static struct my_tests_st my_tests[]= { ...@@ -15291,7 +15291,9 @@ static struct my_tests_st my_tests[]= {
{ "test_bug14845", test_bug14845 }, { "test_bug14845", test_bug14845 },
{ "test_bug15510", test_bug15510 }, { "test_bug15510", test_bug15510 },
{ "test_opt_reconnect", test_opt_reconnect }, { "test_opt_reconnect", test_opt_reconnect },
#ifndef EMBEDDED_LIBRARY
{ "test_bug12744", test_bug12744 }, { "test_bug12744", test_bug12744 },
#endif
{ "test_bug16143", test_bug16143 }, { "test_bug16143", test_bug16143 },
{ "test_bug15613", test_bug15613 }, { "test_bug15613", test_bug15613 },
{ "test_bug20152", test_bug20152 }, { "test_bug20152", test_bug20152 },
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment