diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2021-03-31 15:50:59 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2021-03-31 15:50:59 +0300 |
| commit | 82e44d60d1e0ff650353554c20bc0c2dd92f0c74 (patch) | |
| tree | 309de02674e575f8832f9fc887d5d471b5dee744 | |
| parent | 176aaf93d1e7c256bb413931c5baa361b856a7de (diff) | |
| parent | 147a317e81ca8b132c353e0309db96d7e74637ec (diff) | |
| download | mariadb-git-82e44d60d1e0ff650353554c20bc0c2dd92f0c74.tar.gz | |
Merge 10.5 into 10.6
| -rw-r--r-- | storage/innobase/buf/buf0buf.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/storage/innobase/buf/buf0buf.cc b/storage/innobase/buf/buf0buf.cc index 93178bada97..ace267db9af 100644 --- a/storage/innobase/buf/buf0buf.cc +++ b/storage/innobase/buf/buf0buf.cc @@ -2971,7 +2971,8 @@ re_evict: buf_flush_lists(ULINT_UNDEFINED, LSN_MAX); buf_flush_wait_batch_end_acquiring_mutex(false); - if (!fix_block->page.oldest_modification()) { + if (fix_block->page.buf_fix_count() == 1 + && !fix_block->page.oldest_modification()) { goto re_evict; } |