Merge 10.5 into 10.6

MariaDB · Mar 31, 2021 · 82e44d6 · 82e44d6
2 parents 176aaf9 + 147a317
commit 82e44d6
Showing 1 changed file with 2 additions and 1 deletion.
diff --git 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;
 		}