diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2021-11-05 08:13:35 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2021-11-05 08:13:35 +0200 |
| commit | 2b551edb4e8c9ff1a8bbcfa70f381cf46a861bdb (patch) | |
| tree | 4bdc3e9104ced173387da3b1b47c151454e2cc9a | |
| parent | db8248d0cd6e637979c6efefbcf03666746e32b1 (diff) | |
| parent | 9b967c4c31555174a293922d4717d83b7d68bc76 (diff) | |
| download | mariadb-git-2b551edb4e8c9ff1a8bbcfa70f381cf46a861bdb.tar.gz | |
Merge 10.6 into 10.7
| -rw-r--r-- | storage/innobase/buf/buf0buddy.cc | 1 | ||||
| -rw-r--r-- | storage/innobase/buf/buf0buf.cc | 2 | ||||
| -rw-r--r-- | storage/innobase/buf/buf0lru.cc | 1 |
3 files changed, 3 insertions, 1 deletions
diff --git a/storage/innobase/buf/buf0buddy.cc b/storage/innobase/buf/buf0buddy.cc index 6f4b4554518..125dac5333e 100644 --- a/storage/innobase/buf/buf0buddy.cc +++ b/storage/innobase/buf/buf0buddy.cc @@ -362,6 +362,7 @@ buf_buddy_block_free(void* buf) ut_ad(bpage->in_zip_hash); ut_d(bpage->in_zip_hash = false); HASH_DELETE(buf_page_t, hash, &buf_pool.zip_hash, fold, bpage); + bpage->hash = nullptr; ut_d(memset(buf, 0, srv_page_size)); MEM_UNDEFINED(buf, srv_page_size); diff --git a/storage/innobase/buf/buf0buf.cc b/storage/innobase/buf/buf0buf.cc index cad04bc6855..2cccf976089 100644 --- a/storage/innobase/buf/buf0buf.cc +++ b/storage/innobase/buf/buf0buf.cc @@ -219,7 +219,7 @@ buf_pool.LRU. The chains of free memory blocks (buf_pool.zip_free[]) are used by the buddy allocator (buf0buddy.cc) to keep track of currently unused -memory blocks of size sizeof(buf_page_t)..srv_page_size / 2. These +memory blocks of size UNIV_PAGE_SIZE_MIN..srv_page_size / 2. These blocks are inside the srv_page_size-sized memory blocks of type BUF_BLOCK_MEMORY that the buddy allocator requests from the buffer pool. The buddy allocator is solely used for allocating control diff --git a/storage/innobase/buf/buf0lru.cc b/storage/innobase/buf/buf0lru.cc index 77d367074b0..250c12bea78 100644 --- a/storage/innobase/buf/buf0lru.cc +++ b/storage/innobase/buf/buf0lru.cc @@ -1010,6 +1010,7 @@ buf_LRU_block_free_non_file_page( ut_ad(!block->page.in_free_list); ut_ad(!block->page.oldest_modification()); ut_ad(!block->page.in_LRU_list); + ut_ad(!block->page.hash); block->page.set_state(BUF_BLOCK_NOT_USED); |