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

into mysql.com:/misc/mysql/32707/51-32707 sql/protocol.cc: manual merge

Merge mysql.com:/misc/mysql/32707/50-32707
into mysql.com:/misc/mysql/32707/51-32707 sql/protocol.cc: manual merge
945f29aa · unknown · 6969f6cf · a5efa43c · 945f29aa
Commit 945f29aa authored Nov 30, 2007 by unknown
Show whitespace changes
Inline Side-by-side

Showing with 4 additions and 1 deletion

sql/protocol.cc sql/protocol.cc +4 -1

No files found.
--- a/sql/protocol.cc
+++ b/sql/protocol.cc
@@ -292,7 +292,10 @@ void net_send_error_packet(THD *thd, uint sql_errno, const char *err)
 {
  NET *net= &thd->net;
  uint length;
-  uchar buff[MYSQL_ERRMSG_SIZE+2], *pos;
+  /*
+    buff[]: sql_errno:2 + ('#':1 + SQLSTATE_LENGTH:5) + MYSQL_ERRMSG_SIZE:512
+  */
+  uchar buff[2+1+SQLSTATE_LENGTH+MYSQL_ERRMSG_SIZE], *pos;

  DBUG_ENTER("send_error_packet");