diff options
| author | unknown <ramil/ram@mysql.com/ramil.myoffice.izhnet.ru> | 2007-04-19 11:45:26 +0500 |
|---|---|---|
| committer | unknown <ramil/ram@mysql.com/ramil.myoffice.izhnet.ru> | 2007-04-19 11:45:26 +0500 |
| commit | 30f3f3a037beb745f367db7c1695122cbb4c1517 (patch) | |
| tree | 46fd03a60c03dfcaf4763b367c2aa091fb7ca5ce /client | |
| parent | 39754b2423d78e52735dfa5f54da471d557db4df (diff) | |
| parent | be90800c9f7fed4fdae2acfa12f2ea369eeb07e7 (diff) | |
| download | mariadb-git-30f3f3a037beb745f367db7c1695122cbb4c1517.tar.gz | |
Merge mysql.com:/home/ram/work/mysql-5.0-maint
into mysql.com:/home/ram/work/b26851/b26851.5.0
client/mysql.cc:
Auto merged
Diffstat (limited to 'client')
| -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 510420fdf3d..2ea464c2bdf 100644 --- a/client/mysql.cc +++ b/client/mysql.cc @@ -808,7 +808,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: @@ -861,7 +861,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) |