diff options
| author | Aditya A <aditya.a@oracle.com> | 2013-06-19 14:55:46 +0530 |
|---|---|---|
| committer | Aditya A <aditya.a@oracle.com> | 2013-06-19 14:55:46 +0530 |
| commit | 0c13218b89b434474977354f84fdcfa77c38c89f (patch) | |
| tree | 7b60139ab3a4ab087d17a6e8b75ea186a1ac3b06 /storage | |
| parent | 0818d6c7e282d3845c1d2de4a0d51b958ac4401c (diff) | |
| parent | dc6961263a6921a5e3b87dcc6bee63b2dc863188 (diff) | |
| download | mariadb-git-0c13218b89b434474977354f84fdcfa77c38c89f.tar.gz | |
Bug#11829813 UNUSED MUTEX COMMIT_THREADS_M
[Merge from 5.1]
Diffstat (limited to 'storage')
| -rw-r--r-- | storage/innobase/handler/ha_innodb.cc | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/storage/innobase/handler/ha_innodb.cc b/storage/innobase/handler/ha_innodb.cc index e6a5c731d5d..496245d483a 100644 --- a/storage/innobase/handler/ha_innodb.cc +++ b/storage/innobase/handler/ha_innodb.cc @@ -101,7 +101,6 @@ static mysql_mutex_t innobase_share_mutex; /** to force correct commit order in binlog */ static mysql_mutex_t prepare_commit_mutex; static ulong commit_threads = 0; -static mysql_mutex_t commit_threads_m; static mysql_cond_t commit_cond; static mysql_mutex_t commit_cond_m; static bool innodb_inited = 0; @@ -218,12 +217,10 @@ static const char* innobase_change_buffering_values[IBUF_USE_COUNT] = { performance schema */ static mysql_pfs_key_t innobase_share_mutex_key; static mysql_pfs_key_t prepare_commit_mutex_key; -static mysql_pfs_key_t commit_threads_m_key; static mysql_pfs_key_t commit_cond_mutex_key; static mysql_pfs_key_t commit_cond_key; static PSI_mutex_info all_pthread_mutexes[] = { - {&commit_threads_m_key, "commit_threads_m", 0}, {&commit_cond_mutex_key, "commit_cond_mutex", 0}, {&innobase_share_mutex_key, "innobase_share_mutex", 0}, {&prepare_commit_mutex_key, "prepare_commit_mutex", 0} @@ -2568,8 +2565,6 @@ innobase_change_buffering_inited_ok: MY_MUTEX_INIT_FAST); mysql_mutex_init(prepare_commit_mutex_key, &prepare_commit_mutex, MY_MUTEX_INIT_FAST); - mysql_mutex_init(commit_threads_m_key, - &commit_threads_m, MY_MUTEX_INIT_FAST); mysql_mutex_init(commit_cond_mutex_key, &commit_cond_m, MY_MUTEX_INIT_FAST); mysql_cond_init(commit_cond_key, &commit_cond, NULL); @@ -2618,7 +2613,6 @@ innobase_end( my_free(internal_innobase_data_file_path); mysql_mutex_destroy(&innobase_share_mutex); mysql_mutex_destroy(&prepare_commit_mutex); - mysql_mutex_destroy(&commit_threads_m); mysql_mutex_destroy(&commit_cond_m); mysql_cond_destroy(&commit_cond); } |