Commit a5efa43c authored by unknown's avatar unknown

Merge mysql.com:/misc/mysql/32707/41-32707

into  mysql.com:/misc/mysql/32707/50-32707


sql/protocol.cc:
  manual merge
parents d5ab5886 7c0db983
......@@ -409,7 +409,10 @@ void net_send_error_packet(THD *thd, uint sql_errno, const char *err)
{
NET *net= &thd->net;
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");
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment