diff options
| author | unknown <msvensson@neptunus.(none)> | 2006-10-26 20:11:13 +0200 |
|---|---|---|
| committer | unknown <msvensson@neptunus.(none)> | 2006-10-26 20:11:13 +0200 |
| commit | 159226b52d25426467cfaaa53b3fce99c9a1d6c8 (patch) | |
| tree | 62c960e769ab1a346edfd6d95d832b8f9d59ac81 /client/mysql.cc | |
| parent | d2709b7a6b8653468f8e3cca1125ef89c17486a1 (diff) | |
| parent | 08d43705a6ab99779cab4fa281b45e00017f59b8 (diff) | |
| download | mariadb-git-159226b52d25426467cfaaa53b3fce99c9a1d6c8.tar.gz | |
Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
into neptunus.(none):/home/msvensson/mysql/mysql-5.1-new-maint
client/mysql.cc:
Auto merged
mysql-test/r/mysql.result:
Auto merged
mysql-test/t/mysql.test:
Auto merged
Diffstat (limited to 'client/mysql.cc')
| -rw-r--r-- | client/mysql.cc | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/client/mysql.cc b/client/mysql.cc index fc26a741632..ea2c8663bb1 100644 --- a/client/mysql.cc +++ b/client/mysql.cc @@ -2920,7 +2920,11 @@ com_connect(String *buffer, char *line) bzero(buff, sizeof(buff)); if (buffer) { - strmake(buff, line, sizeof(buff) - 1); + /* + Two null bytes are needed in the end of buff to allow + get_arg to find end of string the second time it's called. + */ + strmake(buff, line, sizeof(buff)-2); tmp= get_arg(buff, 0); if (tmp && *tmp) { |