diff --git a/storage/innodb_plugin/ChangeLog b/storage/innodb_plugin/ChangeLog index 72f75f39b1d..5387555d24f 100644 --- a/storage/innodb_plugin/ChangeLog +++ b/storage/innodb_plugin/ChangeLog @@ -1,9 +1,3 @@ -2012-11-28 The InnoDB Team - - * buf/buf0buf.c: - Fix Bug#14329288 IS THE CALL TO IBUF_MERGE_OR_DELETE_FOR_PAGE FROM - BUF_PAGE_GET_GEN REDUNDANT? - 2012-11-15 The InnoDB Team * include/data0type.ic, include/rem0rec.h, diff --git a/storage/innodb_plugin/buf/buf0buf.c b/storage/innodb_plugin/buf/buf0buf.c index 1222f016c4a..755fa947c8f 100644 --- a/storage/innodb_plugin/buf/buf0buf.c +++ b/storage/innodb_plugin/buf/buf0buf.c @@ -1786,26 +1786,14 @@ wait_until_unfixed: buf_page_free_descriptor(bpage); - /* Decompress the page while not holding - buf_pool_mutex or block->mutex. */ + /* Decompress the page and apply buffered operations + while not holding buf_pool_mutex or block->mutex. */ success = buf_zip_decompress(block, srv_use_checksums); ut_a(success); if (UNIV_LIKELY(!recv_no_ibuf_operations)) { - unsigned accessed; - - mutex_enter(&block->mutex); - accessed = buf_page_is_accessed(&block->page); - mutex_exit(&block->mutex); - - if (accessed) { -#ifdef UNIV_IBUF_COUNT_DEBUG - ut_a(ibuf_count_get(space, offset) == 0); -#endif /* UNIV_IBUF_COUNT_DEBUG */ - } else { - ibuf_merge_or_delete_for_page( - block, space, offset, zip_size, TRUE); - } + ibuf_merge_or_delete_for_page(block, space, offset, + zip_size, TRUE); } /* Unfix and unlatch the block. */