diff options
| author | Sergey Petrunya <psergey@askmonty.org> | 2013-07-16 15:59:30 +0400 |
|---|---|---|
| committer | Sergey Petrunya <psergey@askmonty.org> | 2013-07-16 15:59:30 +0400 |
| commit | 67e5b7945d55e3437b4ecca7f1e6910d235ca6f0 (patch) | |
| tree | 1e814fc53feb95300cdf7709f20bb3dff434feb0 /sql | |
| parent | 5c0fa3ad8f6640a85b4bbbe4816699f0ef52f9f2 (diff) | |
| parent | 947c2bdbc07e13d064497a155fa469e2c84c306c (diff) | |
| download | mariadb-git-67e5b7945d55e3437b4ecca7f1e6910d235ca6f0.tar.gz | |
Automatic merge
Diffstat (limited to 'sql')
| -rw-r--r-- | sql/sql_select.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/sql_select.cc b/sql/sql_select.cc index f1b08806411..e517c05c161 100644 --- a/sql/sql_select.cc +++ b/sql/sql_select.cc @@ -16326,7 +16326,7 @@ sub_select(JOIN *join,JOIN_TAB *join_tab,bool end_of_records) if (rc != NESTED_LOOP_NO_MORE_ROWS) { error= (*join_tab->read_first_record)(join_tab); - if (join_tab->keep_current_rowid) + if (!error && join_tab->keep_current_rowid) join_tab->table->file->position(join_tab->table->record[0]); rc= evaluate_join_record(join, join_tab, error); } |