diff options
| author | Oleksandr Byelkin <sanja@mariadb.com> | 2018-07-19 12:55:54 +0200 |
|---|---|---|
| committer | Oleksandr Byelkin <sanja@mariadb.com> | 2018-07-19 12:55:54 +0200 |
| commit | 0896d7ebc3698f898bd66544bbc0ba6e4a4fbe0e (patch) | |
| tree | a4875d10d749b1ab10a3c6070f20e14f9fdb0f04 /sql/opt_subselect.cc | |
| parent | 312de43f40e221096b5565f6f4999eaadae09ef4 (diff) | |
| parent | ada54101a7185782657813c553907f61f2a35faf (diff) | |
| download | mariadb-git-0896d7ebc3698f898bd66544bbc0ba6e4a4fbe0e.tar.gz | |
Merge branch '10.0' into bb-10.1-mergebb-10.1-merge-sanja
Diffstat (limited to 'sql/opt_subselect.cc')
| -rw-r--r-- | sql/opt_subselect.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sql/opt_subselect.cc b/sql/opt_subselect.cc index 732ed91fe00..9e7f297ece7 100644 --- a/sql/opt_subselect.cc +++ b/sql/opt_subselect.cc @@ -3548,7 +3548,8 @@ void fix_semijoin_strategies_for_picked_join_order(JOIN *join) first= tablenr - sjm->tables + 1; join->best_positions[first].n_sj_tables= sjm->tables; join->best_positions[first].sj_strategy= SJ_OPT_MATERIALIZE; - join->sjm_lookup_tables|= s->table->map; + for (uint i= first; i < first+ sjm->tables; i++) + join->sjm_lookup_tables |= join->best_positions[i].table->table->map; } else if (pos->sj_strategy == SJ_OPT_MATERIALIZE_SCAN) { |