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

Reverting fix for bug#14329288

Browse Source 
revid that is being reverted: marko.makela@oracle.com-20121128070024-hb56t41limja8edz
This commit is contained in:
Inaam Rana 2012-11-30 16:19:30 +05:00
parent bc6287a337
commit 672a6496e0
2 changed files with 4 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
storage/innodb_plugin/ChangeLog
View File

@ -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 2012-11-15 The InnoDB Team
* include/data0type.ic, include/rem0rec.h, * include/data0type.ic, include/rem0rec.h,

20
storage/innodb_plugin/buf/buf0buf.c
View File

@ -1786,26 +1786,14 @@ wait_until_unfixed:
buf_page_free_descriptor(bpage); buf_page_free_descriptor(bpage);
/* Decompress the page while not holding /* Decompress the page and apply buffered operations
buf_pool_mutex or block->mutex. */ while not holding buf_pool_mutex or block->mutex. */
success = buf_zip_decompress(block, srv_use_checksums); success = buf_zip_decompress(block, srv_use_checksums);
ut_a(success); ut_a(success);
if (UNIV_LIKELY(!recv_no_ibuf_operations)) { if (UNIV_LIKELY(!recv_no_ibuf_operations)) {
unsigned accessed; ibuf_merge_or_delete_for_page(block, space, offset,
zip_size, TRUE);
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);
}
} }
/* Unfix and unlatch the block. */ /* Unfix and unlatch the block. */