diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2022-02-28 18:41:39 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2022-02-28 18:41:39 +0200 |
| commit | edb311ae5823cfbade9f459c4cc622b5c42d3462 (patch) | |
| tree | 6a4c8afae068ef342b98c5f3d1d7de0d08a202e3 /storage/innobase/trx/trx0undo.cc | |
| parent | 5c21cba60276e1d904340324971474b9242660f6 (diff) | |
| parent | bc020058d360c90362ba2cfd30ceb09efa0fcee3 (diff) | |
| download | mariadb-git-edb311ae5823cfbade9f459c4cc622b5c42d3462.tar.gz | |
Merge 10.5 into 10.6
Diffstat (limited to 'storage/innobase/trx/trx0undo.cc')
| -rw-r--r-- | storage/innobase/trx/trx0undo.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/storage/innobase/trx/trx0undo.cc b/storage/innobase/trx/trx0undo.cc index 8382049820a..86f2d467219 100644 --- a/storage/innobase/trx/trx0undo.cc +++ b/storage/innobase/trx/trx0undo.cc @@ -466,7 +466,7 @@ static uint16_t trx_undo_header_create(buf_block_t *undo_page, trx_id_t trx_id, mtr->write<8,mtr_t::MAYBE_NOP>(*undo_page, free + TRX_UNDO_TRX_ID + undo_page->page.frame, trx_id); if (UNIV_UNLIKELY(mach_read_from_8(free + TRX_UNDO_TRX_NO + - undo_page->page.frame))) + undo_page->page.frame) != 0)) mtr->memset(undo_page, free + TRX_UNDO_TRX_NO, 8, 0); /* Write TRX_UNDO_NEEDS_PURGE=1 and TRX_UNDO_LOG_START. */ |