Commit beee8954 authored by tnurnberg@white.intern.koehntopp.de's avatar tnurnberg@white.intern.koehntopp.de
Browse files

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

into  mysql.com:/misc/mysql/32707/50-32707
parents 410cc112 46ee271e
Loading
Loading
Loading
Loading
+4 −1
Original line number Diff line number Diff line
@@ -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");