diff options
| author | pem@mysql.com <> | 2004-04-07 19:07:44 +0200 |
|---|---|---|
| committer | pem@mysql.com <> | 2004-04-07 19:07:44 +0200 |
| commit | dfd59e296e2c267a21f1ea8b3b937e07730dad0d (patch) | |
| tree | e5ac1517ff3dccc42352b7bac39ecd1c093d0ae6 /myisam/myisamchk.c | |
| parent | 1541f2e7949416d6e172ef6406ecf140d3b26659 (diff) | |
| parent | 61fd95d168b51092b7ce3ff56b2c8c8ed1a49c0f (diff) | |
| download | mariadb-git-dfd59e296e2c267a21f1ea8b3b937e07730dad0d.tar.gz | |
Merge 4.1 -> 5.0.
Diffstat (limited to 'myisam/myisamchk.c')
| -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 3e50e786089..a96632b4f3c 100644 --- a/myisam/myisamchk.c +++ b/myisam/myisamchk.c @@ -170,7 +170,7 @@ static struct my_option my_long_options[] = 0, 0, 0, GET_NO_ARG, NO_ARG, 0, 0, 0, 0, 0, 0}, {"character-sets-dir", OPT_CHARSETS_DIR, "Directory where character sets are.", - (gptr*) &set_charset_name, 0, 0, GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0}, + (gptr*) &charsets_dir, 0, 0, GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0}, {"check", 'c', "Check table for errors.", 0, 0, 0, GET_NO_ARG, NO_ARG, 0, 0, 0, 0, 0, 0}, @@ -253,7 +253,7 @@ static struct my_option my_long_options[] = 0, GET_ULL, OPT_ARG, 0, 0, 0, 0, 0, 0}, {"set-character-set", OPT_SET_CHARSET, "Change the character set used by the index", - 0, 0, 0, GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0}, + (gptr*) &set_charset_name, 0, 0, GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0}, {"set-variable", 'O', "Change the value of a variable. Please note that this option is deprecated; you can set variables directly with --variable-name=value.", 0, 0, 0, GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0}, |