diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2022-12-13 18:01:49 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2022-12-13 18:01:49 +0200 |
| commit | 25b91c3f13affc1b58169240894b206ff34b1db3 (patch) | |
| tree | 4042ba02c9777eabc030c80f376cd6e25114ac6d /storage/innobase/buf | |
| parent | dbcbee10176dde410867a3762385a9e5ee63e1d3 (diff) | |
| parent | a8a5c8a1b8ac566241d43a85de90c11f5d1568d9 (diff) | |
| download | mariadb-git-25b91c3f13affc1b58169240894b206ff34b1db3.tar.gz | |
Merge 10.6 into 10.7
Diffstat (limited to 'storage/innobase/buf')
| -rw-r--r-- | storage/innobase/buf/buf0buf.cc | 5 | ||||
| -rw-r--r-- | storage/innobase/buf/buf0lru.cc | 2 |
2 files changed, 4 insertions, 3 deletions
diff --git a/storage/innobase/buf/buf0buf.cc b/storage/innobase/buf/buf0buf.cc index c6b14d2fc67..876eab89da8 100644 --- a/storage/innobase/buf/buf0buf.cc +++ b/storage/innobase/buf/buf0buf.cc @@ -2122,7 +2122,7 @@ void buf_page_free(fil_space_t *space, uint32_t page, mtr_t *mtr) block->page.lock.x_lock(); #ifdef BTR_CUR_HASH_ADAPT if (block->index) - btr_search_drop_page_hash_index(block); + btr_search_drop_page_hash_index(block, false); #endif /* BTR_CUR_HASH_ADAPT */ block->page.set_freed(block->page.state()); mtr->memo_push(block, MTR_MEMO_PAGE_X_MODIFY); @@ -3216,7 +3216,8 @@ retry: #ifdef BTR_CUR_HASH_ADAPT if (drop_hash_entry) - btr_search_drop_page_hash_index(reinterpret_cast<buf_block_t*>(bpage)); + btr_search_drop_page_hash_index(reinterpret_cast<buf_block_t*>(bpage), + false); #endif /* BTR_CUR_HASH_ADAPT */ if (ibuf_exist && !recv_recovery_is_on()) diff --git a/storage/innobase/buf/buf0lru.cc b/storage/innobase/buf/buf0lru.cc index 81204043c84..ed638e254da 100644 --- a/storage/innobase/buf/buf0lru.cc +++ b/storage/innobase/buf/buf0lru.cc @@ -954,7 +954,7 @@ func_exit: order to avoid bogus Valgrind or MSAN warnings.*/ MEM_MAKE_DEFINED(block->page.frame, srv_page_size); - btr_search_drop_page_hash_index(block); + btr_search_drop_page_hash_index(block, false); MEM_UNDEFINED(block->page.frame, srv_page_size); mysql_mutex_lock(&buf_pool.mutex); } |