Commit b99377f3 authored by igor@rurik.mysql.com's avatar igor@rurik.mysql.com

mi_keycache.c:

  Removed FLUSH_REMOVE flag (replaced it by FLUSH_RELEASE).
my_sys.h:
  Removed FLUSH_REMOVE flag.
parent e54f7400
...@@ -265,8 +265,7 @@ enum cache_type ...@@ -265,8 +265,7 @@ enum cache_type
enum flush_type enum flush_type
{ {
FLUSH_KEEP, FLUSH_RELEASE, FLUSH_IGNORE_CHANGED, FLUSH_FORCE_WRITE, FLUSH_KEEP, FLUSH_RELEASE, FLUSH_IGNORE_CHANGED, FLUSH_FORCE_WRITE
FLUSH_REMOVE
}; };
typedef struct st_record_cache /* Used when cacheing records */ typedef struct st_record_cache /* Used when cacheing records */
......
...@@ -76,7 +76,7 @@ int mi_assign_to_key_cache(MI_INFO *info, ...@@ -76,7 +76,7 @@ int mi_assign_to_key_cache(MI_INFO *info,
in the old key cache. 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; error= my_errno;
mi_mark_crashed(info); /* Mark that table must be checked */ mi_mark_crashed(info); /* Mark that table must be checked */
...@@ -90,7 +90,7 @@ int mi_assign_to_key_cache(MI_INFO *info, ...@@ -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 (This can never fail as there is never any not written data in the
new key cache) 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 ensure that setting the key cache and changing the multi_key_cache
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment