diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2020-11-12 10:37:21 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2020-11-12 10:37:21 +0200 |
| commit | 150f447af1d9ffff168372505e5c9b4297bdd9d4 (patch) | |
| tree | 48ed122f85b110fdc7a0e403d77de8b42f490562 /storage/innobase/buf | |
| parent | 340feb01e407343d4e6258d8965d14c219822b27 (diff) | |
| parent | dd33a70dad2b32aa6fcdbd1f8161d5351f6dbebd (diff) | |
| download | mariadb-git-150f447af1d9ffff168372505e5c9b4297bdd9d4.tar.gz | |
Merge 10.2 into 10.3
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 6867d15ee57..748ca4ed404 100644 --- a/storage/innobase/buf/buf0buf.cc +++ b/storage/innobase/buf/buf0buf.cc @@ -4669,7 +4669,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); @@ -5740,7 +5740,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; @@ -6196,7 +6196,7 @@ database_corrupted: ibuf_merge_or_delete_for_page( (buf_block_t*) bpage, bpage->id, - &bpage->size, TRUE); + bpage->size); } space->release_for_io(); |