diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2018-05-10 13:01:42 +0200 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2018-05-10 13:01:42 +0200 |
| commit | 9b1824dcd2564c803e58d02ac63b49ec68bd60d2 (patch) | |
| tree | beef3faf3e0e6b8264014a0cfb735d4a32be6cbc /sql/wsrep_mysqld.h | |
| parent | 92a13148e80c30422ae5460032169cbe1946fa6d (diff) | |
| parent | ff579bc814551026a3271fac274f560cef3f523f (diff) | |
| download | mariadb-git-9b1824dcd2564c803e58d02ac63b49ec68bd60d2.tar.gz | |
Merge branch '10.1' into 10.2
Diffstat (limited to 'sql/wsrep_mysqld.h')
| -rw-r--r-- | sql/wsrep_mysqld.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/sql/wsrep_mysqld.h b/sql/wsrep_mysqld.h index eb37b63eff6..130c7e5ad39 100644 --- a/sql/wsrep_mysqld.h +++ b/sql/wsrep_mysqld.h @@ -271,8 +271,6 @@ extern my_bool wsrep_preordered_opt; extern handlerton *wsrep_hton; #ifdef HAVE_PSI_INTERFACE -extern PSI_mutex_key key_LOCK_wsrep_thd; -extern PSI_cond_key key_COND_wsrep_thd; extern PSI_mutex_key key_LOCK_wsrep_ready; extern PSI_mutex_key key_COND_wsrep_ready; extern PSI_mutex_key key_LOCK_wsrep_sst; |