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
3fcbd7cb
Commit
3fcbd7cb
authored
Jan 11, 2015
by
Sergei Golubchik
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
cleanup: remove unused THD::COND_wsrep_thd
parent
1182aeb0
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
1 addition
and
4 deletions
+1
-4
sql/sql_class.cc
sql/sql_class.cc
+0
-1
sql/sql_class.h
sql/sql_class.h
+0
-1
sql/wsrep_mysqld.cc
sql/wsrep_mysqld.cc
+1
-2
No files found.
sql/sql_class.cc
View file @
3fcbd7cb
...
...
@@ -1034,7 +1034,6 @@ THD::THD(bool is_wsrep_applier)
#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 @
3fcbd7cb
...
...
@@ -3788,7 +3788,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
;
wsrep_trx_meta_t
wsrep_trx_meta
;
uint32
wsrep_rand
;
Relay_log_info
*
wsrep_rli
;
...
...
sql/wsrep_mysqld.cc
View file @
3fcbd7cb
...
...
@@ -123,7 +123,7 @@ PSI_mutex_key key_LOCK_wsrep_rollback, key_LOCK_wsrep_thd,
key_LOCK_wsrep_slave_threads
,
key_LOCK_wsrep_desync
,
key_LOCK_wsrep_config_state
;
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
;
...
...
@@ -149,7 +149,6 @@ static PSI_cond_info wsrep_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
}
};
#else
...
...
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