summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--include/my_sys.h3
-rw-r--r--myisam/mi_keycache.c4
2 files changed, 3 insertions, 4 deletions
diff --git a/include/my_sys.h b/include/my_sys.h
index 604eaf34fb7..59d5767d204 100644
--- a/include/my_sys.h
+++ b/include/my_sys.h
@@ -265,8 +265,7 @@ enum cache_type
enum flush_type
{
- FLUSH_KEEP, FLUSH_RELEASE, FLUSH_IGNORE_CHANGED, FLUSH_FORCE_WRITE,
- FLUSH_REMOVE
+ FLUSH_KEEP, FLUSH_RELEASE, FLUSH_IGNORE_CHANGED, FLUSH_FORCE_WRITE
};
typedef struct st_record_cache /* Used when cacheing records */
diff --git a/myisam/mi_keycache.c b/myisam/mi_keycache.c
index fc51f331d76..99a2fd6db15 100644
--- a/myisam/mi_keycache.c
+++ b/myisam/mi_keycache.c
@@ -76,7 +76,7 @@ int mi_assign_to_key_cache(MI_INFO *info,
in the old key cache.
*/
- if (flush_key_blocks(share->key_cache, share->kfile, FLUSH_REMOVE))
+ if (flush_key_blocks(share->key_cache, share->kfile, FLUSH_RELEASE))
{
error= my_errno;
mi_mark_crashed(info); /* Mark that table must be checked */
@@ -90,7 +90,7 @@ int mi_assign_to_key_cache(MI_INFO *info,
(This can never fail as there is never any not written data in the
new key cache)
*/
- (void) flush_key_blocks(key_cache, share->kfile, FLUSH_REMOVE);
+ (void) flush_key_blocks(key_cache, share->kfile, FLUSH_RELEASE);
/*
ensure that setting the key cache and changing the multi_key_cache