diff options
| author | Oleksandr Byelkin <sanja@mariadb.com> | 2023-05-17 14:58:11 +0200 |
|---|---|---|
| committer | Oleksandr Byelkin <sanja@mariadb.com> | 2023-05-17 14:58:11 +0200 |
| commit | 2543673dd22782f59299fd2e72179601892bd967 (patch) | |
| tree | b73641bd88c9d1572203c75da618fce1937518e8 /storage/innobase/trx/trx0rec.cc | |
| parent | 4e5b771e980edfdad5c5414aa62c81d409d585a4 (diff) | |
| parent | ef911553f442cbb1baaac2af44c38b54fd058c41 (diff) | |
| download | mariadb-git-bb-11.1-release.tar.gz | |
Merge branch '11.0' into 11.1bb-11.1-release
Diffstat (limited to 'storage/innobase/trx/trx0rec.cc')
| -rw-r--r-- | storage/innobase/trx/trx0rec.cc | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/storage/innobase/trx/trx0rec.cc b/storage/innobase/trx/trx0rec.cc index e70516a2d2d..c1a7b08b717 100644 --- a/storage/innobase/trx/trx0rec.cc +++ b/storage/innobase/trx/trx0rec.cc @@ -1875,26 +1875,28 @@ trx_undo_report_row_operation( } mtr_t mtr; + dberr_t err; mtr.start(); trx_undo_t** pundo; trx_rseg_t* rseg; const bool is_temp = index->table->is_temporary(); + buf_block_t* undo_block; if (is_temp) { mtr.set_log_mode(MTR_LOG_NO_REDO); - rseg = trx->get_temp_rseg(); pundo = &trx->rsegs.m_noredo.undo; + undo_block = trx_undo_assign_low<true>(trx, rseg, pundo, + &mtr, &err); } else { ut_ad(!trx->read_only); ut_ad(trx->id); pundo = &trx->rsegs.m_redo.undo; rseg = trx->rsegs.m_redo.rseg; + undo_block = trx_undo_assign_low<false>(trx, rseg, pundo, + &mtr, &err); } - dberr_t err; - buf_block_t* undo_block = trx_undo_assign_low(trx, rseg, pundo, - &err, &mtr); trx_undo_t* undo = *pundo; ut_ad((err == DB_SUCCESS) == (undo_block != NULL)); if (UNIV_UNLIKELY(undo_block == NULL)) { |