summaryrefslogtreecommitdiff
path: root/sql/sql_priv.h
diff options
context:
space:
mode:
authorSergei Petrunia <psergey@askmonty.org>2016-06-01 23:43:11 +0300
committerSergei Petrunia <psergey@askmonty.org>2016-06-01 23:43:11 +0300
commit5a5a54f7b4cb03d8d8bf6199baa52bdc2b5350b7 (patch)
tree9a7902f4ebfca4a47e695eba1f1aa71a1c54eb3f /sql/sql_priv.h
parenta85f6533f13a02a0b0547656a5ff918a1d91d887 (diff)
downloadmariadb-git-5a5a54f7b4cb03d8d8bf6199baa52bdc2b5350b7.tar.gz
MDEV-8989: ORDER BY optimizer ignores equality propagation
Post-fix #2: - Update test results - Make the optimization conditional under @@optimizer_switch flag. - The optimization is now disabled by default, so .result files are changed back to be what they were before the MDEV-8989 patch.
Diffstat (limited to 'sql/sql_priv.h')
-rw-r--r--sql/sql_priv.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/sql_priv.h b/sql/sql_priv.h
index db7149953f3..def15060978 100644
--- a/sql/sql_priv.h
+++ b/sql/sql_priv.h
@@ -224,7 +224,7 @@
#define OPTIMIZER_SWITCH_TABLE_ELIMINATION (1ULL << 26)
#define OPTIMIZER_SWITCH_EXTENDED_KEYS (1ULL << 27)
#define OPTIMIZER_SWITCH_EXISTS_TO_IN (1ULL << 28)
-#define OPTIMIZER_SWITCH_USE_CONDITION_SELECTIVITY (1ULL << 29)
+#define OPTIMIZER_SWITCH_ORDERBY_EQ_PROP (1ULL << 29)
#define OPTIMIZER_SWITCH_DEFAULT (OPTIMIZER_SWITCH_INDEX_MERGE | \
OPTIMIZER_SWITCH_INDEX_MERGE_UNION | \