diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2011-07-18 23:04:24 +0200 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2011-07-18 23:04:24 +0200 |
| commit | 4e46d8e5bff140f2549841167dc4b65a3c0a645d (patch) | |
| tree | c6612dcc1d0fbd801c084e6c36307d9e5913a293 /storage/xtradb/mem/mem0pool.c | |
| parent | 9a02c69f5c6766eaf552284a2a4dd0f1d26ecd2c (diff) | |
| parent | d4d7a8fa62c406be73f6c0f6d75e795293db548b (diff) | |
| download | mariadb-git-4e46d8e5bff140f2549841167dc4b65a3c0a645d.tar.gz | |
merge with xtradb-5.5.15
fix test cases
Diffstat (limited to 'storage/xtradb/mem/mem0pool.c')
| -rw-r--r-- | storage/xtradb/mem/mem0pool.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/storage/xtradb/mem/mem0pool.c b/storage/xtradb/mem/mem0pool.c index 3291453eeb5..dc68cf8eb24 100644 --- a/storage/xtradb/mem/mem0pool.c +++ b/storage/xtradb/mem/mem0pool.c @@ -115,6 +115,11 @@ struct mem_pool_struct{ /** The common memory pool */ UNIV_INTERN mem_pool_t* mem_comm_pool = NULL; +#ifdef UNIV_PFS_MUTEX +/* Key to register mutex in mem_pool_struct with performance schema */ +UNIV_INTERN mysql_pfs_key_t mem_pool_mutex_key; +#endif /* UNIV_PFS_MUTEX */ + /* We use this counter to check that the mem pool mutex does not leak; this is to track a strange assertion failure reported at mysql@lists.mysql.com */ @@ -230,7 +235,7 @@ mem_pool_create( pool->buf = ut_malloc_low(size, FALSE, TRUE); pool->size = size; - mutex_create(&pool->mutex, SYNC_MEM_POOL); + mutex_create(mem_pool_mutex_key, &pool->mutex, SYNC_MEM_POOL); /* Initialize the free lists */ |