1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix error code handling in fix for BUG#724228

Browse Source
This commit is contained in:
Sergey Petrunya 2011-03-01 13:33:23 +03:00
parent cb147b3965
commit 125bfa2ce7
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
sql/sql_join_cache.cc
View File

@ -2140,7 +2140,7 @@ enum_nested_loop_state JOIN_CACHE::join_matching_records(bool skip_last)
} }
if ((rc= join_tab_execution_startup(join_tab)) < 0) if ((rc= join_tab_execution_startup(join_tab)) < 0)
goto finish; goto finish2;
/* Prepare to retrieve all records of the joined table */ /* Prepare to retrieve all records of the joined table */
if ((error= join_tab_scan->open())) if ((error= join_tab_scan->open()))
@ -2187,6 +2187,7 @@ enum_nested_loop_state JOIN_CACHE::join_matching_records(bool skip_last)
finish: finish:
if (error) if (error)
rc= error < 0 ? NESTED_LOOP_NO_MORE_ROWS: NESTED_LOOP_ERROR; rc= error < 0 ? NESTED_LOOP_NO_MORE_ROWS: NESTED_LOOP_ERROR;
finish2:
join_tab_scan->close(); join_tab_scan->close();
return rc; return rc;
} }