summaryrefslogtreecommitdiff
path: root/sql/sql_priv.h
diff options
context:
space:
mode:
authorIgor Babaev <igor@askmonty.org>2012-03-02 15:03:20 -0800
committerIgor Babaev <igor@askmonty.org>2012-03-02 15:03:20 -0800
commit8bc5045ea377f39701f421cc7ae00756f79962d2 (patch)
tree751d8bbe4d3844ab9dc16d0c07855e40028cbabc /sql/sql_priv.h
parent8b469eb5151cb1b7da00cee3a7b42c10bd7ff51e (diff)
parent2521ac0c7f2450d588fa1704a6eef785da8812a9 (diff)
downloadmariadb-git-8bc5045ea377f39701f421cc7ae00756f79962d2.tar.gz
Merge MWL #247 from mariadb 5.3 -> mariadb 5.5.
Diffstat (limited to 'sql/sql_priv.h')
-rw-r--r--sql/sql_priv.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/sql/sql_priv.h b/sql/sql_priv.h
index b9017f1e5ab..713c0744e1f 100644
--- a/sql/sql_priv.h
+++ b/sql/sql_priv.h
@@ -190,7 +190,8 @@
#define OPTIMIZER_SWITCH_JOIN_CACHE_BKA (1ULL << 24)
#define OPTIMIZER_SWITCH_OPTIMIZE_JOIN_BUFFER_SIZE (1ULL << 25)
#define OPTIMIZER_SWITCH_TABLE_ELIMINATION (1ULL << 26)
-#define OPTIMIZER_SWITCH_LAST (1ULL << 26)
+#define OPTIMIZER_SWITCH_EXTENDED_KEYS (1ULL << 27)
+#define OPTIMIZER_SWITCH_LAST (1ULL << 27)
#define OPTIMIZER_SWITCH_DEFAULT (OPTIMIZER_SWITCH_INDEX_MERGE | \
OPTIMIZER_SWITCH_INDEX_MERGE_UNION | \