diff options
author | Jan Lindström <jan.lindstrom@mariadb.com> | 2018-10-29 18:45:19 +0200 |
---|---|---|
committer | Jan Lindström <jan.lindstrom@mariadb.com> | 2018-10-29 18:45:19 +0200 |
commit | 2ee9343c873ad31c2dd0d2175dec2ef3b48ca5ba (patch) | |
tree | aa51c10a594658b3668ff850c8fa7ece175a2692 /sql/sql_select.cc | |
parent | 8b92c642981e7b226e0d93b958cc470bb1e6fad0 (diff) | |
parent | 893ebb739e24637985892da1555f2e6f1a8ac5b6 (diff) | |
download | mariadb-git-mariadb-galera-5.5.62.tar.gz |
Merge tag 'mariadb-5.5.62' into 5.5-galeramariadb-galera-5.5.62
Diffstat (limited to 'sql/sql_select.cc')
-rw-r--r-- | sql/sql_select.cc | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/sql/sql_select.cc b/sql/sql_select.cc index b2b2bcde80c..35937f0536f 100644 --- a/sql/sql_select.cc +++ b/sql/sql_select.cc @@ -10054,7 +10054,15 @@ uint check_join_cache_usage(JOIN_TAB *tab, effort now. */ if (tab->table->pos_in_table_list->is_materialized_derived()) + { no_bka_cache= true; + /* + Don't use hash join algorithm if the temporary table for the rows + of the derived table will be created with an equi-join key. + */ + if (tab->table->s->keys) + no_hashed_cache= true; + } /* Don't use join buffering if we're dictated not to by no_jbuf_after |