diff options
| author | unknown <monty@mishka.local> | 2005-07-31 12:56:02 +0300 |
|---|---|---|
| committer | unknown <monty@mishka.local> | 2005-07-31 12:56:02 +0300 |
| commit | e43a6096009fddf79667f7def1caca4c907dfd81 (patch) | |
| tree | 094caf1e8037736fbc61edda0c5c2405ec59ccd6 /client/client_priv.h | |
| parent | 67a39457a5b431bf9c891f96bcd05ab84f91fdb4 (diff) | |
| parent | 6b3478ec1248825122f837411704ab387651b715 (diff) | |
| download | mariadb-git-e43a6096009fddf79667f7def1caca4c907dfd81.tar.gz | |
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into mishka.local:/home/my/mysql-5.0
mysql-test/t/sp.test:
Auto merged
sql/set_var.cc:
Auto merged
sql/sql_view.cc:
Auto merged
client/client_priv.h:
Simple merge
client/mysqldump.c:
Simple merge
mysql-test/r/variables.result:
Simple merge
mysql-test/t/variables.test:
Simple merge
sql/sql_trigger.cc:
Simple merge
Diffstat (limited to 'client/client_priv.h')
| -rw-r--r-- | client/client_priv.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/client/client_priv.h b/client/client_priv.h index 27e0f838995..997f9ffe552 100644 --- a/client/client_priv.h +++ b/client/client_priv.h @@ -49,6 +49,6 @@ enum options_client #ifdef HAVE_NDBCLUSTER_DB OPT_NDBCLUSTER, OPT_NDB_CONNECTSTRING, #endif - OPT_IGNORE_TABLE, OPT_INSERT_IGNORE, OPT_SHOW_WARNINGS, OPT_DROP_DATABASE, - OPT_TRIGGER + OPT_TRIGGERS, + OPT_IGNORE_TABLE,OPT_INSERT_IGNORE,OPT_SHOW_WARNINGS,OPT_DROP_DATABASE, }; |