diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2021-06-21 19:56:14 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2021-06-21 19:56:14 +0300 |
| commit | 367c75c0990c7bd4bc4fb479a622a3acf2ee3769 (patch) | |
| tree | eb1b23b300cde00cbaf652f702aeeed2c63c18c6 | |
| parent | 09249eb9bde68e56691004e293de69a400311ab0 (diff) | |
| parent | a1907fed600c038d1ab1a789baed8bb45b0793ca (diff) | |
| download | mariadb-git-367c75c0990c7bd4bc4fb479a622a3acf2ee3769.tar.gz | |
Merge 10.5 into 10.6
| -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 683825559a3..80b27751cda 100644 --- a/storage/innobase/trx/trx0rec.cc +++ b/storage/innobase/trx/trx0rec.cc @@ -2141,12 +2141,11 @@ err_exit: - FIL_PAGE_DATA_END, 0); } - 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; |