diff options
| author | unknown <tnurnberg@white.intern.koehntopp.de> | 2007-11-30 12:48:03 +0100 |
|---|---|---|
| committer | unknown <tnurnberg@white.intern.koehntopp.de> | 2007-11-30 12:48:03 +0100 |
| commit | 945f29aa67e6f69c53230cb283f55d0b7f948be6 (patch) | |
| tree | 9775cae22e25c60a3b4d7cb2540a046e37a0cefd /sql/protocol.cc | |
| parent | 6969f6cf8cecff29acab7494e350609a8815014f (diff) | |
| parent | a5efa43c7c7f2495fa0707ed6fef0088c2a318f5 (diff) | |
| download | mariadb-git-945f29aa67e6f69c53230cb283f55d0b7f948be6.tar.gz | |
Merge mysql.com:/misc/mysql/32707/50-32707
into mysql.com:/misc/mysql/32707/51-32707
sql/protocol.cc:
manual merge
Diffstat (limited to 'sql/protocol.cc')
| -rw-r--r-- | sql/protocol.cc | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/sql/protocol.cc b/sql/protocol.cc index bf8faec006a..ad667bd0ba6 100644 --- 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"); |