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

Fixed charsetnr sent to the client

Browse Source
This commit is contained in:
bar@bar.intranet.mysql.r18.ru
2004-04-06 19:57:33 +05:00
parent 0f484ebae6
commit 950a2ebab1
6 changed files with 58 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
sql/protocol.cc
View File

@ -530,7 +530,10 @@ bool Protocol::send_fields(List<Item> *list, uint flag)
/* Store fixed length fields */
pos= (char*) local_packet->ptr()+local_packet->length();
*pos++= 12; // Length of packed fields
int2store(pos, field.charsetnr);
if (item->collation.collation == &my_charset_bin || thd_charset == NULL)
int2store(pos, field.charsetnr);
else
int2store(pos, thd_charset->number);
int4store(pos+2, field.length);
pos[6]= field.type;
int2store(pos+7,field.flags);