diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2020-08-26 10:45:47 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2020-08-26 10:45:47 +0300 |
| commit | 6a042281bdbfe91cc39e1f6e02295bfe7eaa9d43 (patch) | |
| tree | 54ae0a1b6b234dd1a1b6c4c93528be18197365e4 /storage/innobase/trx | |
| parent | 65f30050aafb3821ba63a3b837c98cf4d2334254 (diff) | |
| parent | 21a96581fd1dd11c5605dd89e3adbaabdf6de5eb (diff) | |
| download | mariadb-git-6a042281bdbfe91cc39e1f6e02295bfe7eaa9d43.tar.gz | |
Merge 10.2 into 10.3
Diffstat (limited to 'storage/innobase/trx')
| -rw-r--r-- | storage/innobase/trx/trx0rec.cc | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/storage/innobase/trx/trx0rec.cc b/storage/innobase/trx/trx0rec.cc index b282bb177af..c7be4f44ee0 100644 --- a/storage/innobase/trx/trx0rec.cc +++ b/storage/innobase/trx/trx0rec.cc @@ -2377,7 +2377,11 @@ trx_undo_prev_version_build( /* The page containing the clustered index record corresponding to entry is latched in mtr. Thus the following call is safe. */ - row_upd_index_replace_new_col_vals(entry, index, update, heap); + if (!row_upd_index_replace_new_col_vals(entry, *index, update, + heap)) { + ut_a(v_status & TRX_UNDO_PREV_IN_PURGE); + return false; + } /* Get number of externally stored columns in updated record */ const ulint n_ext = dtuple_get_n_ext(entry); |