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 | 69e0cc6d41815775f9b62ea2619d134e69c51f7e (patch) | |
| tree | eee6985f01212cec40e89ffd23321e7228a7a41b /client/mysqlbinlog.cc | |
| parent | f173e09f0dbc117238560ff5936b149d5024871c (diff) | |
| parent | 60f2e7a9a4518c0ff271ccb2153060bb68f658a7 (diff) | |
| download | mariadb-git-69e0cc6d41815775f9b62ea2619d134e69c51f7e.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 'client/mysqlbinlog.cc')
| -rw-r--r-- | client/mysqlbinlog.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/client/mysqlbinlog.cc b/client/mysqlbinlog.cc index 802d5081ad6..627e0945d93 100644 --- a/client/mysqlbinlog.cc +++ b/client/mysqlbinlog.cc @@ -433,7 +433,7 @@ 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 #ifndef DBUG_OFF |