diff options
author | Marko Mäkelä <marko.makela@mariadb.com> | 2022-11-24 08:34:45 +0200 |
---|---|---|
committer | Marko Mäkelä <marko.makela@mariadb.com> | 2022-11-24 08:34:45 +0200 |
commit | 22ab79c43079d9fe0ca136148fa6fd05a5aa4d5a (patch) | |
tree | 1d6c16a11c1d6601aa4926f4a653e797e39ff500 /storage/innobase/buf | |
parent | 7f6ddce7eb620d905e1964eaeb44e41eb2b769f2 (diff) | |
parent | 6d40274f65b8d145fbf496e9b1b1d46f258de227 (diff) | |
download | mariadb-git-22ab79c43079d9fe0ca136148fa6fd05a5aa4d5a.tar.gz |
Merge 10.6 into 10.7
Diffstat (limited to 'storage/innobase/buf')
-rw-r--r-- | storage/innobase/buf/buf0buf.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/storage/innobase/buf/buf0buf.cc b/storage/innobase/buf/buf0buf.cc index 1d98ce058ed..c6b14d2fc67 100644 --- a/storage/innobase/buf/buf0buf.cc +++ b/storage/innobase/buf/buf0buf.cc @@ -2695,7 +2695,7 @@ wait_for_unfix: re_evict: if (mode != BUF_GET_IF_IN_POOL && mode != BUF_GET_IF_IN_POOL_OR_WATCH) { - } else if (!ibuf_debug) { + } else if (!ibuf_debug || recv_recovery_is_on()) { } else if (fil_space_t* space = fil_space_t::get(page_id.space())) { /* Try to evict the block from the buffer pool, to use the insert buffer (change buffer) as much as possible. */ |