database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-01 03:47:19 +03:00
Code Activity

cleanup: remove unused THD::COND_wsrep_thd

Browse Source 
Conflicts:
	mysql-test/suite/perfschema/r/all_instances.result
	sql/mysqld.h
This commit is contained in:
Nirbhay Choubey
2015-02-19 17:28:18 -05:00
parent a518cc4470
commit a174aaed75
4 changed files with 1 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
sql/mysqld.cc
View File

@ -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_COND_thread_count, key_COND_thread_cache, key_COND_flush_thread_cache,
key_BINLOG_COND_queue_busy; key_BINLOG_COND_queue_busy;
#ifdef WITH_WSREP #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_replaying, key_COND_wsrep_ready, key_COND_wsrep_sst,
key_COND_wsrep_sst_init, key_COND_wsrep_sst_thread; key_COND_wsrep_sst_init, key_COND_wsrep_sst_thread;
#endif /* WITH_WSREP */ #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_init, "COND_wsrep_sst_init", PSI_FLAG_GLOBAL},
{ &key_COND_wsrep_sst_thread, "wsrep_sst_thread", 0}, { &key_COND_wsrep_sst_thread, "wsrep_sst_thread", 0},
{ &key_COND_wsrep_rollback, "COND_wsrep_rollback", PSI_FLAG_GLOBAL}, { &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}, { &key_COND_wsrep_replaying, "COND_wsrep_replaying", PSI_FLAG_GLOBAL},
#endif #endif
{ &key_COND_flush_thread_cache, "COND_flush_thread_cache", PSI_FLAG_GLOBAL}, { &key_COND_flush_thread_cache, "COND_flush_thread_cache", PSI_FLAG_GLOBAL},

1
sql/mysqld.h
View File

@ -247,7 +247,6 @@ extern PSI_mutex_key key_PAGE_lock, key_LOCK_sync, key_LOCK_active,
#ifdef WITH_WSREP #ifdef WITH_WSREP
extern PSI_mutex_key key_LOCK_wsrep_thd; extern PSI_mutex_key key_LOCK_wsrep_thd;
extern PSI_cond_key key_COND_wsrep_thd;
#endif /* WITH_WSREP */ #endif /* WITH_WSREP */
#ifdef HAVE_OPENSSL #ifdef HAVE_OPENSSL

1
sql/sql_class.cc
View File

@ -1193,7 +1193,6 @@ THD::THD()
#ifdef WITH_WSREP #ifdef WITH_WSREP
mysql_mutex_init(key_LOCK_wsrep_thd, &LOCK_wsrep_thd, MY_MUTEX_INIT_FAST); 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.trx_id = WSREP_UNDEFINED_TRX_ID;
wsrep_ws_handle.opaque = NULL; wsrep_ws_handle.opaque = NULL;
wsrep_retry_counter = 0; wsrep_retry_counter = 0;

1
sql/sql_class.h
View File

@ -2773,7 +2773,6 @@ public:
enum wsrep_query_state wsrep_query_state; enum wsrep_query_state wsrep_query_state;
enum wsrep_conflict_state wsrep_conflict_state; enum wsrep_conflict_state wsrep_conflict_state;
mysql_mutex_t LOCK_wsrep_thd; 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 // changed from wsrep_seqno_t to wsrep_trx_meta_t in wsrep API rev 75
// wsrep_seqno_t wsrep_trx_seqno; // wsrep_seqno_t wsrep_trx_seqno;
wsrep_trx_meta_t wsrep_trx_meta; wsrep_trx_meta_t wsrep_trx_meta;