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 with 4.1

Browse Source
This commit is contained in:
monty@mishka.local
2004-12-22 13:54:39 +02:00
parent 198dc7a8ec 98f2a83539
commit 4f4bbfc279
395 changed files with 11807 additions and 25533 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
sql/protocol.cc
View File

@ -537,10 +537,18 @@ bool Protocol::send_fields(List<Item> *list, uint flags)
pos= (char*) local_packet->ptr()+local_packet->length();
*pos++= 12; // Length of packed fields
if (item->collation.collation == &my_charset_bin || thd_charset == NULL)
{
/* No conversion */
int2store(pos, field.charsetnr);
int4store(pos+2, field.length);
}
else
int2store(pos, thd_charset->number);
int4store(pos+2, field.length);
{
/* With conversion */
int2store(pos, thd_charset->number);
uint char_len= field.length / item->collation.collation->mbmaxlen;
int4store(pos+2, char_len * thd_charset->mbmaxlen);
}
pos[6]= field.type;
int2store(pos+7,field.flags);
pos[9]= (char) field.decimals;