diff options
Diffstat (limited to 'storage/xtradb/trx/trx0undo.cc')
-rw-r--r-- | storage/xtradb/trx/trx0undo.cc | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/storage/xtradb/trx/trx0undo.cc b/storage/xtradb/trx/trx0undo.cc index 290271c6cab..edb85a89c17 100644 --- a/storage/xtradb/trx/trx0undo.cc +++ b/storage/xtradb/trx/trx0undo.cc @@ -1067,11 +1067,9 @@ Truncates an undo log from the end. This function is used during a rollback to free space from an undo log. */ UNIV_INTERN void -trx_undo_truncate_end_func( +trx_undo_truncate_end( /*=======================*/ -#ifdef UNIV_DEBUG - const trx_t* trx, /*!< in: transaction whose undo log it is */ -#endif /* UNIV_DEBUG */ + trx_t* trx, /*!< in: transaction whose undo log it is */ trx_undo_t* undo, /*!< in: undo log */ undo_no_t limit) /*!< in: all undo records with undo number >= this value should be truncated */ @@ -1086,7 +1084,7 @@ trx_undo_truncate_end_func( ut_ad(mutex_own(&(trx->rseg->mutex))); for (;;) { - mtr_start(&mtr); + mtr_start_trx(&mtr, trx); trunc_here = NULL; @@ -1773,7 +1771,7 @@ trx_undo_assign_undo( ut_ad(mutex_own(&(trx->undo_mutex))); - mtr_start(&mtr); + mtr_start_trx(&mtr, trx); mutex_enter(&rseg->mutex); |