diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2014-09-25 23:00:45 +0200 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2014-10-01 23:38:27 +0200 |
| commit | 3620910eeac8f118c9a6cb8a1c0ec23e56fb5d98 (patch) | |
| tree | d08462d84d10324bd05836c968288d8ab1739e11 /sql/mysqld.h | |
| parent | b04f848176b0d8af41eb3627ba1b6ed4dd3327e3 (diff) | |
| download | mariadb-git-3620910eeac8f118c9a6cb8a1c0ec23e56fb5d98.tar.gz | |
cleanup: galera merge, simple changes
Diffstat (limited to 'sql/mysqld.h')
| -rw-r--r-- | sql/mysqld.h | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/sql/mysqld.h b/sql/mysqld.h index 39b77b441bb..1f7a48050f4 100644 --- a/sql/mysqld.h +++ b/sql/mysqld.h @@ -242,11 +242,6 @@ extern PSI_mutex_key key_PAGE_lock, key_LOCK_sync, key_LOCK_active, key_LOCK_pool, key_LOCK_pending_checkpoint; #endif /* HAVE_MMAP */ -#ifdef WITH_WSREP -extern PSI_mutex_key key_LOCK_wsrep_thd; -extern PSI_cond_key key_COND_wsrep_thd; -#endif /* WITH_WSREP */ - #ifdef HAVE_OPENSSL extern PSI_mutex_key key_LOCK_des_key_file; #endif @@ -604,15 +599,8 @@ enum options_mysqld OPT_WANT_CORE, OPT_MYSQL_COMPATIBILITY, OPT_MYSQL_TO_BE_IMPLEMENTED, -#ifdef WITH_WSREP - OPT_WSREP_PROVIDER, - OPT_WSREP_PROVIDER_OPTIONS, - OPT_WSREP_CLUSTER_ADDRESS, OPT_WSREP_START_POSITION, OPT_WSREP_SST_AUTH, - OPT_WSREP_RECOVER, -#endif /* WITH_WSREP */ - OPT_which_is_always_the_last }; #endif |