diff options
author | Tor Didriksen <tor.didriksen@oracle.com> | 2011-05-04 17:12:45 +0200 |
---|---|---|
committer | Tor Didriksen <tor.didriksen@oracle.com> | 2011-05-04 17:12:45 +0200 |
commit | 9baf84e99a6d7edd36c777593a90671d02aacbc9 (patch) | |
tree | 4b2a82480afbf07a0e4ba4447dbf4f3a51761bbe /sql/item_subselect.cc | |
parent | c00c350f147173bf20c35c8787cdf0d840653e96 (diff) | |
parent | a32df762d43c29545718e8a78a1721a9a7a1a35f (diff) | |
download | mariadb-git-9baf84e99a6d7edd36c777593a90671d02aacbc9.tar.gz |
merge 5.0 => 5.1 : Bug#12329653
Diffstat (limited to 'sql/item_subselect.cc')
-rw-r--r-- | sql/item_subselect.cc | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/sql/item_subselect.cc b/sql/item_subselect.cc index 53d4ac2d0a8..10dd6c93717 100644 --- a/sql/item_subselect.cc +++ b/sql/item_subselect.cc @@ -1016,6 +1016,14 @@ Item_in_subselect::single_value_transformer(JOIN *join, it.replace(item); } + DBUG_EXECUTE("where", + print_where(item, "rewrite with MIN/MAX", QT_ORDINARY);); + if (thd->variables.sql_mode & MODE_ONLY_FULL_GROUP_BY) + { + DBUG_ASSERT(select_lex->non_agg_field_used()); + select_lex->set_non_agg_field_used(false); + } + save_allow_sum_func= thd->lex->allow_sum_func; thd->lex->allow_sum_func|= 1 << thd->lex->current_select->nest_level; /* |