diff options
| author | unknown <bar@eagle.intranet.mysql.r18.ru> | 2005-03-25 10:43:35 +0400 |
|---|---|---|
| committer | unknown <bar@eagle.intranet.mysql.r18.ru> | 2005-03-25 10:43:35 +0400 |
| commit | 12664c053149c4af13b40a4a9663fc7816ae375a (patch) | |
| tree | be8c2e805ee462b2b1ae5dc0f8e3e3b9ca664eb4 /myisam | |
| parent | 4f1e4973945ff07deb7f50c45a10394be09b07c2 (diff) | |
| parent | ed124ab6b7be6a7a56831407b175068c096232cb (diff) | |
| download | mariadb-git-12664c053149c4af13b40a4a9663fc7816ae375a.tar.gz | |
Merge
myisam/myisamchk.c:
Auto merged
mysql-test/t/func_str.test:
Auto merged
sql/item_func.h:
Auto merged
sql/item_strfunc.h:
Auto merged
mysql-test/r/func_str.result:
merging
BitKeeper/etc/logging_ok:
Logging to logging@openlogging.org accepted
Diffstat (limited to 'myisam')
| -rw-r--r-- | myisam/myisamchk.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/myisam/myisamchk.c b/myisam/myisamchk.c index 09e2914bbaa..519e123e9da 100644 --- a/myisam/myisamchk.c +++ b/myisam/myisamchk.c @@ -427,8 +427,8 @@ static void usage(void) can't fix the data file.\n\ --character-sets-dir=...\n\ Directory where character sets are.\n\ - --set-character-set=name\n\ - Change the character set used by the index.\n\ + --set-collation=name\n\ + Change the collation used by the index.\n\ -q, --quick Faster repair by not modifying the data file.\n\ One can give a second '-q' to force myisamchk to\n\ modify the original datafile in case of duplicate keys.\n\ |