From a174aaed754b96cefe4a9dd2bb2865f81bad1471 Mon Sep 17 00:00:00 2001 From: Nirbhay Choubey Date: Thu, 19 Feb 2015 17:28:18 -0500 Subject: [PATCH] cleanup: remove unused THD::COND_wsrep_thd Conflicts: mysql-test/suite/perfschema/r/all_instances.result sql/mysqld.h --- sql/mysqld.cc | 3 +-- sql/mysqld.h | 1 - sql/sql_class.cc | 1 - sql/sql_class.h | 1 - 4 files changed, 1 insertion(+), 5 deletions(-) diff --git a/sql/mysqld.cc b/sql/mysqld.cc index 19f067f582f..138d542bc97 100644 --- a/sql/mysqld.cc +++ b/sql/mysqld.cc @@ -1050,7 +1050,7 @@ PSI_cond_key key_BINLOG_COND_xid_list, key_BINLOG_update_cond, key_COND_thread_count, key_COND_thread_cache, key_COND_flush_thread_cache, key_BINLOG_COND_queue_busy; #ifdef WITH_WSREP -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; #endif /* WITH_WSREP */ @@ -1109,7 +1109,6 @@ static PSI_cond_info all_server_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}, #endif { &key_COND_flush_thread_cache, "COND_flush_thread_cache", PSI_FLAG_GLOBAL}, diff --git a/sql/mysqld.h b/sql/mysqld.h index a9eb4fd1ca5..1d7649daf5d 100644 --- a/sql/mysqld.h +++ b/sql/mysqld.h @@ -247,7 +247,6 @@ extern PSI_mutex_key key_PAGE_lock, key_LOCK_sync, key_LOCK_active, #ifdef WITH_WSREP extern PSI_mutex_key key_LOCK_wsrep_thd; -extern PSI_cond_key key_COND_wsrep_thd; #endif /* WITH_WSREP */ #ifdef HAVE_OPENSSL diff --git a/sql/sql_class.cc b/sql/sql_class.cc index c10eff73962..01871494d5b 100644 --- a/sql/sql_class.cc +++ b/sql/sql_class.cc @@ -1193,7 +1193,6 @@ THD::THD() #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 9dbf85f2dca..2119312c71a 100644 --- a/sql/sql_class.h +++ b/sql/sql_class.h @@ -2773,7 +2773,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; // changed from wsrep_seqno_t to wsrep_trx_meta_t in wsrep API rev 75 // wsrep_seqno_t wsrep_trx_seqno; wsrep_trx_meta_t wsrep_trx_meta;