diff options
| author | Jacob Mathew <jacob.mathew@mariadb.com> | 2018-03-13 16:15:37 -0700 |
|---|---|---|
| committer | Jacob Mathew <jacob.mathew@mariadb.com> | 2018-03-13 16:15:37 -0700 |
| commit | 1b82bec3c9ade9864dc9483e99d7b527ebff6bf1 (patch) | |
| tree | 0f7cadc18142819248138802f73e4e0e638c8026 /sql/sql_select.cc | |
| parent | 90247658e066c3ae5da1fefb988f5564e24abc90 (diff) | |
| parent | 9d95b8665a3d87ab857e77e220effc64454eb881 (diff) | |
| download | mariadb-git-bb-10.2-MDEV-14019.tar.gz | |
Merge branch '10.2' into bb-10.2-MDEV-14019bb-10.2-MDEV-14019
Diffstat (limited to 'sql/sql_select.cc')
| -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 4746f186fe7..6450eb03d4d 100644 --- a/sql/sql_select.cc +++ b/sql/sql_select.cc @@ -18724,7 +18724,7 @@ sub_select(JOIN *join,JOIN_TAB *join_tab,bool end_of_records) skip_over= FALSE; } - if (join_tab->keep_current_rowid) + if (join_tab->keep_current_rowid && !error) join_tab->table->file->position(join_tab->table->record[0]); rc= evaluate_join_record(join, join_tab, error); |