diff options
| author | unknown <ramil/ram@ramil.myoffice.izhnet.ru> | 2007-04-19 11:07:19 +0500 |
|---|---|---|
| committer | unknown <ramil/ram@ramil.myoffice.izhnet.ru> | 2007-04-19 11:07:19 +0500 |
| commit | b14a8f8dce623afa31ec2ebc02d8a5b014949e13 (patch) | |
| tree | 8babc6c834f707a05f1f349fdc526a440198b251 /client/mysql.cc | |
| parent | 74192cf9840bd461375c1cff60eb6a686c381657 (diff) | |
| parent | be90800c9f7fed4fdae2acfa12f2ea369eeb07e7 (diff) | |
| download | mariadb-git-b14a8f8dce623afa31ec2ebc02d8a5b014949e13.tar.gz | |
Merge mysql.com:/home/ram/work/b26851/b26851.5.0
into mysql.com:/home/ram/work/b26851/b26851.5.1
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 | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/client/mysql.cc b/client/mysql.cc index 55efa9d22be..8ac9abf3310 100644 --- a/client/mysql.cc +++ b/client/mysql.cc @@ -818,7 +818,7 @@ get_one_option(int optid, const struct my_option *opt __attribute__((unused)), break; #endif case OPT_CHARSETS_DIR: - strmov(mysql_charsets_dir, argument); + strmake(mysql_charsets_dir, argument, sizeof(mysql_charsets_dir) - 1); charsets_dir = mysql_charsets_dir; break; case OPT_DEFAULT_CHARSET: @@ -871,7 +871,7 @@ get_one_option(int optid, const struct my_option *opt __attribute__((unused)), if (argument && strlen(argument)) { default_pager_set= 1; - strmov(pager, argument); + strmake(pager, argument, sizeof(pager) - 1); strmov(default_pager, pager); } else if (default_pager_set) |