From 3fcbd7cb47b1b251d3d541c9e67c1a0b7d53fdc0 Mon Sep 17 00:00:00 2001 From: Sergei Golubchik Date: Sun, 11 Jan 2015 15:49:23 +0100 Subject: [PATCH] cleanup: remove unused THD::COND_wsrep_thd --- sql/sql_class.cc | 1 - sql/sql_class.h | 1 - sql/wsrep_mysqld.cc | 3 +-- 3 files changed, 1 insertion(+), 4 deletions(-) diff --git a/sql/sql_class.cc b/sql/sql_class.cc index 4fddb2158bc..0d494073b3f 100644 --- a/sql/sql_class.cc +++ b/sql/sql_class.cc @@ -1034,7 +1034,6 @@ THD::THD(bool is_wsrep_applier) #ifdef WITH_WSREP mysql_mutex_init(key_LOCK_wsrep_thd, &LOCK_wsrep_thd, MY_MUTEX_INIT_FAST); - mysql_cond_init(key_COND_wsrep_thd, &COND_wsrep_thd, NULL); wsrep_ws_handle.trx_id = WSREP_UNDEFINED_TRX_ID; wsrep_ws_handle.opaque = NULL; wsrep_retry_counter = 0; diff --git a/sql/sql_class.h b/sql/sql_class.h index 60ed0793bef..4c014fd93a0 100644 --- a/sql/sql_class.h +++ b/sql/sql_class.h @@ -3788,7 +3788,6 @@ public: enum wsrep_query_state wsrep_query_state; enum wsrep_conflict_state wsrep_conflict_state; mysql_mutex_t LOCK_wsrep_thd; - mysql_cond_t COND_wsrep_thd; wsrep_trx_meta_t wsrep_trx_meta; uint32 wsrep_rand; Relay_log_info *wsrep_rli; diff --git a/sql/wsrep_mysqld.cc b/sql/wsrep_mysqld.cc index c8476493b9a..599b9be69c4 100644 --- a/sql/wsrep_mysqld.cc +++ b/sql/wsrep_mysqld.cc @@ -123,7 +123,7 @@ PSI_mutex_key key_LOCK_wsrep_rollback, key_LOCK_wsrep_thd, key_LOCK_wsrep_slave_threads, key_LOCK_wsrep_desync, key_LOCK_wsrep_config_state; -PSI_cond_key key_COND_wsrep_rollback, key_COND_wsrep_thd, +PSI_cond_key key_COND_wsrep_rollback, key_COND_wsrep_replaying, key_COND_wsrep_ready, key_COND_wsrep_sst, key_COND_wsrep_sst_init, key_COND_wsrep_sst_thread; @@ -149,7 +149,6 @@ static PSI_cond_info wsrep_conds[]= { &key_COND_wsrep_sst_init, "COND_wsrep_sst_init", PSI_FLAG_GLOBAL}, { &key_COND_wsrep_sst_thread, "wsrep_sst_thread", 0}, { &key_COND_wsrep_rollback, "COND_wsrep_rollback", PSI_FLAG_GLOBAL}, - { &key_COND_wsrep_thd, "THD::COND_wsrep_thd", 0}, { &key_COND_wsrep_replaying, "COND_wsrep_replaying", PSI_FLAG_GLOBAL} }; #else