diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2021-06-21 18:44:14 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2021-06-21 18:44:14 +0300 |
| commit | ce868cd89e352f7ce04d8db260f96893df2bf26c (patch) | |
| tree | e9d661797149e0edb8ea14e694a1969372ddb6e1 | |
| parent | baf0ef9a18fa69e97deb750d9fa545dd4f162596 (diff) | |
| parent | 9dc50ea2293640f8153bc806612fd72634498010 (diff) | |
| download | mariadb-git-ce868cd89e352f7ce04d8db260f96893df2bf26c.tar.gz | |
Merge 10.3 into 10.4
| -rw-r--r-- | storage/innobase/trx/trx0rec.cc | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/storage/innobase/trx/trx0rec.cc b/storage/innobase/trx/trx0rec.cc index cd520f4f5f2..6faa479a322 100644 --- a/storage/innobase/trx/trx0rec.cc +++ b/storage/innobase/trx/trx0rec.cc @@ -2164,12 +2164,11 @@ trx_undo_report_row_operation( goto err_exit; } - mtr_commit(&mtr); + mtr.commit(); } else { /* Success */ - mtr_commit(&mtr); - undo->top_page_no = undo_block->page.id.page_no(); + mtr.commit(); undo->top_offset = offset; undo->top_undo_no = trx->undo_no++; undo->guess_block = undo_block; |