diff options
| author | unknown <ramil/ram@mysql.com/myoffice.izhnet.ru> | 2006-09-18 09:06:05 +0500 |
|---|---|---|
| committer | unknown <ramil/ram@mysql.com/myoffice.izhnet.ru> | 2006-09-18 09:06:05 +0500 |
| commit | 1ba16a86c5b40f96dbe41ebd03bb2c7bbd18b8e1 (patch) | |
| tree | 17f4a62a691e00f6c95336351ef93af5489ce1ac /client/mysql.cc | |
| parent | 5d7cdfb358b1fdf3360d19d94ee70a56cbbcdbc0 (diff) | |
| parent | c3508e602f55a309a785b27d95dd0cce8df909c7 (diff) | |
| download | mariadb-git-1ba16a86c5b40f96dbe41ebd03bb2c7bbd18b8e1.tar.gz | |
Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1-maint
into mysql.com:/usr/home/ram/work/bug21142/my41-bug21142
client/mysql.cc:
Auto merged
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 f9ca9d4f829..c9ebf7d09f5 100644 --- a/client/mysql.cc +++ b/client/mysql.cc @@ -2629,7 +2629,7 @@ com_connect(String *buffer, char *line) bzero(buff, sizeof(buff)); if (buffer) { - strmov(buff, line); + strmake(buff, line, sizeof(buff) - 1); tmp= get_arg(buff, 0); if (tmp && *tmp) { @@ -2743,7 +2743,7 @@ com_use(String *buffer __attribute__((unused)), char *line) char *tmp, buff[FN_REFLEN + 1]; bzero(buff, sizeof(buff)); - strmov(buff, line); + strmake(buff, line, sizeof(buff) - 1); tmp= get_arg(buff, 0); if (!tmp || !*tmp) { |