diff options
| author | unknown <tnurnberg@white.intern.koehntopp.de> | 2007-12-01 13:09:16 +0100 |
|---|---|---|
| committer | unknown <tnurnberg@white.intern.koehntopp.de> | 2007-12-01 13:09:16 +0100 |
| commit | e26804399bf57d20f9bd37aebd143ca225daf3f0 (patch) | |
| tree | aac37eef738acc26d002a86764673b27524077d3 /sql/protocol.cc | |
| parent | e75c58cf17d17be4698362f977245a4b67ff1ab7 (diff) | |
| parent | a5efa43c7c7f2495fa0707ed6fef0088c2a318f5 (diff) | |
| download | mariadb-git-e26804399bf57d20f9bd37aebd143ca225daf3f0.tar.gz | |
Merge tnurnberg@bk-internal.mysql.com:/home/bk/mysql-5.0-opt
into mysql.com:/misc/mysql/32707/50-32707
sql/protocol.cc:
Auto merged
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 ac562a9f5ab..ff58d96f59b 100644 --- a/sql/protocol.cc +++ b/sql/protocol.cc @@ -410,7 +410,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"); |