diff options
author | Igor Babaev <igor@askmonty.org> | 2012-06-23 15:00:05 -0700 |
---|---|---|
committer | Igor Babaev <igor@askmonty.org> | 2012-06-23 15:00:05 -0700 |
commit | 20f3f4a273202ef539314acbbdbb67ab91376ab6 (patch) | |
tree | 4081cb30864a2cdf9184bdc8c31216d2c7ce2947 /storage | |
parent | e7bfda3b3cc59ba3fe4fe7e7e4307704a464f97f (diff) | |
parent | d9c3a3e39e4c5a6f060b7bbc1646ca74c123fbab (diff) | |
download | mariadb-git-20f3f4a273202ef539314acbbdbb67ab91376ab6.tar.gz |
Merge 5.2->5.3
Diffstat (limited to 'storage')
-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 be0cdc470f1..eed8cc666eb 100644 --- a/storage/myisam/mi_keycache.c +++ b/storage/myisam/mi_keycache.c @@ -75,6 +75,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)) { @@ -82,6 +83,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 |