summaryrefslogtreecommitdiff
path: root/sql-common
diff options
context:
space:
mode:
authorMichael Widenius <monty@askmonty.org>2011-02-22 11:15:47 +0200
committerMichael Widenius <monty@askmonty.org>2011-02-22 11:15:47 +0200
commit4ad6d6b6c9e551d84fe727d1f48edc8722098bfd (patch)
treee305bc182a35eaf41802e4cc51a61bfd5bde5cd2 /sql-common
parent38e3787af4ac87274c7ef0e632a97aa1217e284a (diff)
parent2c7d6f12ee10903c3002bba42ee15abc2b89fa8e (diff)
downloadmariadb-git-4ad6d6b6c9e551d84fe727d1f48edc8722098bfd.tar.gz
Merge in new handler and handlersocket code into 5.3 main
Diffstat (limited to 'sql-common')
-rw-r--r--sql-common/client.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/sql-common/client.c b/sql-common/client.c
index 3788ca9829b..c449cd17100 100644
--- a/sql-common/client.c
+++ b/sql-common/client.c
@@ -1978,7 +1978,7 @@ static int send_change_user_packet(MCPVIO_EXT *mpvio,
char *buff, *end;
int res= 1;
- buff= my_alloca(USERNAME_LENGTH + data_len + 1 + NAME_LEN + 2 + NAME_LEN);
+ buff= my_alloca(USERNAME_LENGTH+1 + data_len+1 + NAME_LEN+1 + 2 + NAME_LEN+1);
end= strmake(buff, mysql->user, USERNAME_LENGTH) + 1;