diff options
| author | Sergey Petrunya <psergey@askmonty.org> | 2011-03-01 13:33:23 +0300 |
|---|---|---|
| committer | Sergey Petrunya <psergey@askmonty.org> | 2011-03-01 13:33:23 +0300 |
| commit | 125bfa2ce722f909e7133c4e381b549bcdb3192c (patch) | |
| tree | 225d99133aab304696eb9c594fe7c2ec1b834ae3 /sql | |
| parent | cb147b39654d3afea938253ed1457c088a5e87c9 (diff) | |
| download | mariadb-git-125bfa2ce722f909e7133c4e381b549bcdb3192c.tar.gz | |
Fix error code handling in fix for BUG#724228
Diffstat (limited to 'sql')
| -rw-r--r-- | sql/sql_join_cache.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sql/sql_join_cache.cc b/sql/sql_join_cache.cc index 7b26842eb9f..bdc944d8d6c 100644 --- a/sql/sql_join_cache.cc +++ b/sql/sql_join_cache.cc @@ -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) - goto finish; + goto finish2; /* Prepare to retrieve all records of the joined table */ if ((error= join_tab_scan->open())) @@ -2187,6 +2187,7 @@ enum_nested_loop_state JOIN_CACHE::join_matching_records(bool skip_last) finish: if (error) rc= error < 0 ? NESTED_LOOP_NO_MORE_ROWS: NESTED_LOOP_ERROR; +finish2: join_tab_scan->close(); return rc; } |