Commit 3e1275dd authored by Vadim Tkachenko's avatar Vadim Tkachenko

merge from ~mordred/percona-xtradb/fix-buf-buf, Fixed a compile problem with...

merge from ~mordred/percona-xtradb/fix-buf-buf, Fixed a compile problem with trying to send a buf_block_t* to a thing wanting
parent 7d8db470
...@@ -1860,6 +1860,7 @@ buf_page_get_gen( ...@@ -1860,6 +1860,7 @@ buf_page_get_gen(
mtr_t* mtr) /* in: mini-transaction */ mtr_t* mtr) /* in: mini-transaction */
{ {
buf_block_t* block; buf_block_t* block;
buf_page_t* bpage= NULL;
ibool accessed; ibool accessed;
ulint fix_type; ulint fix_type;
ibool must_read; ibool must_read;
...@@ -1882,7 +1883,9 @@ loop: ...@@ -1882,7 +1883,9 @@ loop:
//buf_pool_mutex_enter(); //buf_pool_mutex_enter();
if (block) { if (block) {
block_mutex = buf_page_get_mutex(block); bpage = &block->page;
block_mutex = buf_page_get_mutex(bpage);
mutex_enter(block_mutex); mutex_enter(block_mutex);
/* If the guess is a compressed page descriptor that /* If the guess is a compressed page descriptor that
...@@ -1911,7 +1914,8 @@ loop: ...@@ -1911,7 +1914,8 @@ loop:
mutex_enter(&page_hash_mutex); mutex_enter(&page_hash_mutex);
block = (buf_block_t*) buf_page_hash_get(space, offset); block = (buf_block_t*) buf_page_hash_get(space, offset);
if (block) { if (block) {
block_mutex = buf_page_get_mutex(block); bpage = &block->page;
block_mutex = buf_page_get_mutex(bpage);
mutex_enter(block_mutex); mutex_enter(block_mutex);
} }
mutex_exit(&page_hash_mutex); mutex_exit(&page_hash_mutex);
...@@ -1980,7 +1984,8 @@ wait_until_unfixed: ...@@ -1980,7 +1984,8 @@ wait_until_unfixed:
block = buf_LRU_get_free_block(0); block = buf_LRU_get_free_block(0);
ut_a(block); ut_a(block);
block_mutex = buf_page_get_mutex(block); bpage = &block->page;
block_mutex = buf_page_get_mutex(bpage);
//buf_pool_mutex_enter(); //buf_pool_mutex_enter();
mutex_enter(&flush_list_mutex); mutex_enter(&flush_list_mutex);
...@@ -2001,7 +2006,8 @@ wait_until_unfixed: ...@@ -2001,7 +2006,8 @@ wait_until_unfixed:
mutex_exit(block_mutex); mutex_exit(block_mutex);
block = (buf_block_t*) hash_bpage; block = (buf_block_t*) hash_bpage;
block_mutex = buf_page_get_mutex(block); bpage = &block->page;
block_mutex = buf_page_get_mutex(bpage);
mutex_enter(block_mutex); mutex_enter(block_mutex);
mutex_exit(&page_hash_mutex); mutex_exit(&page_hash_mutex);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment