diff options
| author | Evgeny Potemkin <epotemkin@mysql.com> | 2010-02-12 12:41:15 +0300 |
|---|---|---|
| committer | Evgeny Potemkin <epotemkin@mysql.com> | 2010-02-12 12:41:15 +0300 |
| commit | 86db818b9d127e9dbf2081292243879ea4150d3d (patch) | |
| tree | c04d439feee5d843a870c9d25f6c56e7937de9e3 /sql/opt_range.cc | |
| parent | 645106d2b3efbd7cd23c1172ab80e8e7b3c9c2b3 (diff) | |
| parent | 3e0f70d2cc0d233f0be615532ed3a5254930ad17 (diff) | |
| download | mariadb-git-86db818b9d127e9dbf2081292243879ea4150d3d.tar.gz | |
Auto-merged fix for the bug#50539.
Diffstat (limited to 'sql/opt_range.cc')
| -rw-r--r-- | sql/opt_range.cc | 12 |
1 files changed, 1 insertions, 11 deletions
diff --git a/sql/opt_range.cc b/sql/opt_range.cc index 741815585e2..b9ea8c7c991 100644 --- a/sql/opt_range.cc +++ b/sql/opt_range.cc @@ -10955,17 +10955,7 @@ int QUICK_GROUP_MIN_MAX_SELECT::get_next() } while ((result == HA_ERR_KEY_NOT_FOUND || result == HA_ERR_END_OF_FILE) && is_last_prefix != 0); - if (result == 0) - { - /* - Partially mimic the behavior of end_select_send. Copy the - field data from Item_field::field into Item_field::result_field - of each non-aggregated field (the group fields, and optionally - other fields in non-ANSI SQL mode). - */ - copy_fields(&join->tmp_table_param); - } - else if (result == HA_ERR_KEY_NOT_FOUND) + if (result == HA_ERR_KEY_NOT_FOUND) result= HA_ERR_END_OF_FILE; DBUG_RETURN(result); |