diff options
| author | unknown <jani@a193-229-222-105.elisa-laajakaista.fi> | 2005-12-04 15:34:47 +0200 |
|---|---|---|
| committer | unknown <jani@a193-229-222-105.elisa-laajakaista.fi> | 2005-12-04 15:34:47 +0200 |
| commit | dd0d716552847047a736409ff91f265433316c65 (patch) | |
| tree | eee6985f01212cec40e89ffd23321e7228a7a41b /isam | |
| parent | 7368605c72930f63ae9b937dfc2a932c5ef700c2 (diff) | |
| parent | 1d5fc2ff2ea16f6bcda463b775a9f5255415cd53 (diff) | |
| download | mariadb-git-dd0d716552847047a736409ff91f265433316c65.tar.gz | |
Merge a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-4.0
into a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-4.1
client/mysql.cc:
Auto merged
client/mysqladmin.cc:
Auto merged
client/mysqlbinlog.cc:
Auto merged
client/mysqlcheck.c:
Auto merged
client/mysqldump.c:
Auto merged
client/mysqlimport.c:
Auto merged
client/mysqlshow.c:
Auto merged
isam/isamchk.c:
Auto merged
myisam/myisamchk.c:
Auto merged
myisam/myisampack.c:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/mysqld.cc:
Auto merged
sql/sql_parse.cc:
Merged from 4.0.
Diffstat (limited to 'isam')
| -rw-r--r-- | isam/isamchk.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/isam/isamchk.c b/isam/isamchk.c index 2912131d25b..cacfca8be0a 100644 --- a/isam/isamchk.c +++ b/isam/isamchk.c @@ -244,7 +244,7 @@ static struct my_option my_long_options[] = "Analyze distribution of keys. Will make some joins in MySQL faster.", 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 {"character-sets-dir", OPT_CHARSETS_DIR_IC, |