diff options
| author | Seppo Jaakola <seppo.jaakola@codership.com> | 2013-10-07 08:57:23 +0300 |
|---|---|---|
| committer | Seppo Jaakola <seppo.jaakola@codership.com> | 2013-10-07 08:57:23 +0300 |
| commit | 255e20a17534cf3b56201562990d5e5e01bccd33 (patch) | |
| tree | 549ea21aabae5b114bc24707ec37873334203a6f /sql/wsrep_mysqld.h | |
| parent | 06a7eeb992fe881f056fe83a8b716b3a81f224ff (diff) | |
| download | mariadb-git-255e20a17534cf3b56201562990d5e5e01bccd33.tar.gz | |
Merged revisions 3418..3424 from mariadb-galera-5.5
Diffstat (limited to 'sql/wsrep_mysqld.h')
| -rw-r--r-- | sql/wsrep_mysqld.h | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/sql/wsrep_mysqld.h b/sql/wsrep_mysqld.h index 33fbf2f3bff..607014e3fa9 100644 --- a/sql/wsrep_mysqld.h +++ b/sql/wsrep_mysqld.h @@ -93,6 +93,7 @@ extern long wsrep_max_protocol_version; extern long wsrep_protocol_version; extern ulong wsrep_forced_binlog_format; extern ulong wsrep_OSU_method_options; +extern my_bool wsrep_desync; extern my_bool wsrep_recovery; extern my_bool wsrep_replicate_myisam; extern my_bool wsrep_log_conflicts; @@ -173,6 +174,9 @@ 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_desync_check CHECK_ARGS; +extern bool wsrep_desync_update UPDATE_ARGS; + extern bool wsrep_before_SE(); // initialize wsrep before storage // engines (true) or after (false) extern int wsrep_init(); @@ -349,6 +353,7 @@ 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 mysql_mutex_t LOCK_wsrep_desync; extern PSI_mutex_key key_LOCK_wsrep_ready; extern PSI_mutex_key key_COND_wsrep_ready; @@ -363,6 +368,7 @@ 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; +extern PSI_mutex_key key_LOCK_wsrep_desync; struct TABLE_LIST; int wsrep_to_isolation_begin(THD *thd, char *db_, char *table_, |