summaryrefslogtreecommitdiff
path: root/sql/opt_subselect.cc
diff options
context:
space:
mode:
authorAlexander Barkov <bar@mariadb.com>2019-03-22 14:41:36 +0400
committerAlexander Barkov <bar@mariadb.com>2019-03-22 14:41:36 +0400
commit1c60f40868f6067be81a50198e1c72df08814adf (patch)
treed5570ecfa377236d527d3c6a1db2a6b508c5a005 /sql/opt_subselect.cc
parentf4484dfdbf2d78b0f357916ebd8ade024dd73c09 (diff)
parent50a8fc52988d13a5164a1a542b9d7a85e3ecc1c1 (diff)
downloadmariadb-git-1c60f40868f6067be81a50198e1c72df08814adf.tar.gz
Merge remote-tracking branch 'origin/10.2' into 10.3
Diffstat (limited to 'sql/opt_subselect.cc')
-rw-r--r--sql/opt_subselect.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/opt_subselect.cc b/sql/opt_subselect.cc
index 13c0ce0c157..e66695ab9b0 100644
--- a/sql/opt_subselect.cc
+++ b/sql/opt_subselect.cc
@@ -673,7 +673,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