summaryrefslogtreecommitdiff
path: root/mysys
diff options
context:
space:
mode:
authorMarko Mäkelä <marko.makela@mariadb.com>2022-06-27 10:14:37 +0300
committerMarko Mäkelä <marko.makela@mariadb.com>2022-06-27 10:14:37 +0300
commit01d757036f5753fbbb54c6fef4bd7b312981ed88 (patch)
tree046889d0bec8d3202b7553584c7e9b5583c9e6b0 /mysys
parentaf929146ed5d10f7cafe1091346e50a873eed3f1 (diff)
parentc86b1389de5fe44fbd659bb50d95017bc19324a5 (diff)
downloadmariadb-git-01d757036f5753fbbb54c6fef4bd7b312981ed88.tar.gz
Merge 10.3 into 10.4
Diffstat (limited to 'mysys')
-rw-r--r--mysys/mf_keycache.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/mysys/mf_keycache.c b/mysys/mf_keycache.c
index 07dd8f3e1ef..f09739ae8af 100644
--- a/mysys/mf_keycache.c
+++ b/mysys/mf_keycache.c
@@ -701,7 +701,7 @@ int prepare_resize_simple_key_cache(SIMPLE_KEY_CACHE_CB *keycache,
keycache->in_resize= 1;
/* Need to flush only if keycache is enabled. */
- if (keycache->can_be_used)
+ if (keycache->can_be_used && keycache->disk_blocks != -1)
{
/* Start the flush phase. */
keycache->resize_in_flush= 1;