diff options
| author | Tor Didriksen <tor.didriksen@oracle.com> | 2012-03-27 14:39:27 +0200 |
|---|---|---|
| committer | Tor Didriksen <tor.didriksen@oracle.com> | 2012-03-27 14:39:27 +0200 |
| commit | efc29bc531483fe69759498c6a2bc1c855170a3e (patch) | |
| tree | 841ac1d5417c17c86d73cbb78aa6b6cd03358203 /sql/item_subselect.cc | |
| parent | 7ed197c95f07212dac0f81213b9972a050563d75 (diff) | |
| download | mariadb-git-efc29bc531483fe69759498c6a2bc1c855170a3e.tar.gz | |
Backport of fix for Bug#12763207 - ASSERT IN SUBSELECT::SINGLE_VALUE_TRANSFORMER
Diffstat (limited to 'sql/item_subselect.cc')
| -rw-r--r-- | sql/item_subselect.cc | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/sql/item_subselect.cc b/sql/item_subselect.cc index e9e2e8bacf9..bfd0e1c21c3 100644 --- a/sql/item_subselect.cc +++ b/sql/item_subselect.cc @@ -1020,7 +1020,13 @@ Item_in_subselect::single_value_transformer(JOIN *join, 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()); + /* + If the argument is a field, we assume that fix_fields() has + tagged the select_lex with non_agg_field_used. + We reverse that decision after this rewrite with MIN/MAX. + */ + if (item->get_arg(0)->type() == Item::FIELD_ITEM) + DBUG_ASSERT(select_lex->non_agg_field_used()); select_lex->set_non_agg_field_used(false); } |