summaryrefslogtreecommitdiff
path: root/myisam
diff options
context:
space:
mode:
authorjoerg@mysql.com <>2005-11-21 15:49:34 +0100
committerjoerg@mysql.com <>2005-11-21 15:49:34 +0100
commitb3b124f9e4380adf99bf3aae5a606b71917bb13c (patch)
treeab0ac30282145c478b02a494feae2ec8046c59be /myisam
parentb040ad35b1007508c7825b3c496db22f4ff4992f (diff)
parenta50cc250ffff75eb1a52f9dfeb90a391e1a04cf9 (diff)
downloadmariadb-git-b3b124f9e4380adf99bf3aae5a606b71917bb13c.tar.gz
Merge the last 5.0.16 (Unix, Windows) and 5.0.16a (Netware) changes to the general tree.
Diffstat (limited to 'myisam')
-rw-r--r--myisam/myisamchk.c2
-rw-r--r--myisam/myisampack.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/myisam/myisamchk.c b/myisam/myisamchk.c
index b3d95d21eb7..e2c8b446322 100644
--- a/myisam/myisamchk.c
+++ b/myisam/myisamchk.c
@@ -165,7 +165,7 @@ static struct my_option my_long_options[] =
"Analyze distribution of keys. Will make some joins in MySQL faster. You can check the calculated distribution.",
0, 0, 0, GET_NO_ARG, NO_ARG, 0, 0, 0, 0, 0, 0},
#ifdef __NETWARE__
- {"auto-close", OPT_AUTO_CLOSE, "Auto close the screen on exit for Netware.",
+ {"autoclose", OPT_AUTO_CLOSE, "Auto close the screen on exit for Netware.",
0, 0, 0, GET_NO_ARG, NO_ARG, 0, 0, 0, 0, 0, 0},
#endif
{"block-search", 'b',
diff --git a/myisam/myisampack.c b/myisam/myisampack.c
index 114e80d8f1a..d691c24e890 100644
--- a/myisam/myisampack.c
+++ b/myisam/myisampack.c
@@ -254,7 +254,7 @@ enum options_mp {OPT_CHARSETS_DIR_MP=256, OPT_AUTO_CLOSE};
static struct my_option my_long_options[] =
{
#ifdef __NETWARE__
- {"auto-close", OPT_AUTO_CLOSE, "Auto close the screen on exit for Netware.",
+ {"autoclose", OPT_AUTO_CLOSE, "Auto close the screen on exit for Netware.",
0, 0, 0, GET_NO_ARG, NO_ARG, 0, 0, 0, 0, 0, 0},
#endif
{"backup", 'b', "Make a backup of the table as table_name.OLD.",