diff options
| author | Vicențiu Ciorbaru <vicentiu@mariadb.org> | 2017-06-21 16:19:43 +0300 |
|---|---|---|
| committer | Vicențiu Ciorbaru <vicentiu@mariadb.org> | 2017-06-21 16:19:43 +0300 |
| commit | 2e335a471ced0d86716f8c657f4d67f510712a30 (patch) | |
| tree | 6fa56f9d9083007e874449b9c2b27579f718ed94 /sql/opt_subselect.cc | |
| parent | 472c2d9b2fbb262665bdd08338ea902e8398010d (diff) | |
| parent | 8baf9b0c469e2845d15cc1181bc6b101cdfba087 (diff) | |
| download | mariadb-git-2e335a471ced0d86716f8c657f4d67f510712a30.tar.gz | |
Merge remote-tracking branch '10.0' into 10.1
Diffstat (limited to 'sql/opt_subselect.cc')
| -rw-r--r-- | sql/opt_subselect.cc | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/sql/opt_subselect.cc b/sql/opt_subselect.cc index dd6c2c50b32..3680dce8117 100644 --- a/sql/opt_subselect.cc +++ b/sql/opt_subselect.cc @@ -3446,6 +3446,7 @@ void fix_semijoin_strategies_for_picked_join_order(JOIN *join) table_map remaining_tables= 0; table_map handled_tabs= 0; join->sjm_lookup_tables= 0; + join->sjm_scan_tables= 0; for (tablenr= table_count - 1 ; tablenr != join->const_tables - 1; tablenr--) { POSITION *pos= join->best_positions + tablenr; @@ -3503,6 +3504,9 @@ void fix_semijoin_strategies_for_picked_join_order(JOIN *join) for (i= tablenr; i != (first + sjm->tables - 1); i--) rem_tables |= join->best_positions[i].table->table->map; + for (i= first; i < first+ sjm->tables; i++) + join->sjm_scan_tables |= join->best_positions[i].table->table->map; + POSITION dummy; join->cur_sj_inner_tables= 0; for (i= first + sjm->tables; i <= tablenr; i++) |