diff options
| author | Igor Babaev <igor@askmonty.org> | 2016-08-31 16:16:54 -0700 |
|---|---|---|
| committer | Igor Babaev <igor@askmonty.org> | 2016-08-31 16:16:54 -0700 |
| commit | 3fb4f9bb93868ce5c7e385d0545c00755d8e23bd (patch) | |
| tree | 8ea1c005920b2ef9d7c7f1114c5433c728751b72 /sql/sql_priv.h | |
| parent | 670760d504bebdf542df890f4d40f4cd3ff7a2c8 (diff) | |
| parent | eb2c1474752a5f743db638d5b06612c9e3f07f74 (diff) | |
| download | mariadb-git-3fb4f9bb93868ce5c7e385d0545c00755d8e23bd.tar.gz | |
Merge branch '10.2-mdev9197-cons' of github.com:shagalla/server
into branch 10.2-mdev9197.
Diffstat (limited to 'sql/sql_priv.h')
| -rw-r--r-- | sql/sql_priv.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/sql/sql_priv.h b/sql/sql_priv.h index 40349d3802a..4bf93040dc8 100644 --- a/sql/sql_priv.h +++ b/sql/sql_priv.h @@ -226,6 +226,7 @@ #define OPTIMIZER_SWITCH_EXTENDED_KEYS (1ULL << 27) #define OPTIMIZER_SWITCH_EXISTS_TO_IN (1ULL << 28) #define OPTIMIZER_SWITCH_ORDERBY_EQ_PROP (1ULL << 29) +#define OPTIMIZER_SWITCH_COND_PUSHDOWN_FOR_DERIVED (1ULL << 30) #define OPTIMIZER_SWITCH_DEFAULT (OPTIMIZER_SWITCH_INDEX_MERGE | \ OPTIMIZER_SWITCH_INDEX_MERGE_UNION | \ @@ -249,7 +250,8 @@ OPTIMIZER_SWITCH_SEMIJOIN | \ OPTIMIZER_SWITCH_FIRSTMATCH | \ OPTIMIZER_SWITCH_LOOSE_SCAN | \ - OPTIMIZER_SWITCH_EXISTS_TO_IN) + OPTIMIZER_SWITCH_EXISTS_TO_IN | \ + OPTIMIZER_SWITCH_COND_PUSHDOWN_FOR_DERIVED) /* Replication uses 8 bytes to store SQL_MODE in the binary log. The day you use strictly more than 64 bits by adding one more define above, you should |