Merge 10.4 into 10.5

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;