diff options
author | Marko Mäkelä <marko.makela@mariadb.com> | 2022-06-27 10:59:31 +0300 |
---|---|---|
committer | Marko Mäkelä <marko.makela@mariadb.com> | 2022-06-27 10:59:31 +0300 |
commit | 87bd79b1e7b15cd323e4b4ed8abe139895bf5b6f (patch) | |
tree | 2e626434665ec6bb569feb8a850908dda7b6aa70 /mysys | |
parent | d96436c99905ed30494c6a52841ca17a558f44c6 (diff) | |
parent | ea847cbeaf76817aab8817f849e80e8ce8b2b43c (diff) | |
download | mariadb-git-87bd79b1e7b15cd323e4b4ed8abe139895bf5b6f.tar.gz |
Merge 10.5 into 10.6
Diffstat (limited to 'mysys')
-rw-r--r-- | mysys/mf_keycache.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mysys/mf_keycache.c b/mysys/mf_keycache.c index bdc001fbe25..2001cb64db0 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; |