diff --git a/storage/innobase/buf/buf0buf.cc b/storage/innobase/buf/buf0buf.cc
|
index 60979884fda..2cdd36a8b60 100644
|
--- a/storage/innobase/buf/buf0buf.cc
|
+++ b/storage/innobase/buf/buf0buf.cc
|
@@ -3603,10 +3603,13 @@ buf_page_optimistic_get(
|
return FALSE;
|
}
|
|
- page_hash_latch *hash_lock = buf_pool.hash_lock_get(block->page.id());
|
+ const page_id_t id(block->page.id());
|
+
|
+ page_hash_latch *hash_lock = buf_pool.hash_lock_get(id);
|
hash_lock->read_lock();
|
|
- if (UNIV_UNLIKELY(block->page.state() != BUF_BLOCK_FILE_PAGE
|
+ if (UNIV_UNLIKELY(id != block->page.id()
|
+ || block->page.state() != BUF_BLOCK_FILE_PAGE
|
|| block->page.io_fix() != BUF_IO_NONE)) {
|
hash_lock->read_unlock();
|
return(FALSE);
|
@@ -3619,8 +3622,7 @@ buf_page_optimistic_get(
|
|
buf_page_make_young_if_needed(&block->page);
|
|
- ut_ad(!ibuf_inside(mtr)
|
- || ibuf_page(block->page.id(), block->zip_size(), NULL));
|
+ ut_ad(!ibuf_inside(mtr) || ibuf_page(id, block->zip_size(), NULL));
|
|
mtr_memo_type_t fix_type;
|
|
@@ -3633,6 +3635,8 @@ buf_page_optimistic_get(
|
&block->lock, file, line);
|
}
|
|
+ ut_ad(id == block->page.id());
|
+
|
if (!success) {
|
buf_block_buf_fix_dec(block);
|
return(FALSE);
|