diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2019-03-21 10:34:00 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2019-03-21 10:34:00 +0200 |
| commit | 925b5030583e3622705621b4a0e56d6ccc3c5fcc (patch) | |
| tree | 05ee87ddf5ad39549a991453a8d6dfc1dfa8e858 /sql | |
| parent | 5d454181a897b58b2ae47a11a2db83379d7c97a5 (diff) | |
| parent | 0dd12b4f2a72245a0fb491685c172a7b0e48cbc5 (diff) | |
| download | mariadb-git-925b5030583e3622705621b4a0e56d6ccc3c5fcc.tar.gz | |
Merge 5.5 into 10.0
Diffstat (limited to 'sql')
| -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 f757823be7c..1baeed165f3 100644 --- a/sql/opt_subselect.cc +++ b/sql/opt_subselect.cc @@ -675,7 +675,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 |