diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2013-11-23 00:50:54 +0100 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2013-11-23 00:50:54 +0100 |
| commit | c6d30805db3a1a2a098c3009fde8a42efd9fb9de (patch) | |
| tree | e55f68e5adf40e1a75e08bda91b712ab6a094643 /storage/xtradb/trx | |
| parent | 2c032b990e4ec470fad2e9f61cf6267a68b7e937 (diff) | |
| parent | eea310e498f3b7ac95a4492d48f04e08d3009412 (diff) | |
| download | mariadb-git-c6d30805db3a1a2a098c3009fde8a42efd9fb9de.tar.gz | |
5.5 merge
Diffstat (limited to 'storage/xtradb/trx')
| -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 cead22a504b..b2df6d471f1 100644 --- a/storage/xtradb/trx/trx0trx.c +++ b/storage/xtradb/trx/trx0trx.c @@ -385,27 +385,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 @@ -467,6 +446,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); @@ -526,6 +508,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); |