diff options
author | Sergey Petrunya <psergey@askmonty.org> | 2011-06-28 17:42:10 +0400 |
---|---|---|
committer | Sergey Petrunya <psergey@askmonty.org> | 2011-06-28 17:42:10 +0400 |
commit | 449319712592b2f5c30cae29d39c814e067317c2 (patch) | |
tree | f0720f3a7f8d4690cc6140fbbdc26fd86e7a6b12 /sql/item_subselect.cc | |
parent | 04326c52202609c9ccdae42914ae7ac7457cdc4f (diff) | |
download | mariadb-git-449319712592b2f5c30cae29d39c814e067317c2.tar.gz |
Followup to previous commit:
- Update test results
- Fix a problem with PS:
= convert_subq_to_sj() should not save where to prep_where or on_expr to prep_on_expr.
= After an unmerged subquery predicate has been pulled, it should call fix_after_pullout() for
outer_refs.
Diffstat (limited to 'sql/item_subselect.cc')
-rw-r--r-- | sql/item_subselect.cc | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/sql/item_subselect.cc b/sql/item_subselect.cc index 8ae3d5adc1c..4d3592be9f1 100644 --- a/sql/item_subselect.cc +++ b/sql/item_subselect.cc @@ -476,12 +476,10 @@ void Item_subselect::recalc_used_tables(st_select_lex *new_parent, upper->item->walk(&Item::enumerate_field_refs_processor, FALSE, (uchar*)&fixer); used_tables_cache |= fixer.used_tables; - /* + if (after_pullout) upper->item->fix_after_pullout(new_parent, &(upper->item)); upper->item->update_used_tables(); - used_tables_cache |= upper->item->used_tables(); - */ } } } |