diff options
| author | Seppo Jaakola <seppo.jaakola@codership.com> | 2012-08-09 01:47:21 +0300 |
|---|---|---|
| committer | Seppo Jaakola <seppo.jaakola@codership.com> | 2012-08-09 01:47:21 +0300 |
| commit | ebfa24b1d24377a241b79883da96969a9150f22c (patch) | |
| tree | ef1198f9dfb1838cbdbc5056f2b84e399b446bfd /sql/wsrep_mysqld.h | |
| parent | 1fd2e10736d6fd198e62054cb9006a3dc13fd55e (diff) | |
| parent | a7123f507598690ef0fce68b5d8dc58e63635024 (diff) | |
| download | mariadb-git-ebfa24b1d24377a241b79883da96969a9150f22c.tar.gz | |
References lp:1034621 - Merge up to mysql-5.5.25 level
merged codership-mysql/5.5 revisions: bzr diff -r3759..3767
merged codership-mysql/5.5 revisions: bzr diff -r3768..3771
Diffstat (limited to 'sql/wsrep_mysqld.h')
| -rw-r--r-- | sql/wsrep_mysqld.h | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/sql/wsrep_mysqld.h b/sql/wsrep_mysqld.h index ebea44c9151..968281a2c98 100644 --- a/sql/wsrep_mysqld.h +++ b/sql/wsrep_mysqld.h @@ -50,6 +50,7 @@ extern const char* wsrep_sst_method; extern const char* wsrep_sst_receive_address; extern char* wsrep_sst_auth; extern const char* wsrep_sst_donor; +extern my_bool wsrep_sst_donor_rejects_queries; extern const char* wsrep_start_position; extern long long wsrep_max_ws_size; extern long wsrep_max_ws_rows; @@ -129,6 +130,8 @@ extern void wsrep_sst_auth_init INIT_ARGS; extern bool wsrep_sst_donor_check CHECK_ARGS; extern bool wsrep_sst_donor_update UPDATE_ARGS; +extern bool wsrep_slave_threads_check CHECK_ARGS; +extern bool wsrep_slave_threads_update UPDATE_ARGS; extern bool wsrep_init_first(); // initialize wsrep before storage // engines (true) or after (false) @@ -142,7 +145,8 @@ extern void wsrep_init_startup(bool first); extern void wsrep_close_client_connections(my_bool wait_to_end); extern void wsrep_close_applier(THD *thd); -extern void wsrep_wait_appliers_close(THD *thd); +extern void wsrep_wait_appliers_close(THD *thd); +extern void wsrep_close_applier_threads(int count); extern void wsrep_create_appliers(long threads = wsrep_slave_threads); extern void wsrep_create_rollbacker(); extern void wsrep_kill_mysql(THD *thd); @@ -250,6 +254,7 @@ extern long long wsrep_max_ws_size; extern long wsrep_max_ws_rows; extern int wsrep_to_isolation; extern my_bool wsrep_certify_nonPK; +extern mysql_mutex_t LOCK_wsrep_slave_threads; extern PSI_mutex_key key_LOCK_wsrep_ready; extern PSI_mutex_key key_COND_wsrep_ready; @@ -263,6 +268,7 @@ extern PSI_mutex_key key_LOCK_wsrep_rollback; extern PSI_cond_key key_COND_wsrep_rollback; extern PSI_mutex_key key_LOCK_wsrep_replaying; extern PSI_cond_key key_COND_wsrep_replaying; +extern PSI_mutex_key key_LOCK_wsrep_slave_threads; struct TABLE_LIST; int wsrep_to_isolation_begin(THD *thd, char *db_, char *table_, |