diff options
| author | Alexander Nozdrin <alik@sun.com> | 2010-02-23 17:06:06 +0300 |
|---|---|---|
| committer | Alexander Nozdrin <alik@sun.com> | 2010-02-23 17:06:06 +0300 |
| commit | e7e1a367559dfa1c4acc3d88b969d2c07ec766a7 (patch) | |
| tree | 6974c189494bcd50494b7487907cf034a3201d0d /sql/opt_range.cc | |
| parent | f0d2fe34f2bd074dfc0f9ae6c5ffbc414a6f9b59 (diff) | |
| parent | 9f6662a0b444d2d2e918d9c09d8a27b97a560bbd (diff) | |
| download | mariadb-git-e7e1a367559dfa1c4acc3d88b969d2c07ec766a7.tar.gz | |
Manual merge from mysql-trunk.
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 b27a9e1e74d..12be2c19a51 100644 --- a/sql/opt_range.cc +++ b/sql/opt_range.cc @@ -10952,17 +10952,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); |