diff options
author | Guilhem Bichot <guilhem@mysql.com> | 2009-08-12 15:44:34 +0200 |
---|---|---|
committer | Guilhem Bichot <guilhem@mysql.com> | 2009-08-12 15:44:34 +0200 |
commit | 8d1fdf09bb39663e8aad2a01f7ece81924e1f5a1 (patch) | |
tree | 5fdae14ec96fd61b574fe1c8b2d62d304114c53c /sql/item_subselect.cc | |
parent | a39de6353abfb787723a61479fb20a942622a160 (diff) | |
parent | cea2f8b6303b07906ab710b36c0c292a7865f52f (diff) | |
download | mariadb-git-8d1fdf09bb39663e8aad2a01f7ece81924e1f5a1.tar.gz |
merge of 5.1-main into mysql-trunk.
Changes to ha_innodb.cc are not propagated to plugin, they will come back
via Oracle/Innobase if needed.
Diffstat (limited to 'sql/item_subselect.cc')
-rw-r--r-- | sql/item_subselect.cc | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/sql/item_subselect.cc b/sql/item_subselect.cc index 00c09679737..cdb091fa07e 100644 --- a/sql/item_subselect.cc +++ b/sql/item_subselect.cc @@ -1227,6 +1227,10 @@ Item_in_subselect::single_value_transformer(JOIN *join, else { // it is single select without tables => possible optimization + // remove the dependence mark since the item is moved to upper + // select and is not outer anymore. + item->walk(&Item::remove_dependence_processor, 0, + (uchar *) select_lex->outer_select()); item= func->create(left_expr, item); // fix_field of item will be done in time of substituting substitution= item; |