diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2019-03-22 13:20:44 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2019-03-22 13:20:44 +0200 |
| commit | ca80e14a882b1928350ef0522607cd1011048941 (patch) | |
| tree | 05d992be3d25cf47e38c7bc1ea2dacee485f33c5 /sql/opt_subselect.cc | |
| parent | c23d4700e6d9ea4f32eda6965ffc907fa83425e8 (diff) | |
| parent | 1c60f40868f6067be81a50198e1c72df08814adf (diff) | |
| download | mariadb-git-ca80e14a882b1928350ef0522607cd1011048941.tar.gz | |
Merge 10.3 into 10.4
Diffstat (limited to 'sql/opt_subselect.cc')
| -rw-r--r-- | sql/opt_subselect.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/opt_subselect.cc b/sql/opt_subselect.cc index ddccddd55ff..a1d60aff6ef 100644 --- a/sql/opt_subselect.cc +++ b/sql/opt_subselect.cc @@ -676,7 +676,7 @@ int check_and_do_in_subquery_rewrites(JOIN *join) select_lex->outer_select()->join && // 6 parent_unit->first_select()->leaf_tables.elements && // 7 !in_subs->has_strategy() && // 8 - select_lex->outer_select()->leaf_tables.elements && // 9 + select_lex->outer_select()->table_list.first && // 9 !((join->select_options | // 10 select_lex->outer_select()->join->select_options) // 10 & SELECT_STRAIGHT_JOIN) && // 10 |