diff options
| author | unknown <joerg@mysql.com> | 2005-11-21 15:49:34 +0100 |
|---|---|---|
| committer | unknown <joerg@mysql.com> | 2005-11-21 15:49:34 +0100 |
| commit | 76faa4b5864d4e3b73226e6a4de324c0abe94659 (patch) | |
| tree | ab0ac30282145c478b02a494feae2ec8046c59be /myisam | |
| parent | 32e6e6aac6520dca9af8b6e00a49f25c2f2a4d73 (diff) | |
| parent | e8885320dd8f87e0f248fcd822b01423febbbe85 (diff) | |
| download | mariadb-git-76faa4b5864d4e3b73226e6a4de324c0abe94659.tar.gz | |
Merge the last 5.0.16 (Unix, Windows) and 5.0.16a (Netware) changes to the general tree.
client/mysql.cc:
Auto merged
include/my_global.h:
Auto merged
include/my_sys.h:
Auto merged
mysys/my_create.c:
Auto merged
mysys/my_open.c:
Auto merged
sql/log.cc:
Auto merged
sql/sql_class.h:
Auto merged
sql/sql_repl.cc:
Auto merged
configure.in:
Manual merge - new version (17) takes precedence.
Diffstat (limited to 'myisam')
| -rw-r--r-- | myisam/myisamchk.c | 2 | ||||
| -rw-r--r-- | myisam/myisampack.c | 2 |
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.", |