database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

Merge govinda.patg.net:/home/patg/mysql-build/mysql-5.0-holyfoot

Browse Source 
into  govinda.patg.net:/home/patg/mysql-build/mysql-5.1-5.0-merge2

Push by holyfoot@production.mysql.com on Tue Jul 25 13:41:40 2006:

bk clone -l -r'holyfoot/hf@mysql.com/deer.(none)|ChangeSet|20060725085017|41021' mysql-5.0 tmp_merge
This commit is contained in:
patg@govinda.patg.net
2006-08-08 09:01:32 -07:00
parent a4eb61b88c a9a345d9a5
commit 8d1e5a5bb1
14 changed files with 261 additions and 157 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
libmysqld/lib_sql.cc
View File

@ -894,10 +894,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;