diff options
| author | Sergey Petrunya <psergey@askmonty.org> | 2012-07-25 20:53:49 +0400 |
|---|---|---|
| committer | Sergey Petrunya <psergey@askmonty.org> | 2012-07-25 20:53:49 +0400 |
| commit | 2b0f6ece7bd35399de861f1dd5d1ae540ee89ff6 (patch) | |
| tree | 1e9216bd7901c2a09b12488bec3f6dae77416b78 /include/keycache.h | |
| parent | 0b79fe2b30e7a82a823e7c134eb69cfc0c078f95 (diff) | |
| parent | 55597a48698b267b966873727b079cd3ac0d1c18 (diff) | |
| download | mariadb-git-2b0f6ece7bd35399de861f1dd5d1ae540ee89ff6.tar.gz | |
Merge 5.5-main -> 5.5-show-explain
Diffstat (limited to 'include/keycache.h')
| -rw-r--r-- | include/keycache.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/include/keycache.h b/include/keycache.h index da6624725e7..8fa9bf1cd18 100644 --- a/include/keycache.h +++ b/include/keycache.h @@ -148,9 +148,10 @@ typedef struct st_key_cache ulonglong param_partitions; /* number of the key cache partitions */ my_bool key_cache_inited; /* <=> key cache has been created */ my_bool can_be_used; /* usage of cache for read/write is allowed */ - my_bool in_init; /* Set to 1 in MySQL during init/resize */ + my_bool in_init; /* set to 1 in MySQL during init/resize */ uint partitions; /* actual number of partitions */ size_t key_cache_mem_size; /* specified size of the cache memory */ + pthread_mutex_t op_lock; /* to serialize operations like 'resize' */ } KEY_CACHE; |