diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2020-05-18 17:30:02 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2020-05-18 17:30:02 +0300 |
| commit | 23047d3ed42eacb5eaa5475a8fa4161550d01c52 (patch) | |
| tree | e723067fea7cfb663ef7e4777e29ffd7dcd2905d /storage/innobase/trx/trx0purge.cc | |
| parent | f86d97c3fee0127d83c009e448f419ac857c72c7 (diff) | |
| parent | faf6d0ef3f9323c6d24f8cdb6533ed23d1a6bb40 (diff) | |
| download | mariadb-git-23047d3ed42eacb5eaa5475a8fa4161550d01c52.tar.gz | |
Merge 10.4 into 10.5
Diffstat (limited to 'storage/innobase/trx/trx0purge.cc')
| -rw-r--r-- | storage/innobase/trx/trx0purge.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/storage/innobase/trx/trx0purge.cc b/storage/innobase/trx/trx0purge.cc index f0b4d6f91b5..6e730faf567 100644 --- a/storage/innobase/trx/trx0purge.cc +++ b/storage/innobase/trx/trx0purge.cc @@ -369,7 +369,7 @@ trx_purge_free_segment(trx_rseg_t* rseg, fil_addr_t hdr_addr) while (!fseg_free_step_not_header( TRX_UNDO_SEG_HDR + TRX_UNDO_FSEG_HEADER - + block->frame, false, &mtr)) { + + block->frame, &mtr)) { mutex_exit(&rseg->mutex); mtr.commit(); @@ -405,7 +405,7 @@ trx_purge_free_segment(trx_rseg_t* rseg, fil_addr_t hdr_addr) fsp0fsp.cc. */ } while (!fseg_free_step(TRX_UNDO_SEG_HDR + TRX_UNDO_FSEG_HEADER - + block->frame, false, &mtr)); + + block->frame, &mtr)); byte* hist = TRX_RSEG + TRX_RSEG_HISTORY_SIZE + rseg_hdr->frame; ut_ad(mach_read_from_4(hist) >= seg_size); |