Commit 125bfa2c authored by Sergey Petrunya's avatar Sergey Petrunya

Fix error code handling in fix for BUG#724228

parent cb147b39
...@@ -2140,7 +2140,7 @@ enum_nested_loop_state JOIN_CACHE::join_matching_records(bool skip_last) ...@@ -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) ...@@ -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;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment