Merge 10.4 into 10.5

a1907fed · Marko Mäkelä · a42c80bd · ce868cd8 · a1907fed
Commit a1907fed authored Jun 21, 2021 by Marko Mäkelä
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 3 deletions

storage/innobase/trx/trx0rec.cc storage/innobase/trx/trx0rec.cc +2 -3

No files found.
--- a/storage/innobase/trx/trx0rec.cc
+++ b/storage/innobase/trx/trx0rec.cc
@@ -2070,12 +2070,11 @@ trx_undo_report_row_operation(
 					   - 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;