diff options
author | Georgi Kodinov <joro@sun.com> | 2009-01-12 17:52:46 +0200 |
---|---|---|
committer | Georgi Kodinov <joro@sun.com> | 2009-01-12 17:52:46 +0200 |
commit | e0df7f1cd559d93cf4e8c97e0b86674f94b95e85 (patch) | |
tree | 733210c0fbc04e20249c6447908189c54bd35a1d /sql | |
parent | d1323f433d21e49717b3a91fe79ae64f359a9093 (diff) | |
parent | 5f4585626d47cd49cb897b4510856751ff1edc6f (diff) | |
download | mariadb-git-e0df7f1cd559d93cf4e8c97e0b86674f94b95e85.tar.gz |
merged 41453 to 5.1-bugteam
Diffstat (limited to 'sql')
-rw-r--r-- | sql/filesort.cc | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/sql/filesort.cc b/sql/filesort.cc index 2850ada1ffb..5d8b4e869c8 100644 --- a/sql/filesort.cc +++ b/sql/filesort.cc @@ -562,10 +562,7 @@ static ha_rows find_all_keys(SORTPARAM *param, SQL_SELECT *select, if (quick_select) { if ((error= select->quick->get_next())) - { - error= HA_ERR_END_OF_FILE; break; - } file->position(sort_form->record[0]); DBUG_EXECUTE_IF("debug_filesort", dbug_print_record(sort_form, TRUE);); } |