diff options
| author | unknown <serg@serg.mylan> | 2005-05-14 19:28:29 +0200 |
|---|---|---|
| committer | unknown <serg@serg.mylan> | 2005-05-14 19:28:29 +0200 |
| commit | 3efe3e26b4ec710b63a120325d2f2bdeb0fe0fc8 (patch) | |
| tree | ef2346baa5a2fe4cff6f083464efec28e5ea3c34 /client/client_priv.h | |
| parent | a34cb7932d914db76dd21fd28988cff7fa6279c9 (diff) | |
| parent | 89001262cf3b5b873b5f868a7cf06f4691bd4dbd (diff) | |
| download | mariadb-git-3efe3e26b4ec710b63a120325d2f2bdeb0fe0fc8.tar.gz | |
merged
BitKeeper/etc/logging_ok:
auto-union
client/mysql.cc:
automerged
Diffstat (limited to 'client/client_priv.h')
| -rw-r--r-- | client/client_priv.h | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/client/client_priv.h b/client/client_priv.h index 892a9185ffa..d656e54a2b8 100644 --- a/client/client_priv.h +++ b/client/client_priv.h @@ -45,10 +45,9 @@ enum options_client OPT_COMPATIBLE, OPT_RECONNECT, OPT_DELIMITER, OPT_SECURE_AUTH, OPT_OPEN_FILES_LIMIT, OPT_SET_CHARSET, OPT_CREATE_OPTIONS, OPT_START_POSITION, OPT_STOP_POSITION, OPT_START_DATETIME, OPT_STOP_DATETIME, - OPT_SIGINT_IGNORE, OPT_HEXBLOB, OPT_ORDER_BY_PRIMARY + OPT_SIGINT_IGNORE, OPT_HEXBLOB, OPT_ORDER_BY_PRIMARY, OPT_COUNT, #ifdef HAVE_NDBCLUSTER_DB - ,OPT_NDBCLUSTER,OPT_NDB_CONNECTSTRING + OPT_NDBCLUSTER, OPT_NDB_CONNECTSTRING, #endif - ,OPT_IGNORE_TABLE - ,OPT_SHOW_WARNINGS + OPT_IGNORE_TABLE,OPT_INSERT_IGNORE,OPT_SHOW_WARNINGS }; |