diff options
| author | cmiller@zippy.cornsilk.net <> | 2006-09-28 07:35:04 -0400 |
|---|---|---|
| committer | cmiller@zippy.cornsilk.net <> | 2006-09-28 07:35:04 -0400 |
| commit | 6042eebda6cbcda6e462497ec9dc466ef7bd822c (patch) | |
| tree | ffcaba33428981d743d5080320c0fdee220422cd /client/mysql.cc | |
| parent | 290bb8ec1439ff028c0e627964f5388b289b915e (diff) | |
| parent | ca7ade8825cbc1bc3621cfb3aef3ff51d9e725ce (diff) | |
| download | mariadb-git-6042eebda6cbcda6e462497ec9dc466ef7bd822c.tar.gz | |
Merge zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint
into zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-maint
Diffstat (limited to 'client/mysql.cc')
| -rw-r--r-- | client/mysql.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/client/mysql.cc b/client/mysql.cc index b5f28090283..9ce3139c56f 100644 --- a/client/mysql.cc +++ b/client/mysql.cc @@ -2896,7 +2896,7 @@ com_connect(String *buffer, char *line) bzero(buff, sizeof(buff)); if (buffer) { - strmake(buff, line, sizeof(buff)); + strmake(buff, line, sizeof(buff) - 1); tmp= get_arg(buff, 0); if (tmp && *tmp) { @@ -3011,7 +3011,7 @@ com_use(String *buffer __attribute__((unused)), char *line) int select_db; bzero(buff, sizeof(buff)); - strmov(buff, line); + strmake(buff, line, sizeof(buff) - 1); tmp= get_arg(buff, 0); if (!tmp || !*tmp) { |