Skip to content

Commit 3fcbd7c

Browse files
committed
cleanup: remove unused THD::COND_wsrep_thd
1 parent 1182aeb commit 3fcbd7c

File tree

3 files changed

+1
-4
lines changed

3 files changed

+1
-4
lines changed

sql/sql_class.cc

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1034,7 +1034,6 @@ THD::THD(bool is_wsrep_applier)
10341034

10351035
#ifdef WITH_WSREP
10361036
mysql_mutex_init(key_LOCK_wsrep_thd, &LOCK_wsrep_thd, MY_MUTEX_INIT_FAST);
1037-
mysql_cond_init(key_COND_wsrep_thd, &COND_wsrep_thd, NULL);
10381037
wsrep_ws_handle.trx_id = WSREP_UNDEFINED_TRX_ID;
10391038
wsrep_ws_handle.opaque = NULL;
10401039
wsrep_retry_counter = 0;

sql/sql_class.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3788,7 +3788,6 @@ class THD :public Statement,
37883788
enum wsrep_query_state wsrep_query_state;
37893789
enum wsrep_conflict_state wsrep_conflict_state;
37903790
mysql_mutex_t LOCK_wsrep_thd;
3791-
mysql_cond_t COND_wsrep_thd;
37923791
wsrep_trx_meta_t wsrep_trx_meta;
37933792
uint32 wsrep_rand;
37943793
Relay_log_info *wsrep_rli;

sql/wsrep_mysqld.cc

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,7 @@ PSI_mutex_key key_LOCK_wsrep_rollback, key_LOCK_wsrep_thd,
123123
key_LOCK_wsrep_slave_threads, key_LOCK_wsrep_desync,
124124
key_LOCK_wsrep_config_state;
125125

126-
PSI_cond_key key_COND_wsrep_rollback, key_COND_wsrep_thd,
126+
PSI_cond_key key_COND_wsrep_rollback,
127127
key_COND_wsrep_replaying, key_COND_wsrep_ready, key_COND_wsrep_sst,
128128
key_COND_wsrep_sst_init, key_COND_wsrep_sst_thread;
129129

@@ -149,7 +149,6 @@ static PSI_cond_info wsrep_conds[]=
149149
{ &key_COND_wsrep_sst_init, "COND_wsrep_sst_init", PSI_FLAG_GLOBAL},
150150
{ &key_COND_wsrep_sst_thread, "wsrep_sst_thread", 0},
151151
{ &key_COND_wsrep_rollback, "COND_wsrep_rollback", PSI_FLAG_GLOBAL},
152-
{ &key_COND_wsrep_thd, "THD::COND_wsrep_thd", 0},
153152
{ &key_COND_wsrep_replaying, "COND_wsrep_replaying", PSI_FLAG_GLOBAL}
154153
};
155154
#else

0 commit comments

Comments
 (0)