diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2019-03-22 11:15:21 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2019-03-22 11:15:21 +0200 |
| commit | 031fa8f1d260cd9fae67a307d901bd4432bdf1cb (patch) | |
| tree | 36c96ba92e2f345dd26cc8ebe521dde1906ad384 /sql/opt_subselect.cc | |
| parent | 1caec9c8982a73f3db78fabc570934b837658109 (diff) | |
| parent | 8be02be08bf6a7227e2ab6a5443b63f3a155e2a9 (diff) | |
| download | mariadb-git-031fa8f1d260cd9fae67a307d901bd4432bdf1cb.tar.gz | |
Merge 10.1 into 10.2
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 d0be72b8d51..e7bd7e88af3 100644 --- a/sql/opt_subselect.cc +++ b/sql/opt_subselect.cc @@ -677,7 +677,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 |