Commit 0c13218b authored by Aditya A's avatar Aditya A

Bug#11829813 UNUSED MUTEX COMMIT_THREADS_M

[Merge from 5.1]
parents 0818d6c7 dc696126
...@@ -101,7 +101,6 @@ static mysql_mutex_t innobase_share_mutex; ...@@ -101,7 +101,6 @@ static mysql_mutex_t innobase_share_mutex;
/** to force correct commit order in binlog */ /** to force correct commit order in binlog */
static mysql_mutex_t prepare_commit_mutex; static mysql_mutex_t prepare_commit_mutex;
static ulong commit_threads = 0; static ulong commit_threads = 0;
static mysql_mutex_t commit_threads_m;
static mysql_cond_t commit_cond; static mysql_cond_t commit_cond;
static mysql_mutex_t commit_cond_m; static mysql_mutex_t commit_cond_m;
static bool innodb_inited = 0; static bool innodb_inited = 0;
...@@ -218,12 +217,10 @@ static const char* innobase_change_buffering_values[IBUF_USE_COUNT] = { ...@@ -218,12 +217,10 @@ static const char* innobase_change_buffering_values[IBUF_USE_COUNT] = {
performance schema */ performance schema */
static mysql_pfs_key_t innobase_share_mutex_key; static mysql_pfs_key_t innobase_share_mutex_key;
static mysql_pfs_key_t prepare_commit_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_mutex_key;
static mysql_pfs_key_t commit_cond_key; static mysql_pfs_key_t commit_cond_key;
static PSI_mutex_info all_pthread_mutexes[] = { static PSI_mutex_info all_pthread_mutexes[] = {
{&commit_threads_m_key, "commit_threads_m", 0},
{&commit_cond_mutex_key, "commit_cond_mutex", 0}, {&commit_cond_mutex_key, "commit_cond_mutex", 0},
{&innobase_share_mutex_key, "innobase_share_mutex", 0}, {&innobase_share_mutex_key, "innobase_share_mutex", 0},
{&prepare_commit_mutex_key, "prepare_commit_mutex", 0} {&prepare_commit_mutex_key, "prepare_commit_mutex", 0}
...@@ -2568,8 +2565,6 @@ innobase_change_buffering_inited_ok: ...@@ -2568,8 +2565,6 @@ innobase_change_buffering_inited_ok:
MY_MUTEX_INIT_FAST); MY_MUTEX_INIT_FAST);
mysql_mutex_init(prepare_commit_mutex_key, mysql_mutex_init(prepare_commit_mutex_key,
&prepare_commit_mutex, MY_MUTEX_INIT_FAST); &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, mysql_mutex_init(commit_cond_mutex_key,
&commit_cond_m, MY_MUTEX_INIT_FAST); &commit_cond_m, MY_MUTEX_INIT_FAST);
mysql_cond_init(commit_cond_key, &commit_cond, NULL); mysql_cond_init(commit_cond_key, &commit_cond, NULL);
...@@ -2618,7 +2613,6 @@ innobase_end( ...@@ -2618,7 +2613,6 @@ innobase_end(
my_free(internal_innobase_data_file_path); my_free(internal_innobase_data_file_path);
mysql_mutex_destroy(&innobase_share_mutex); mysql_mutex_destroy(&innobase_share_mutex);
mysql_mutex_destroy(&prepare_commit_mutex); mysql_mutex_destroy(&prepare_commit_mutex);
mysql_mutex_destroy(&commit_threads_m);
mysql_mutex_destroy(&commit_cond_m); mysql_mutex_destroy(&commit_cond_m);
mysql_cond_destroy(&commit_cond); mysql_cond_destroy(&commit_cond);
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment