mirror of
https://github.com/MariaDB/server.git
synced 2026-05-16 03:47:17 +02:00
Merge mysql.com:/misc/mysql/32707/41-32707
into mysql.com:/misc/mysql/32707/50-32707 sql/protocol.cc: manual merge
This commit is contained in:
commit
a5efa43c7c
1 changed files with 4 additions and 1 deletions
|
|
@ -409,7 +409,10 @@ void net_send_error_packet(THD *thd, uint sql_errno, const char *err)
|
||||||
{
|
{
|
||||||
NET *net= &thd->net;
|
NET *net= &thd->net;
|
||||||
uint length;
|
uint length;
|
||||||
char buff[MYSQL_ERRMSG_SIZE+2], *pos;
|
/*
|
||||||
|
buff[]: sql_errno:2 + ('#':1 + SQLSTATE_LENGTH:5) + MYSQL_ERRMSG_SIZE:512
|
||||||
|
*/
|
||||||
|
char buff[2+1+SQLSTATE_LENGTH+MYSQL_ERRMSG_SIZE], *pos;
|
||||||
|
|
||||||
DBUG_ENTER("send_error_packet");
|
DBUG_ENTER("send_error_packet");
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue