diff options
| author | Galina Shalygina <galina.shalygina@mariadb.com> | 2018-05-13 18:28:40 +0200 |
|---|---|---|
| committer | Galina Shalygina <galina.shalygina@mariadb.com> | 2018-05-13 18:28:40 +0200 |
| commit | 72529181d45b33bc4e50fdaf98cf84962088a51d (patch) | |
| tree | 7b76390212c523a1527a86b49c0e9c1adff5b80e /sql/sql_priv.h | |
| parent | eaaf004cc194d1f1fc422ebbd986ae69fc854d1c (diff) | |
| parent | 79a7641b40c7b12dda4a6e30e7688b2f796e6a98 (diff) | |
| download | mariadb-git-bb-10.4-mdev12387.tar.gz | |
Merge branch 'bb-10.3-mdev12387' into 10.4bb-10.4-mdev12387
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 ba37d933f12..7d2e1bae741 100644 --- a/sql/sql_priv.h +++ b/sql/sql_priv.h @@ -228,6 +228,7 @@ #define OPTIMIZER_SWITCH_ORDERBY_EQ_PROP (1ULL << 29) #define OPTIMIZER_SWITCH_COND_PUSHDOWN_FOR_DERIVED (1ULL << 30) #define OPTIMIZER_SWITCH_SPLIT_MATERIALIZED (1ULL << 31) +#define OPTIMIZER_SWITCH_COND_PUSHDOWN_FOR_SUBQUERY (1ULL << 32) #define OPTIMIZER_SWITCH_DEFAULT (OPTIMIZER_SWITCH_INDEX_MERGE | \ OPTIMIZER_SWITCH_INDEX_MERGE_UNION | \ @@ -254,7 +255,8 @@ OPTIMIZER_SWITCH_EXISTS_TO_IN | \ OPTIMIZER_SWITCH_ORDERBY_EQ_PROP | \ OPTIMIZER_SWITCH_COND_PUSHDOWN_FOR_DERIVED | \ - OPTIMIZER_SWITCH_SPLIT_MATERIALIZED) + OPTIMIZER_SWITCH_SPLIT_MATERIALIZED | \ + OPTIMIZER_SWITCH_COND_PUSHDOWN_FOR_SUBQUERY) /* Replication uses 8 bytes to store SQL_MODE in the binary log. The day you |