diff options
| author | Georgi Kodinov <Georgi.Kodinov@Oracle.com> | 2012-04-10 14:21:57 +0300 |
|---|---|---|
| committer | Georgi Kodinov <Georgi.Kodinov@Oracle.com> | 2012-04-10 14:21:57 +0300 |
| commit | 6e1c96db9afa6211691c3567dec1bff40b606257 (patch) | |
| tree | 1f7c7c41f20d774f34ac3567ac8cd07f6995100c /sql/item_subselect.cc | |
| parent | 5ac773b9b48116f0ed924b5c1359dd8313a6ebe7 (diff) | |
| parent | 17743904ba5bcf9c1089af1ba0af5083e1bd962e (diff) | |
| download | mariadb-git-6e1c96db9afa6211691c3567dec1bff40b606257.tar.gz | |
merge mysql-5.1->mysql-5.1-security
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 8335ae2ca8d..46d49797b9c 100644 --- a/sql/item_subselect.cc +++ b/sql/item_subselect.cc @@ -1021,7 +1021,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); } |