diff options
author | Alexander Nozdrin <alik@sun.com> | 2009-12-24 10:56:13 +0300 |
---|---|---|
committer | Alexander Nozdrin <alik@sun.com> | 2009-12-24 10:56:13 +0300 |
commit | 0ae23cd69d3c13dba2a73750e93abf3342f21eb4 (patch) | |
tree | 27d736b66dbef96f0119023bc78b639f7a59faaa /sql/sql_connect.cc | |
parent | 6e9dad7e67e377ce14bc528c614d6ff7491235d0 (diff) | |
parent | f6a8efbea3f8572c72066343b58ba88e679edc2c (diff) | |
download | mariadb-git-0ae23cd69d3c13dba2a73750e93abf3342f21eb4.tar.gz |
Auto-merge from mysql-trunk-merge.
Diffstat (limited to 'sql/sql_connect.cc')
-rw-r--r-- | sql/sql_connect.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/sql_connect.cc b/sql/sql_connect.cc index 8ecafce6f93..ef35e9451f5 100644 --- a/sql/sql_connect.cc +++ b/sql/sql_connect.cc @@ -725,7 +725,7 @@ static int check_connection(THD *thd) ulong server_capabilites; { /* buff[] needs to big enough to hold the server_version variable */ - char buff[SERVER_VERSION_LENGTH + SCRAMBLE_LENGTH + 64]; + char buff[SERVER_VERSION_LENGTH + 1 + SCRAMBLE_LENGTH + 1 + 64]; server_capabilites= CLIENT_BASIC_FLAGS; if (opt_using_transactions) |