1
0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00

Merge bk@192.168.21.1:mysql-5.1-opt

into  mysql.com:/home/hf/work/32942/my51-32942
This commit is contained in:
holyfoot/hf@hfmain.(none)
2008-02-18 19:08:35 +04:00
3 changed files with 40 additions and 1 deletions

View File

@ -11178,7 +11178,7 @@ evaluate_join_record(JOIN *join, JOIN_TAB *join_tab,
we found a row, as no new rows can be added to the result.
*/
if (not_used_in_distinct && found_records != join->found_records)
return NESTED_LOOP_OK;
return NESTED_LOOP_NO_MORE_ROWS;
}
else
join_tab->read_record.file->unlock_row();