diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2019-05-13 14:22:49 +0200 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2019-05-17 13:53:22 +0200 |
| commit | 43623f04a98263301b302961be092a0244494ec3 (patch) | |
| tree | be088f8102f483b19ba7e2ed512c176e30b721d9 /sql/sql_delete.cc | |
| parent | 73de06c48ff26070cabcd408ebc3d888da88110f (diff) | |
| download | mariadb-git-43623f04a98263301b302961be092a0244494ec3.tar.gz | |
MDEV-15458 Segfault in heap_scan() upon UPDATE after ADD SYSTEM VERSIONING
handler::write_row() should not destroy the state of the running
index_search/index_next/... or rnd_init/rnd_next/... scan
Diffstat (limited to 'sql/sql_delete.cc')
| -rw-r--r-- | sql/sql_delete.cc | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/sql/sql_delete.cc b/sql/sql_delete.cc index 642f60e7ba6..0ab80fe7cb8 100644 --- a/sql/sql_delete.cc +++ b/sql/sql_delete.cc @@ -254,12 +254,7 @@ int TABLE::delete_row() store_record(this, record[1]); vers_update_end(); - int res; - if ((res= file->extra(HA_EXTRA_REMEMBER_POS))) - return res; - if ((res= file->ha_update_row(record[1], record[0]))) - return res; - return file->extra(HA_EXTRA_RESTORE_POS); + return file->ha_update_row(record[1], record[0]); } |