diff options
Diffstat (limited to 'storage/xtradb/trx/trx0trx.c')
| -rw-r--r-- | storage/xtradb/trx/trx0trx.c | 27 |
1 files changed, 6 insertions, 21 deletions
diff --git a/storage/xtradb/trx/trx0trx.c b/storage/xtradb/trx/trx0trx.c index f1809188c00..05d89c8ce6a 100644 --- a/storage/xtradb/trx/trx0trx.c +++ b/storage/xtradb/trx/trx0trx.c @@ -388,27 +388,6 @@ trx_allocate_for_background(void) } /********************************************************************//** -Releases the search latch if trx has reserved it. */ -UNIV_INTERN -void -trx_search_latch_release_if_reserved( -/*=================================*/ - trx_t* trx) /*!< in: transaction */ -{ - ulint i; - - if (trx->has_search_latch) { - for (i = 0; i < btr_search_index_num; i++) { - if (trx->has_search_latch & ((ulint)1 << i)) { - rw_lock_s_unlock(btr_search_latch_part[i]); - } - } - - trx->has_search_latch = FALSE; - } -} - -/********************************************************************//** Frees a transaction object. */ UNIV_INTERN void @@ -470,6 +449,9 @@ trx_free( ut_a(UT_LIST_GET_LEN(trx->wait_thrs) == 0); ut_a(!trx->has_search_latch); +#ifdef UNIV_SYNC_DEBUG + ut_ad(!btr_search_own_any()); +#endif ut_a(trx->dict_operation_lock_mode == 0); @@ -529,6 +511,9 @@ trx_free_prepared( ut_a(UT_LIST_GET_LEN(trx->wait_thrs) == 0); ut_a(!trx->has_search_latch); +#ifdef UNIV_SYNC_DEBUG + ut_ad(!btr_search_own_any()); +#endif ut_a(trx->dict_operation_lock_mode == 0); |