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 mysql.com:/opt/local/work/mysql-4.1-15613

Browse Source 
into  mysql.com:/opt/local/work/mysql-5.0-root


sql/protocol.cc:
  Auto merged
tests/mysql_client_test.c:
  Manual merge.
This commit is contained in:
unknown
2006-01-19 14:01:20 +03:00
parent 48ac5c4a2b 1e8e302eff
commit c87bfd13ac
2 changed files with 80 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
sql/protocol.cc
View File

@ -597,9 +597,23 @@ bool Protocol::send_fields(List<Item> *list, uint flags)
else
{
/* With conversion */
uint max_char_len;
int2store(pos, thd_charset->number);
uint char_len= field.length / item->collation.collation->mbmaxlen;
int4store(pos+2, char_len * thd_charset->mbmaxlen);
/*
For TEXT/BLOB columns, field_length describes the maximum data
length in bytes. There is no limit to the number of characters
that a TEXT column can store, as long as the data fits into
the designated space.
For the rest of textual columns, field_length is evaluated as
char_count * mbmaxlen, where character count is taken from the
definition of the column. In other words, the maximum number
of characters here is limited by the column definition.
*/
max_char_len= (field.type >= (int) MYSQL_TYPE_TINY_BLOB &&
field.type <= (int) MYSQL_TYPE_BLOB) ?
field.length / item->collation.collation->mbminlen :
field.length / item->collation.collation->mbmaxlen;
int4store(pos+2, max_char_len * thd_charset->mbmaxlen);
}
pos[6]= field.type;
int2store(pos+7,field.flags);