summaryrefslogtreecommitdiff
path: root/sql/sql_select.cc
diff options
context:
space:
mode:
authorSergei Petrunia <psergey@askmonty.org>2018-03-08 11:43:55 +0100
committerSergei Petrunia <psergey@askmonty.org>2018-03-11 16:43:36 +0000
commit28777046b4dc3decd462a4a7a6d68c168b484635 (patch)
treebbbc2b1c6a48103cdb7a0bd5124e7997d553a6b8 /sql/sql_select.cc
parent112df06996dd88ac1d858c4c0c321d4c6e7bbf90 (diff)
downloadmariadb-git-28777046b4dc3decd462a4a7a6d68c168b484635.tar.gz
MDEV-15245: Assertion `false' failed in myrocks::ha_rocksdb::position
Don't call handler->position() if the last call to read a row did not succeed.
Diffstat (limited to 'sql/sql_select.cc')
-rw-r--r--sql/sql_select.cc2
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);