diff options
| author | hery.ramilison@oracle.com <> | 2011-07-06 01:13:50 +0200 |
|---|---|---|
| committer | MySQL Release Engineering <mysql-re_ww@oracle.com> | 2011-07-06 01:13:50 +0200 |
| commit | c74d844de30136c570c3bca089d1f2949d00603c (patch) | |
| tree | 31e14059cf5a1e5e8c1601a2488b98c4af1bfeb0 /sql/item_subselect.cc | |
| parent | 3b69f27e59909e67fed27c4d728b96483188a663 (diff) | |
| parent | 1c810152963f770fae011b29ae30fbafbc516b23 (diff) | |
| download | mariadb-git-c74d844de30136c570c3bca089d1f2949d00603c.tar.gz | |
Merge from mysql-5.5.14-release
Diffstat (limited to 'sql/item_subselect.cc')
| -rw-r--r-- | sql/item_subselect.cc | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/sql/item_subselect.cc b/sql/item_subselect.cc index 98b03f9a817..e4d3d1bd43e 100644 --- a/sql/item_subselect.cc +++ b/sql/item_subselect.cc @@ -38,6 +38,7 @@ #include "set_var.h" #include "sql_select.h" #include "sql_parse.h" // check_stack_overrun +#include "sql_test.h" inline Item * and_items(Item* cond, Item *item) { @@ -1025,6 +1026,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; /* |