diff options
author | Marko Mäkelä <marko.makela@mariadb.com> | 2022-06-27 10:51:20 +0300 |
---|---|---|
committer | Marko Mäkelä <marko.makela@mariadb.com> | 2022-06-27 10:51:20 +0300 |
commit | ea847cbeaf76817aab8817f849e80e8ce8b2b43c (patch) | |
tree | 597ba0e93bc4fdfac5e5a9ad215351b8d0c0e7be /mysys | |
parent | 03174cabd71e0e72746736a3abf24af3931292d8 (diff) | |
parent | dd7e9fb38a71064992a12ca58b5366f48b21e0b4 (diff) | |
download | mariadb-git-ea847cbeaf76817aab8817f849e80e8ce8b2b43c.tar.gz |
Merge 10.4 into 10.5
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 127bfff4af2..8f3e4767393 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; |