mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-02-01 03:21:53 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge working copy to mysql-5.1.

Browse source
This commit is contained in:
Marko Mäkelä 2013-08-21 11:54:09 +03:00
commit 36db646fd5
2 changed files with 22 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
storage/innodb_plugin/ChangeLog
View file

@ -1,3 +1,9 @@
2013-08-21 The InnoDB Team
* buf/buf0buf.c:
Fix Bug#12560151 61132: infinite loop in buf_page_get_gen()
when handling compressed pages
2013-08-16 The InnoDB Team
* row/row0sel.c:

43
storage/innodb_plugin/buf/buf0buf.c
View file

@ -1615,7 +1615,6 @@ loop:
block = (buf_block_t*) buf_page_hash_get(space, offset);
}
loop2:
if (block == NULL) {
/* Page not in buf_pool: needs to be read from file */
@ -1706,6 +1705,11 @@ wait_until_unfixed:
goto loop;
}
/* Buffer-fix the block so that it cannot be evicted
or relocated while we are attempting to allocate an
uncompressed page. */
bpage->buf_fix_count++;
/* Allocate an uncompressed page. */
buf_pool_mutex_exit();
mutex_exit(&buf_pool_zip_mutex);
@ -1715,32 +1719,19 @@ wait_until_unfixed:
buf_pool_mutex_enter();
mutex_enter(&block->mutex);
mutex_enter(&buf_pool_zip_mutex);
/* Buffer-fixing prevents the page_hash from changing. */
ut_ad(bpage == buf_page_hash_get(space, offset));
{
buf_page_t* hash_bpage
= buf_page_hash_get(space, offset);
if (--bpage->buf_fix_count
|| buf_page_get_io_fix(bpage) != BUF_IO_NONE) {
if (UNIV_UNLIKELY(bpage != hash_bpage)) {
/* The buf_pool->page_hash was modified
while buf_pool_mutex was released.
Free the block that was allocated. */
buf_LRU_block_free_non_file_page(block);
mutex_exit(&block->mutex);
block = (buf_block_t*) hash_bpage;
goto loop2;
}
}
if (UNIV_UNLIKELY
(bpage->buf_fix_count
|| buf_page_get_io_fix(bpage) != BUF_IO_NONE)) {
/* The block was buffer-fixed or I/O-fixed
while buf_pool_mutex was not held by this thread.
Free the block that was allocated and try again.
This should be extremely unlikely. */
mutex_exit(&buf_pool_zip_mutex);
/* The block was buffer-fixed or I/O-fixed while
buf_pool_mutex was not held by this thread.
Free the block that was allocated and retry.
This should be extremely unlikely, for example,
if buf_page_get_zip() was invoked. */
buf_LRU_block_free_non_file_page(block);
mutex_exit(&block->mutex);
@ -1751,8 +1742,6 @@ wait_until_unfixed:
/* Move the compressed page from bpage to block,
and uncompress it. */
mutex_enter(&buf_pool_zip_mutex);
buf_relocate(bpage, &block->page);
buf_block_init_low(block);
block->lock_hash_val = lock_rec_hash(space, offset);