diff options
| -rw-r--r-- | storage/innobase/buf/buf0flu.c | 6 | ||||
| -rw-r--r-- | storage/innobase/sync/sync0rw.c | 7 |
2 files changed, 9 insertions, 4 deletions
diff --git a/storage/innobase/buf/buf0flu.c b/storage/innobase/buf/buf0flu.c index 19f3ecba930..046f1ed51e8 100644 --- a/storage/innobase/buf/buf0flu.c +++ b/storage/innobase/buf/buf0flu.c @@ -1037,12 +1037,14 @@ buf_flush_write_block_low( /*======================*/ buf_page_t* bpage) /*!< in: buffer block to write */ { + ulint zip_size = buf_page_get_zip_size(bpage); + page_t* frame = NULL; + #ifdef UNIV_DEBUG buf_pool_t* buf_pool = buf_pool_from_bpage(bpage); ut_ad(!buf_pool_mutex_own(buf_pool)); #endif - ulint zip_size = buf_page_get_zip_size(bpage); - page_t* frame = NULL; + #ifdef UNIV_LOG_DEBUG static ibool univ_log_debug_warned; #endif /* UNIV_LOG_DEBUG */ diff --git a/storage/innobase/sync/sync0rw.c b/storage/innobase/sync/sync0rw.c index c05c823ff61..0ff2920f4f8 100644 --- a/storage/innobase/sync/sync0rw.c +++ b/storage/innobase/sync/sync0rw.c @@ -350,10 +350,13 @@ rw_lock_validate( /*=============*/ rw_lock_t* lock) /*!< in: rw-lock */ { + ulint waiters; + lint lock_word; + ut_a(lock); - ulint waiters = rw_lock_get_waiters(lock); - lint lock_word = lock->lock_word; + waiters = rw_lock_get_waiters(lock); + lock_word = lock->lock_word; ut_a(lock->magic_n == RW_LOCK_MAGIC_N); ut_a(waiters == 0 || waiters == 1); |