database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-11 15:22:09 +03:00
Code Activity

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

Browse Source 
into  mysql.com:/home/hf/work/mysql-5.0.mrg
This commit is contained in:
holyfoot/hf@mysql.com/deer.(none)
2006-07-25 13:50:17 +05:00
parent e31f8a662c 95b88445fb
commit a9a345d9a5
2 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
libmysqld/lib_sql.cc
View File

@ -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;

2
tests/mysql_client_test.c
View File

@ -15291,7 +15291,9 @@ static struct my_tests_st my_tests[]= {
{ "test_bug14845", test_bug14845 },
{ "test_bug15510", test_bug15510 },
{ "test_opt_reconnect", test_opt_reconnect },
#ifndef EMBEDDED_LIBRARY
{ "test_bug12744", test_bug12744 },
#endif
{ "test_bug16143", test_bug16143 },
{ "test_bug15613", test_bug15613 },
{ "test_bug20152", test_bug20152 },