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/sql_select.cc | |
| parent | 312de43f40e221096b5565f6f4999eaadae09ef4 (diff) | |
| parent | ada54101a7185782657813c553907f61f2a35faf (diff) | |
| download | mariadb-git-bb-10.1-merge-sanja.tar.gz | |
Merge branch '10.0' into bb-10.1-mergebb-10.1-merge-sanja
Diffstat (limited to 'sql/sql_select.cc')
| -rw-r--r-- | sql/sql_select.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/sql_select.cc b/sql/sql_select.cc index 31bd5ed527e..e3b725ce1f6 100644 --- a/sql/sql_select.cc +++ b/sql/sql_select.cc @@ -8896,7 +8896,6 @@ static bool create_hj_key_for_table(JOIN *join, JOIN_TAB *join_tab, if (first_keyuse) { key_parts++; - first_keyuse= FALSE; } else { @@ -8906,7 +8905,7 @@ static bool create_hj_key_for_table(JOIN *join, JOIN_TAB *join_tab, if (curr->keypart == keyuse->keypart && !(~used_tables & curr->used_tables) && join_tab->keyuse_is_valid_for_access_in_chosen_plan(join, - keyuse) && + curr) && are_tables_local(join_tab, curr->used_tables)) break; } @@ -8914,6 +8913,7 @@ static bool create_hj_key_for_table(JOIN *join, JOIN_TAB *join_tab, key_parts++; } } + first_keyuse= FALSE; keyuse++; } while (keyuse->table == table && keyuse->is_for_hash_join()); if (!key_parts) |