diff options
| author | tnurnberg@white.intern.koehntopp.de <> | 2007-12-01 13:10:59 +0100 |
|---|---|---|
| committer | tnurnberg@white.intern.koehntopp.de <> | 2007-12-01 13:10:59 +0100 |
| commit | b445a5443e42f8610e7db418ecfa114b08379f84 (patch) | |
| tree | 5aaccf72000224f40bf3ec202b367eaf414cb721 /sql/protocol.cc | |
| parent | d28aac3f33869bc20fa915d0f1ce4baa216a9c6b (diff) | |
| parent | a7949e11412b03c07f785b0d50c21a8a2df6bdd9 (diff) | |
| download | mariadb-git-b445a5443e42f8610e7db418ecfa114b08379f84.tar.gz | |
Merge tnurnberg@bk-internal.mysql.com:/home/bk/mysql-5.1-opt
into mysql.com:/misc/mysql/32707/51-32707
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 c6f264c4b20..4e727799773 100644 --- a/sql/protocol.cc +++ b/sql/protocol.cc @@ -293,7 +293,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"); |