diff options
| author | unknown <iggy@amd64.(none)> | 2007-08-03 21:44:59 -0400 |
|---|---|---|
| committer | unknown <iggy@amd64.(none)> | 2007-08-03 21:44:59 -0400 |
| commit | e8469adb1782b7c9bc4b79aae000ac7e640828d9 (patch) | |
| tree | 8a56836c31dc997c4350174acfc4c641d741f298 /client/client_priv.h | |
| parent | a455d7f97edd31ac51b11e5bdd002197d04816dc (diff) | |
| parent | ac107ac16ae28fa8ec293e234e43fc6f04b67590 (diff) | |
| download | mariadb-git-e8469adb1782b7c9bc4b79aae000ac7e640828d9.tar.gz | |
Merge amd64.(none):/src/mysql-5.1-maint
into amd64.(none):/src/mysql-5.1-build_29903
BitKeeper/etc/ignore:
auto-union
client/client_priv.h:
Auto merged
BitKeeper/deleted/.del-CMakeLists.txt~5b8836e4:
Auto merged
client/mysql.cc:
Auto merged
libmysqld/CMakeLists.txt:
Auto merged
libmysqld/Makefile.am:
Auto merged
libmysqld/examples/Makefile.am:
Auto merged
mysql-test/mysql-test-run.pl:
Auto merged
BitKeeper/deleted/.del-CMakeLists.txt~2eb9019b:
Manual merge.
Diffstat (limited to 'client/client_priv.h')
| -rw-r--r-- | client/client_priv.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/client/client_priv.h b/client/client_priv.h index 97ff44b67fc..a2f61b9e9ca 100644 --- a/client/client_priv.h +++ b/client/client_priv.h @@ -48,7 +48,7 @@ enum options_client OPT_PROMPT, OPT_IGN_LINES,OPT_TRANSACTION,OPT_MYSQL_PROTOCOL, OPT_SHARED_MEMORY_BASE_NAME, OPT_FRM, OPT_SKIP_OPTIMIZATION, OPT_COMPATIBLE, OPT_RECONNECT, OPT_DELIMITER, OPT_SECURE_AUTH, - OPT_OPEN_FILES_LIMIT, OPT_SET_CHARSET, OPT_CREATE_OPTIONS, + OPT_OPEN_FILES_LIMIT, OPT_SET_CHARSET, OPT_CREATE_OPTIONS, OPT_SERVER_ARG, OPT_START_POSITION, OPT_STOP_POSITION, OPT_START_DATETIME, OPT_STOP_DATETIME, OPT_SIGINT_IGNORE, OPT_HEXBLOB, OPT_ORDER_BY_PRIMARY, OPT_COUNT, #ifdef HAVE_NDBCLUSTER_DB |