diff options
| author | Igor Babaev <igor@askmonty.org> | 2012-06-24 09:10:11 -0700 |
|---|---|---|
| committer | Igor Babaev <igor@askmonty.org> | 2012-06-24 09:10:11 -0700 |
| commit | 2954ed1ec977dab2e6594343455d100d56051473 (patch) | |
| tree | 71bfa7a627ca5633dba3fa0bb9d8e21de7589c88 /storage/myisam/mi_keycache.c | |
| parent | f8f65accf99821386ad2cffdf0c3f473e8f33064 (diff) | |
| parent | 20f3f4a273202ef539314acbbdbb67ab91376ab6 (diff) | |
| download | mariadb-git-2954ed1ec977dab2e6594343455d100d56051473.tar.gz | |
Merge 5.3->5.5.
Diffstat (limited to 'storage/myisam/mi_keycache.c')
| -rw-r--r-- | storage/myisam/mi_keycache.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/storage/myisam/mi_keycache.c b/storage/myisam/mi_keycache.c index a2422b71bbf..b45f0efa2f7 100644 --- a/storage/myisam/mi_keycache.c +++ b/storage/myisam/mi_keycache.c @@ -76,6 +76,7 @@ int mi_assign_to_key_cache(MI_INFO *info, in the old key cache. */ + pthread_mutex_lock(&share->key_cache->op_lock); if (flush_key_blocks(share->key_cache, share->kfile, &share->dirty_part_map, FLUSH_RELEASE)) { @@ -83,6 +84,7 @@ int mi_assign_to_key_cache(MI_INFO *info, mi_print_error(info->s, HA_ERR_CRASHED); mi_mark_crashed(info); /* Mark that table must be checked */ } + pthread_mutex_unlock(&share->key_cache->op_lock); /* Flush the new key cache for this file. This is needed to ensure |