database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-27 18:02:13 +03:00
Code Activity

merge (and including the fix for bug#48939 since that was not included in mysql-trunk-bugfixing).

Browse Source
This commit is contained in:
Mattias Jonsson
2009-12-15 23:47:04 +01:00
parent 0b1a15e9a7 dd46365a0b
commit a39a91112e
5 changed files with 689 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
sql/protocol.cc
View File

@ -411,8 +411,8 @@ bool net_send_error_packet(THD *thd, uint sql_errno, const char *err,
thd->variables.character_set_results,
err, strlen(err),
system_charset_info, &error);
length= (uint) (strmake((char*) pos, (char*)converted_err, MYSQL_ERRMSG_SIZE) -
(char*) buff);
length= (uint) (strmake((char*) pos, (char*)converted_err,
MYSQL_ERRMSG_SIZE - 1) - (char*) buff);
err= (char*) buff;
DBUG_RETURN(net_write_command(net,(uchar) 255, (uchar*) "", 0, (uchar*) err,
length));