diff options
| author | unknown <jani@a193-229-222-105.elisa-laajakaista.fi> | 2005-08-26 15:56:52 +0300 |
|---|---|---|
| committer | unknown <jani@a193-229-222-105.elisa-laajakaista.fi> | 2005-08-26 15:56:52 +0300 |
| commit | 9d4a4f38d0fca880c76998e6726ca3887b122632 (patch) | |
| tree | bd37457a3ede5f89be347874aa575e32bca225d0 /client/client_priv.h | |
| parent | ab161754f591371eba2868bfa03977bcbe5b6d7e (diff) | |
| parent | 7b8ab0e1cff25108f3b044189db879fd39073290 (diff) | |
| download | mariadb-git-9d4a4f38d0fca880c76998e6726ca3887b122632.tar.gz | |
Merge a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-4.1
into a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-5.0
BitKeeper/deleted/.del-isamchk.c~c0f59c2687d2248f:
Auto merged
BitKeeper/etc/config:
Auto merged
client/mysql.cc:
Auto merged
client/mysqlcheck.c:
Auto merged
BitKeeper/deleted/.del-pack_isam.c~43801f0df7504834:
Auto merged
client/mysqldump.c:
Auto merged
client/mysqlimport.c:
Auto merged
client/mysqlshow.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
myisam/myisamchk.c:
Auto merged
myisam/myisamlog.c:
Auto merged
myisam/myisampack.c:
Auto merged
netware/myisamchk.def:
Auto merged
netware/mysql.def:
Auto merged
netware/mysql_test_run.c:
Auto merged
netware/mysqladmin.def:
Auto merged
netware/mysqlbinlog.def:
Auto merged
netware/mysqlcheck.def:
Auto merged
netware/mysqld_safe.c:
Auto merged
netware/mysqldump.def:
Auto merged
netware/mysqlimport.def:
Auto merged
netware/mysqlshow.def:
Auto merged
sql/ha_blackhole.cc:
Auto merged
sql/ha_blackhole.h:
Auto merged
sql/mysqld.cc:
Auto merged
client/client_priv.h:
Merged from 4.1
client/mysqladmin.cc:
Merged from 4.1
client/mysqlbinlog.cc:
Merged from 4.1
mysys/charset.c:
Merged from 4.1
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 74bc0b41006..18102fa8b16 100644 --- a/client/client_priv.h +++ b/client/client_priv.h @@ -50,5 +50,6 @@ enum options_client OPT_NDBCLUSTER, OPT_NDB_CONNECTSTRING, #endif OPT_TRIGGERS, - OPT_IGNORE_TABLE,OPT_INSERT_IGNORE,OPT_SHOW_WARNINGS,OPT_DROP_DATABASE + OPT_IGNORE_TABLE,OPT_INSERT_IGNORE,OPT_SHOW_WARNINGS,OPT_DROP_DATABASE, + OPT_AUTO_CLOSE }; |