diff options
| author | Sergey Petrunya <psergey@askmonty.org> | 2012-06-20 15:01:28 +0400 |
|---|---|---|
| committer | Sergey Petrunya <psergey@askmonty.org> | 2012-06-20 15:01:28 +0400 |
| commit | 8c762965d389dcd9e74c743aaf2a89bd8c18545f (patch) | |
| tree | a266816b7b2a7e5f2266fa46b7b8627aa5543773 /include/keycache.h | |
| parent | 0b93b444b6c4de6b219fd3a4b3d5fa2e388dc211 (diff) | |
| parent | 584d923c3292395a2e8288adcf4795992789f27c (diff) | |
| download | mariadb-git-8c762965d389dcd9e74c743aaf2a89bd8c18545f.tar.gz | |
Merge 5.3 -> 5.5
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; |