summaryrefslogtreecommitdiff
path: root/client/client_priv.h
diff options
context:
space:
mode:
Diffstat (limited to 'client/client_priv.h')
-rw-r--r--client/client_priv.h5
1 files changed, 3 insertions, 2 deletions
diff --git a/client/client_priv.h b/client/client_priv.h
index 9d2fc2be141..689f7277c2e 100644
--- a/client/client_priv.h
+++ b/client/client_priv.h
@@ -37,7 +37,7 @@
#define WARN_DEPRECATED(Ver,Old,New) \
do { \
printf("Warning: The option '%s' is deprecated and will be removed " \
- "in MySQL %s. Please use %s instead.\n", (Old), (Ver), (New)); \
+ "in a future release. Please use %s instead.\n", (Old), (New)); \
} while(0);
enum options_client
@@ -57,7 +57,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_SERVER_ARG,
+ OPT_OPEN_FILES_LIMIT, OPT_SET_CHARSET, OPT_SERVER_ARG,
OPT_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
@@ -90,5 +90,6 @@ enum options_client
OPT_DEBUG_INFO, OPT_DEBUG_CHECK, OPT_COLUMN_TYPES, OPT_ERROR_LOG_FILE,
OPT_WRITE_BINLOG, OPT_DUMP_DATE,
OPT_FIRST_SLAVE,
+ OPT_ALL,
OPT_MAX_CLIENT_OPTION
};