diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2020-11-10 09:47:29 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2020-11-11 15:48:43 +0200 |
| commit | bd528b0c93409b81157314d9699af519fd9d52ce (patch) | |
| tree | 8e070344b687204c87cd55c6b763f09faccdca35 /storage/innobase/buf | |
| parent | cd927dd34555a34e733a01bf5af52470f57ce906 (diff) | |
| download | mariadb-git-bd528b0c93409b81157314d9699af519fd9d52ce.tar.gz | |
MDEV-24182 ibuf_merge_or_delete_for_page() contains dead code
The function ibuf_merge_or_delete_for_page() was always being
invoked with update_ibuf_bitmap=true ever since
commit cd623508dff53c210154392da6c0f65b7b6bcf4c
fixed up something after MDEV-9566.
Furthermore, the parameter page_size is never being passed as a
null pointer, and therefore it should better be a reference to
a constant object.
Diffstat (limited to 'storage/innobase/buf')
| -rw-r--r-- | storage/innobase/buf/buf0buf.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/storage/innobase/buf/buf0buf.cc b/storage/innobase/buf/buf0buf.cc index e2b68011077..a54d98adee0 100644 --- a/storage/innobase/buf/buf0buf.cc +++ b/storage/innobase/buf/buf0buf.cc @@ -4601,7 +4601,7 @@ evict_from_pool: if (!access_time && !recv_no_ibuf_operations) { ibuf_merge_or_delete_for_page( - block, page_id, &page_size, TRUE); + block, page_id, page_size); } buf_pool_mutex_enter(buf_pool); @@ -5678,7 +5678,7 @@ loop: /* Delete possible entries for the page from the insert buffer: such can exist if the page belonged to an index which was dropped */ if (!recv_recovery_is_on()) { - ibuf_merge_or_delete_for_page(NULL, page_id, &page_size, TRUE); + ibuf_merge_or_delete_for_page(NULL, page_id, page_size); } frame = block->frame; @@ -6133,7 +6133,7 @@ database_corrupted: ibuf_merge_or_delete_for_page( (buf_block_t*) bpage, bpage->id, - &bpage->size, TRUE); + bpage->size); } fil_space_release_for_io(space); |