diff options
| author | unknown <tnurnberg@white.intern.koehntopp.de> | 2007-12-01 13:10:59 +0100 |
|---|---|---|
| committer | unknown <tnurnberg@white.intern.koehntopp.de> | 2007-12-01 13:10:59 +0100 |
| commit | 25886c069e8aa9828396f92d2028c983147bdf75 (patch) | |
| tree | 5aaccf72000224f40bf3ec202b367eaf414cb721 /sql/protocol.cc | |
| parent | 4e897766198479cbb7837c1bda8b1ccc83300e8b (diff) | |
| parent | 945f29aa67e6f69c53230cb283f55d0b7f948be6 (diff) | |
| download | mariadb-git-25886c069e8aa9828396f92d2028c983147bdf75.tar.gz | |
Merge tnurnberg@bk-internal.mysql.com:/home/bk/mysql-5.1-opt
into mysql.com:/misc/mysql/32707/51-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 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"); |