diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2022-08-25 16:02:44 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2022-08-25 16:02:44 +0300 |
| commit | 76bb671e422d958f7252f428b39e109369e2679d (patch) | |
| tree | 446027e5415829c636fa4a80978dfebc7aa4eba1 /storage/innobase/buf | |
| parent | 8ff10969996a5349e906fab44b45c6e3ec53eea0 (diff) | |
| parent | 9929301ecd0d3e4571e03ab4cabdea00179e4c8a (diff) | |
| download | mariadb-git-76bb671e422d958f7252f428b39e109369e2679d.tar.gz | |
Merge 10.5 into 10.6
Diffstat (limited to 'storage/innobase/buf')
| -rw-r--r-- | storage/innobase/buf/buf0buf.cc | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/storage/innobase/buf/buf0buf.cc b/storage/innobase/buf/buf0buf.cc index c26bbda9473..eaf0f955a1f 100644 --- a/storage/innobase/buf/buf0buf.cc +++ b/storage/innobase/buf/buf0buf.cc @@ -2818,12 +2818,10 @@ get_latch: goto page_id_mismatch; } get_latch_valid: + mtr->memo_push(block, fix_type); #ifdef BTR_CUR_HASH_ADAPT - if (block->index) { - mtr_t::defer_drop_ahi(block, fix_type); - } + btr_search_drop_page_hash_index(block, true); #endif /* BTR_CUR_HASH_ADAPT */ - mtr->memo_push(block, fix_type); break; case RW_SX_LATCH: fix_type = MTR_MEMO_PAGE_SX_FIX; |