Merge 10.5 into 10.6

82e44d60 · Marko Mäkelä · 176aaf93 · 147a317e · 82e44d60
Commit 82e44d60 authored Mar 31, 2021 by Marko Mäkelä
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 1 deletion

storage/innobase/buf/buf0buf.cc storage/innobase/buf/buf0buf.cc +2 -1

No files found.
--- a/storage/innobase/buf/buf0buf.cc
+++ b/storage/innobase/buf/buf0buf.cc
@@ -2971,7 +2971,8 @@ buf_page_get_low(
 		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;
 		}