summaryrefslogtreecommitdiff
path: root/client/client_priv.h
diff options
context:
space:
mode:
authorMagne Mahre <magne.mahre@sun.com>2010-02-17 10:18:17 +0100
committerMagne Mahre <magne.mahre@sun.com>2010-02-17 10:18:17 +0100
commit1f7f620f3042a5b9c08912ae64b92c129e03065f (patch)
treeaaccb83f92ede50e6323716295584410abd5c643 /client/client_priv.h
parent775fd3ec7131b71ab2bc6b4d958a6fe711f767b0 (diff)
downloadmariadb-git-1f7f620f3042a5b9c08912ae64b92c129e03065f.tar.gz
WL#5154 Remove deprecated 4.1 features
A set of program options and variables was deprecated in MySQL 5.1, and is hereby removed.
Diffstat (limited to 'client/client_priv.h')
-rw-r--r--client/client_priv.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/client/client_priv.h b/client/client_priv.h
index 9cd151f6160..3090a50bd43 100644
--- a/client/client_priv.h
+++ b/client/client_priv.h
@@ -34,7 +34,7 @@
enum options_client
{
OPT_CHARSETS_DIR=256, OPT_DEFAULT_CHARSET,
- OPT_PAGER, OPT_NOPAGER, OPT_TEE, OPT_NOTEE,
+ OPT_PAGER, OPT_TEE, OPT_NOTEE,
OPT_LOW_PRIORITY, OPT_AUTO_REPAIR, OPT_COMPRESS,
OPT_DROP, OPT_LOCKS, OPT_KEYWORDS, OPT_DELAYED, OPT_OPTIMIZE,
OPT_FTB, OPT_LTB, OPT_ENC, OPT_O_ENC, OPT_ESC, OPT_TABLES,
@@ -49,7 +49,7 @@ enum options_client
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_START_POSITION, OPT_STOP_POSITION, OPT_START_DATETIME, OPT_STOP_DATETIME,
+ OPT_STOP_POSITION, OPT_START_DATETIME, OPT_STOP_DATETIME,
OPT_SIGINT_IGNORE, OPT_HEXBLOB, OPT_ORDER_BY_PRIMARY, OPT_COUNT,
#ifdef HAVE_NDBCLUSTER_DB
OPT_NDBCLUSTER, OPT_NDB_CONNECTSTRING,