diff options
author | Davi Arnaut <Davi.Arnaut@Sun.COM> | 2009-12-18 16:44:24 -0200 |
---|---|---|
committer | Davi Arnaut <Davi.Arnaut@Sun.COM> | 2009-12-18 16:44:24 -0200 |
commit | 95e34182fb34f84a6606d3726cf12ba397d039d8 (patch) | |
tree | 8cb3e4210dd5da0c3cec217f0e5008ee9104715b /sql/sql_connect.cc | |
parent | fa438192dbedf7db69b44bde93e3b29d3cb0fa93 (diff) | |
parent | c2fb2a9a620df1d7c95cc5bfec9c31cdc476d962 (diff) | |
download | mariadb-git-95e34182fb34f84a6606d3726cf12ba397d039d8.tar.gz |
Manual 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 bb4ba2bf21b..16f11fe22c4 100644 --- a/sql/sql_connect.cc +++ b/sql/sql_connect.cc @@ -705,7 +705,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) |