diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2013-11-23 00:50:54 +0100 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2013-11-23 00:50:54 +0100 |
| commit | c6d30805db3a1a2a098c3009fde8a42efd9fb9de (patch) | |
| tree | e55f68e5adf40e1a75e08bda91b712ab6a094643 /sql/opt_subselect.cc | |
| parent | 2c032b990e4ec470fad2e9f61cf6267a68b7e937 (diff) | |
| parent | eea310e498f3b7ac95a4492d48f04e08d3009412 (diff) | |
| download | mariadb-git-c6d30805db3a1a2a098c3009fde8a42efd9fb9de.tar.gz | |
5.5 merge
Diffstat (limited to 'sql/opt_subselect.cc')
| -rw-r--r-- | sql/opt_subselect.cc | 19 |
1 files changed, 17 insertions, 2 deletions
diff --git a/sql/opt_subselect.cc b/sql/opt_subselect.cc index 78a1f5fb326..32e54d10856 100644 --- a/sql/opt_subselect.cc +++ b/sql/opt_subselect.cc @@ -1928,11 +1928,25 @@ int pull_out_semijoin_tables(JOIN *join) } } - table_map pulled_tables= 0; + table_map dep_tables= 0; if (have_join_nest_children) goto skip; + /* + Calculate set of tables within this semi-join nest that have + other dependent tables + */ + child_li.rewind(); + while ((tbl= child_li++)) + { + TABLE *const table= tbl->table; + if (table && + (table->reginfo.join_tab->dependent & + sj_nest->nested_join->used_tables)) + dep_tables|= table->reginfo.join_tab->dependent; + } + /* Action #1: Mark the constant tables to be pulled out */ child_li.rewind(); while ((tbl= child_li++)) @@ -1983,7 +1997,8 @@ int pull_out_semijoin_tables(JOIN *join) child_li.rewind(); while ((tbl= child_li++)) { - if (tbl->table && !(pulled_tables & tbl->table->map)) + if (tbl->table && !(pulled_tables & tbl->table->map) && + !(dep_tables & tbl->table->map)) { if (find_eq_ref_candidate(tbl->table, sj_nest->nested_join->used_tables & |