summaryrefslogtreecommitdiff
path: root/client/client_priv.h
diff options
context:
space:
mode:
authoriggy@amd64.(none) <>2007-08-03 21:44:59 -0400
committeriggy@amd64.(none) <>2007-08-03 21:44:59 -0400
commit64b6c611081e4a2cc10272888a2ba987dcecb188 (patch)
tree8a56836c31dc997c4350174acfc4c641d741f298 /client/client_priv.h
parentdb15f4daebe6cbdc27990182f1a1c000bc80769a (diff)
parent171f402ad448c92dc76ed38a52008de1e6a351ac (diff)
downloadmariadb-git-64b6c611081e4a2cc10272888a2ba987dcecb188.tar.gz
Merge amd64.(none):/src/mysql-5.1-maint
into amd64.(none):/src/mysql-5.1-build_29903
Diffstat (limited to 'client/client_priv.h')
-rw-r--r--client/client_priv.h2
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