Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
M
mariadb
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
mariadb
Commits
1e6f46d7
Commit
1e6f46d7
authored
Feb 19, 2015
by
Nirbhay Choubey
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
cleanup: remove unused THD::COND_wsrep_thd
parent
fcc6e12d
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
1 addition
and
6 deletions
+1
-6
mysql-test/suite/perfschema/r/all_instances.result
mysql-test/suite/perfschema/r/all_instances.result
+0
-1
sql/mysqld.cc
sql/mysqld.cc
+1
-2
sql/mysqld.h
sql/mysqld.h
+0
-1
sql/sql_class.cc
sql/sql_class.cc
+0
-1
sql/sql_class.h
sql/sql_class.h
+0
-1
No files found.
mysql-test/suite/perfschema/r/all_instances.result
View file @
1e6f46d7
...
...
@@ -152,7 +152,6 @@ wait/synch/cond/sql/Relay_log_info::sleep_cond
wait/synch/cond/sql/Relay_log_info::start_cond
wait/synch/cond/sql/Relay_log_info::stop_cond
wait/synch/cond/sql/THD::COND_wakeup_ready
wait/synch/cond/sql/THD::COND_wsrep_thd
select event_name from file_instances group by event_name;
event_name
wait/io/file/aria/control
...
...
sql/mysqld.cc
View file @
1e6f46d7
...
...
@@ -916,7 +916,7 @@ PSI_cond_key key_BINLOG_COND_prep_xids, 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 */
...
...
@@ -967,7 +967,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
}
...
...
sql/mysqld.h
View file @
1e6f46d7
...
...
@@ -222,7 +222,6 @@ extern PSI_mutex_key key_PAGE_lock, key_LOCK_sync, key_LOCK_active,
#endif
/* HAVE_MMAP */
#ifdef WITH_WSREP
extern
PSI_mutex_key
key_LOCK_wsrep_thd
;
extern
PSI_cond_key
key_COND_wsrep_thd
;
#endif
/* HAVE_WSREP */
#ifdef HAVE_OPENSSL
...
...
sql/sql_class.cc
View file @
1e6f46d7
...
...
@@ -1103,7 +1103,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
;
...
...
sql/sql_class.h
View file @
1e6f46d7
...
...
@@ -2366,7 +2366,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
;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment