diff options
Diffstat (limited to 'storage/innobase/buf/buf0buddy.cc')
| -rw-r--r-- | storage/innobase/buf/buf0buddy.cc | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/storage/innobase/buf/buf0buddy.cc b/storage/innobase/buf/buf0buddy.cc index 125dac5333e..3d476fbac77 100644 --- a/storage/innobase/buf/buf0buddy.cc +++ b/storage/innobase/buf/buf0buddy.cc @@ -354,11 +354,11 @@ buf_buddy_block_free(void* buf) ut_a(!ut_align_offset(buf, srv_page_size)); HASH_SEARCH(hash, &buf_pool.zip_hash, fold, buf_page_t*, bpage, - ut_ad(bpage->state() == BUF_BLOCK_MEMORY + ut_ad(bpage->state() == buf_page_t::MEMORY && bpage->in_zip_hash), - ((buf_block_t*) bpage)->frame == buf); + bpage->frame == buf); ut_a(bpage); - ut_a(bpage->state() == BUF_BLOCK_MEMORY); + ut_a(bpage->state() == buf_page_t::MEMORY); ut_ad(bpage->in_zip_hash); ut_d(bpage->in_zip_hash = false); HASH_DELETE(buf_page_t, hash, &buf_pool.zip_hash, fold, bpage); @@ -383,10 +383,10 @@ buf_buddy_block_register( buf_block_t* block) /*!< in: buffer frame to allocate */ { const ulint fold = BUF_POOL_ZIP_FOLD(block); - ut_ad(block->page.state() == BUF_BLOCK_MEMORY); + ut_ad(block->page.state() == buf_page_t::MEMORY); - ut_a(block->frame); - ut_a(!ut_align_offset(block->frame, srv_page_size)); + ut_a(block->page.frame); + ut_a(!ut_align_offset(block->page.frame, srv_page_size)); ut_ad(!block->page.in_zip_hash); ut_d(block->page.in_zip_hash = true); @@ -462,8 +462,8 @@ byte *buf_buddy_alloc_low(ulint i, bool *lru) alloc_big: buf_buddy_block_register(block); - block = (buf_block_t*) buf_buddy_alloc_from( - block->frame, i, BUF_BUDDY_SIZES); + block = reinterpret_cast<buf_block_t*>( + buf_buddy_alloc_from(block->page.frame, i, BUF_BUDDY_SIZES)); func_exit: buf_pool.buddy_stat[i].used++; @@ -694,7 +694,7 @@ buf_buddy_realloc(void* buf, ulint size) block = reinterpret_cast<buf_block_t*>( buf_buddy_alloc_from( - block->frame, i, BUF_BUDDY_SIZES)); + block->page.frame, i, BUF_BUDDY_SIZES)); } buf_pool.buddy_stat[i].used++; |