Merge MySQL 5.1.44 into MariaDB.

This commit is contained in:
unknown 2010-03-04 09:03:07 +01:00
commit 4bf849c23c
301 changed files with 10423 additions and 2259 deletions

View file

@ -710,7 +710,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)