diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2017-06-08 12:45:08 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2017-06-08 12:45:08 +0300 |
| commit | 2d8fdfbde5d5d32df64bacfaa7574ecf83b0bc03 (patch) | |
| tree | cea7cfc27b7f5c3c9d116a82330fef01350b08f4 /sql/sql_select.cc | |
| parent | c4cbc7a8807250d2d5b5938b218fd9c423a0b30a (diff) | |
| parent | fbeb9489cd7d6ad859a49ae5ab8f876f3d988470 (diff) | |
| download | mariadb-git-2d8fdfbde5d5d32df64bacfaa7574ecf83b0bc03.tar.gz | |
Merge 10.1 into 10.2
Replace have_innodb_zip.inc with innodb_page_size_small.inc.
Diffstat (limited to 'sql/sql_select.cc')
| -rw-r--r-- | sql/sql_select.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sql/sql_select.cc b/sql/sql_select.cc index 7bdc99cdbc2..4c64cf29467 100644 --- a/sql/sql_select.cc +++ b/sql/sql_select.cc @@ -14552,7 +14552,8 @@ simplify_joins(JOIN *join, List<TABLE_LIST> *join_list, COND *conds, bool top, table->table->maybe_null= FALSE; table->outer_join= 0; if (!(straight_join || table->straight)) - table->dep_tables= table->embedding? table->embedding->dep_tables: 0; + table->dep_tables= table->embedding && !table->embedding->sj_subq_pred ? + table->embedding->dep_tables : 0; if (table->on_expr) { /* Add ON expression to the WHERE or upper-level ON condition. */ |