mysql-trunk-innodb: fix compile errors on Windows with UNIV_DEBUG defined.
This commit is contained in:
parent
df1a56253f
commit
dde975afb9
@ -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 */
|
||||
|
@ -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);
|
||||
|
Loading…
x
Reference in New Issue
Block a user