diff options
| author | Igor Babaev <igor@askmonty.org> | 2019-02-19 03:18:17 -0800 |
|---|---|---|
| committer | Igor Babaev <igor@askmonty.org> | 2019-02-19 03:18:17 -0800 |
| commit | 2e73c5612071274bf2b8893a59c12c030b3b5c8b (patch) | |
| tree | f330f813e26b6997c5e4f8c65ad9df247a440bc0 /sql/sql_priv.h | |
| parent | 8283d7d2c029cb520214ae7d33af8851acc80892 (diff) | |
| parent | 764429271dc94e5af08706dd0ac6fb962c15726d (diff) | |
| download | mariadb-git-2e73c5612071274bf2b8893a59c12c030b3b5c8b.tar.gz | |
Merge branch '10.4' into bb-10.4-mdev7486bb-10.4-mdev7486
Diffstat (limited to 'sql/sql_priv.h')
| -rw-r--r-- | sql/sql_priv.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/sql/sql_priv.h b/sql/sql_priv.h index 0f28f5b82e1..3744dfce770 100644 --- a/sql/sql_priv.h +++ b/sql/sql_priv.h @@ -262,9 +262,10 @@ OPTIMIZER_SWITCH_ORDERBY_EQ_PROP | \ OPTIMIZER_SWITCH_COND_PUSHDOWN_FOR_DERIVED | \ OPTIMIZER_SWITCH_SPLIT_MATERIALIZED | \ - OPTIMIZER_SWITCH_COND_PUSHDOWN_FOR_SUBQUERY |\ + OPTIMIZER_SWITCH_COND_PUSHDOWN_FOR_SUBQUERY | \ OPTIMIZER_SWITCH_USE_ROWID_FILTER | \ - OPTIMIZER_SWITCH_COND_PUSHDOWN_FROM_HAVING) + OPTIMIZER_SWITCH_COND_PUSHDOWN_FROM_HAVING | \ + OPTIMIZER_SWITCH_OPTIMIZE_JOIN_BUFFER_SIZE) /* Replication uses 8 bytes to store SQL_MODE in the binary log. The day you |