database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-12 20:49:12 +03:00
Code Activity

Merge 10.3 into 10.4

Browse Source
This commit is contained in:
Marko Mäkelä
2021-06-21 18:44:14 +03:00
parent baf0ef9a18 9dc50ea229
commit ce868cd89e
1 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
storage/innobase/trx/trx0rec.cc
View File

@@ -2164,12 +2164,11 @@ trx_undo_report_row_operation(
goto err_exit; goto err_exit;
} }
mtr_commit(&mtr); mtr.commit();
} else { } else {
/* Success */ /* Success */
mtr_commit(&mtr);
undo->top_page_no = undo_block->page.id.page_no(); undo->top_page_no = undo_block->page.id.page_no();
mtr.commit();
undo->top_offset = offset; undo->top_offset = offset;
undo->top_undo_no = trx->undo_no++; undo->top_undo_no = trx->undo_no++;
undo->guess_block = undo_block; undo->guess_block = undo_block;