1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

mysql-trunk-innodb: fix compile errors on Windows with UNIV_DEBUG defined.

Browse Source
This commit is contained in:
Calvin Sun 2010-05-21 16:30:09 -05:00
parent df1a56253f
commit dde975afb9
2 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
storage/innobase/buf/buf0flu.c
View File

@ -1037,12 +1037,14 @@ buf_flush_write_block_low(
/*======================*/ /*======================*/
buf_page_t* bpage) /*!< in: buffer block to write */ 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 #ifdef UNIV_DEBUG
buf_pool_t* buf_pool = buf_pool_from_bpage(bpage); buf_pool_t* buf_pool = buf_pool_from_bpage(bpage);
ut_ad(!buf_pool_mutex_own(buf_pool)); ut_ad(!buf_pool_mutex_own(buf_pool));
#endif #endif
ulint zip_size = buf_page_get_zip_size(bpage);
page_t* frame = NULL;
#ifdef UNIV_LOG_DEBUG #ifdef UNIV_LOG_DEBUG
static ibool univ_log_debug_warned; static ibool univ_log_debug_warned;
#endif /* UNIV_LOG_DEBUG */ #endif /* UNIV_LOG_DEBUG */

7
storage/innobase/sync/sync0rw.c
View File

@ -350,10 +350,13 @@ rw_lock_validate(
/*=============*/ /*=============*/
rw_lock_t* lock) /*!< in: rw-lock */ rw_lock_t* lock) /*!< in: rw-lock */
{ {
ulint waiters;
lint lock_word;
ut_a(lock); ut_a(lock);
ulint waiters = rw_lock_get_waiters(lock); waiters = rw_lock_get_waiters(lock);
lint lock_word = lock->lock_word; lock_word = lock->lock_word;
ut_a(lock->magic_n == RW_LOCK_MAGIC_N); ut_a(lock->magic_n == RW_LOCK_MAGIC_N);
ut_a(waiters == 0 || waiters == 1); ut_a(waiters == 0 || waiters == 1);