Skip to content

Commit 1e6f46d

Browse files
author
Nirbhay Choubey
committed
cleanup: remove unused THD::COND_wsrep_thd
1 parent fcc6e12 commit 1e6f46d

File tree

5 files changed

+1
-6
lines changed

5 files changed

+1
-6
lines changed

mysql-test/suite/perfschema/r/all_instances.result

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -152,7 +152,6 @@ wait/synch/cond/sql/Relay_log_info::sleep_cond
152152
wait/synch/cond/sql/Relay_log_info::start_cond
153153
wait/synch/cond/sql/Relay_log_info::stop_cond
154154
wait/synch/cond/sql/THD::COND_wakeup_ready
155-
wait/synch/cond/sql/THD::COND_wsrep_thd
156155
select event_name from file_instances group by event_name;
157156
event_name
158157
wait/io/file/aria/control

sql/mysqld.cc

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -916,7 +916,7 @@ PSI_cond_key key_BINLOG_COND_prep_xids, key_BINLOG_update_cond,
916916
key_COND_thread_count, key_COND_thread_cache, key_COND_flush_thread_cache,
917917
key_BINLOG_COND_queue_busy;
918918
#ifdef WITH_WSREP
919-
PSI_cond_key key_COND_wsrep_rollback, key_COND_wsrep_thd,
919+
PSI_cond_key key_COND_wsrep_rollback,
920920
key_COND_wsrep_replaying, key_COND_wsrep_ready, key_COND_wsrep_sst,
921921
key_COND_wsrep_sst_init, key_COND_wsrep_sst_thread;
922922
#endif /* WITH_WSREP */
@@ -967,7 +967,6 @@ static PSI_cond_info all_server_conds[]=
967967
{ &key_COND_wsrep_sst_init, "COND_wsrep_sst_init", PSI_FLAG_GLOBAL},
968968
{ &key_COND_wsrep_sst_thread, "wsrep_sst_thread", 0},
969969
{ &key_COND_wsrep_rollback, "COND_wsrep_rollback", PSI_FLAG_GLOBAL},
970-
{ &key_COND_wsrep_thd, "THD::COND_wsrep_thd", 0},
971970
{ &key_COND_wsrep_replaying, "COND_wsrep_replaying", PSI_FLAG_GLOBAL},
972971
#endif
973972
{ &key_COND_flush_thread_cache, "COND_flush_thread_cache", PSI_FLAG_GLOBAL}

sql/mysqld.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -222,7 +222,6 @@ extern PSI_mutex_key key_PAGE_lock, key_LOCK_sync, key_LOCK_active,
222222
#endif /* HAVE_MMAP */
223223
#ifdef WITH_WSREP
224224
extern PSI_mutex_key key_LOCK_wsrep_thd;
225-
extern PSI_cond_key key_COND_wsrep_thd;
226225
#endif /* HAVE_WSREP */
227226

228227
#ifdef HAVE_OPENSSL

sql/sql_class.cc

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1103,7 +1103,6 @@ THD::THD()
11031103

11041104
#ifdef WITH_WSREP
11051105
mysql_mutex_init(key_LOCK_wsrep_thd, &LOCK_wsrep_thd, MY_MUTEX_INIT_FAST);
1106-
mysql_cond_init(key_COND_wsrep_thd, &COND_wsrep_thd, NULL);
11071106
wsrep_ws_handle.trx_id = WSREP_UNDEFINED_TRX_ID;
11081107
wsrep_ws_handle.opaque = NULL;
11091108
wsrep_retry_counter = 0;

sql/sql_class.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2366,7 +2366,6 @@ class THD :public Statement,
23662366
enum wsrep_query_state wsrep_query_state;
23672367
enum wsrep_conflict_state wsrep_conflict_state;
23682368
mysql_mutex_t LOCK_wsrep_thd;
2369-
mysql_cond_t COND_wsrep_thd;
23702369
// changed from wsrep_seqno_t to wsrep_trx_meta_t in wsrep API rev 75
23712370
// wsrep_seqno_t wsrep_trx_seqno;
23722371
wsrep_trx_meta_t wsrep_trx_meta;

0 commit comments

Comments
 (0)