diff options
| author | unknown <jani@a193-229-222-105.elisa-laajakaista.fi> | 2005-08-25 12:08:26 +0300 |
|---|---|---|
| committer | unknown <jani@a193-229-222-105.elisa-laajakaista.fi> | 2005-08-25 12:08:26 +0300 |
| commit | ea09b970365c8d2e938b2d07c8b0ca76ae454d91 (patch) | |
| tree | 782ea3e351ef7c2e3b100d3ca1ee0809f8ddc9ec /client/client_priv.h | |
| parent | 2be4560e71dadf910cfe8cc69450c11a470f1fd1 (diff) | |
| parent | 97dbe8dbe31d8bc8625c19a0a141a7fc910c37db (diff) | |
| download | mariadb-git-ea09b970365c8d2e938b2d07c8b0ca76ae454d91.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/mysqlcheck.c:
Auto merged
client/mysqlimport.c:
Auto merged
client/mysqltest.c:
Auto merged
extra/my_print_defaults.c:
Auto merged
extra/perror.c:
Auto merged
extra/resolve_stack_dump.c:
Auto merged
include/help_end.h:
Auto merged
include/help_start.h:
Auto merged
isam/isamchk.c:
Auto merged
isam/pack_isam.c:
Auto merged
myisam/myisamlog.c:
Auto merged
netware/myisamchk.def:
Auto merged
netware/mysql.def:
Auto merged
netware/mysqladmin.def:
Auto merged
netware/mysqlbinlog.def:
Auto merged
netware/mysqlcheck.def:
Auto merged
netware/mysqldump.def:
Auto merged
netware/mysqlimport.def:
Auto merged
netware/mysqlshow.def:
Auto merged
client/client_priv.h:
Merged from 4.0.
client/mysql.cc:
Merged from 4.0.
client/mysqladmin.cc:
Merged from 4.0.
client/mysqlbinlog.cc:
Merged from 4.0.
client/mysqldump.c:
Merged from 4.0.
client/mysqlshow.c:
Merged from 4.0.
myisam/myisamchk.c:
Merged from 4.0.
myisam/myisampack.c:
Merged from 4.0.
netware/mysql_test_run.c:
Merged from 4.0.
netware/mysqld_safe.c:
Merged from 4.0.
sql/mysqld.cc:
Merged from 4.0.
Diffstat (limited to 'client/client_priv.h')
| -rw-r--r-- | client/client_priv.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/client/client_priv.h b/client/client_priv.h index 5085c03e84f..37ed407de68 100644 --- a/client/client_priv.h +++ b/client/client_priv.h @@ -49,5 +49,6 @@ enum options_client #ifdef HAVE_NDBCLUSTER_DB ,OPT_NDBCLUSTER,OPT_NDB_CONNECTSTRING #endif - ,OPT_IGNORE_TABLE,OPT_INSERT_IGNORE,OPT_DROP_DATABASE + ,OPT_IGNORE_TABLE,OPT_INSERT_IGNORE,OPT_DROP_DATABASE, + OPT_AUTO_CLOSE }; |