diff options
author | Oleksandr Byelkin <sanja@mariadb.com> | 2017-06-20 14:55:30 +0200 |
---|---|---|
committer | Oleksandr Byelkin <sanja@mariadb.com> | 2017-06-21 13:46:27 +0200 |
commit | f7fde4e26f2bff2bccda9d33654db3c49cc4b9cf (patch) | |
tree | b463fff59a1f7096fb371ce11675b29cf3bdc287 /sql/sql_select.cc | |
parent | 056bab0880544d91ea67d18fe8db65b4f6625482 (diff) | |
download | mariadb-git-bb-10.1-MDEV-10880.tar.gz |
MDEV-10880: Assertions `keypart_map' or `prebuilt->search_tuple->n_fields > 0' fail on DISTINCT and GROUP BY constantbb-10.1-MDEV-10880
add_group_and_distinct_keys() should take into account JOIN::simple_group.
Diffstat (limited to 'sql/sql_select.cc')
-rw-r--r-- | sql/sql_select.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/sql_select.cc b/sql/sql_select.cc index 50f121ce47f..9f339146646 100644 --- a/sql/sql_select.cc +++ b/sql/sql_select.cc @@ -5708,7 +5708,7 @@ add_group_and_distinct_keys(JOIN *join, JOIN_TAB *join_tab) Item_field *cur_item; key_map possible_keys(0); - if (join->group_list) + if (join->group_list || join->simple_group) { /* Collect all query fields referenced in the GROUP clause. */ for (cur_group= join->group_list; cur_group; cur_group= cur_group->next) (*cur_group->item)->walk(&Item::collect_item_field_processor, 0, |