diff options
| author | Oleksandr Byelkin <sanja@mariadb.com> | 2017-04-25 16:30:39 +0200 |
|---|---|---|
| committer | Oleksandr Byelkin <sanja@mariadb.com> | 2017-04-25 16:30:39 +0200 |
| commit | 49552cf1f7adb3f3b7bb53696cc178363e4d9cb2 (patch) | |
| tree | 1f8fe7b3b30e6d3a1bce69913d144200e8ab272a /sql/sql_select.cc | |
| parent | 57fea99eeb80829828d43a048d31c46c30684738 (diff) | |
| parent | 2e7ba70a94b5950a7d1d733c177d1b2a24916213 (diff) | |
| download | mariadb-git-49552cf1f7adb3f3b7bb53696cc178363e4d9cb2.tar.gz | |
Merge branch '5.5' into bb-10.0-merge-5.5bb-10.0-merge-5.5
Diffstat (limited to 'sql/sql_select.cc')
| -rw-r--r-- | sql/sql_select.cc | 21 |
1 files changed, 15 insertions, 6 deletions
diff --git a/sql/sql_select.cc b/sql/sql_select.cc index 1353864a344..8d63902d9eb 100644 --- a/sql/sql_select.cc +++ b/sql/sql_select.cc @@ -8443,8 +8443,6 @@ get_best_combination(JOIN *join) join->full_join=0; join->hash_join= FALSE; - used_tables= OUTER_REF_TABLE_BIT; // Outer row is already read - fix_semijoin_strategies_for_picked_join_order(join); JOIN_TAB_RANGE *root_range; @@ -8508,7 +8506,6 @@ get_best_combination(JOIN *join) j->bush_root_tab= sjm_nest_root; form=join->table[tablenr]=j->table; - used_tables|= form->map; form->reginfo.join_tab=j; DBUG_PRINT("info",("type: %d", j->type)); if (j->type == JT_CONST) @@ -8535,9 +8532,6 @@ get_best_combination(JOIN *join) join->best_positions[tablenr].loosescan_picker.loosescan_key); j->index= join->best_positions[tablenr].loosescan_picker.loosescan_key; }*/ - - if (keyuse && create_ref_for_key(join, j, keyuse, TRUE, used_tables)) - DBUG_RETURN(TRUE); // Something went wrong if ((j->type == JT_REF || j->type == JT_EQ_REF) && is_hash_join_key_no(j->ref.key)) @@ -8563,6 +8557,21 @@ get_best_combination(JOIN *join) } root_range->end= j; + used_tables= OUTER_REF_TABLE_BIT; // Outer row is already read + for (j=join_tab, tablenr=0 ; tablenr < table_count ; tablenr++,j++) + { + if (j->bush_children) + j= j->bush_children->start; + + used_tables|= j->table->map; + if ((keyuse= join->best_positions[tablenr].key) && + create_ref_for_key(join, j, keyuse, TRUE, used_tables)) + DBUG_RETURN(TRUE); // Something went wrong + + if (j->last_leaf_in_bush) + j= j->bush_root_tab; + } + join->top_join_tab_count= join->join_tab_ranges.head()->end - join->join_tab_ranges.head()->start; /* |