diff options
| author | Nirbhay Choubey <nirbhay@mariadb.com> | 2014-01-30 12:45:38 -0500 |
|---|---|---|
| committer | Nirbhay Choubey <nirbhay@mariadb.com> | 2014-01-30 12:45:38 -0500 |
| commit | 4a6be51f78e79b1ee5bc0442b7af8b3108a64512 (patch) | |
| tree | c9a15dc1470ff64aa82fe3afdb23503d044e4299 /sql/wsrep_mysqld.h | |
| parent | 5b6a4f25a566f967e8b1010998a22256bd045511 (diff) | |
| download | mariadb-git-4a6be51f78e79b1ee5bc0442b7af8b3108a64512.tar.gz | |
* Merged revisions: 3431, 3435..3457, 3459, 3460 from maria-5.5-galera.
* Fixed Debian/Ubuntu dist files.
* Fixed some compiler warnings.
Diffstat (limited to 'sql/wsrep_mysqld.h')
| -rw-r--r-- | sql/wsrep_mysqld.h | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/sql/wsrep_mysqld.h b/sql/wsrep_mysqld.h index 0704bc6503b..7cf4871d6f4 100644 --- a/sql/wsrep_mysqld.h +++ b/sql/wsrep_mysqld.h @@ -128,6 +128,8 @@ bool wsrep_before_SE(); // initialize wsrep before storage * @param before wsrep_before_SE() value */ void wsrep_init_startup(bool before); +// Other wsrep global variables +extern my_bool wsrep_inited; // whether wsrep is initialized ? extern "C" enum wsrep_exec_mode wsrep_thd_exec_mode(THD *thd); extern "C" enum wsrep_conflict_state wsrep_thd_conflict_state(THD *thd); @@ -219,10 +221,13 @@ extern wsrep_seqno_t wsrep_locked_seqno; WSREP_LOG(sql_print_information, "cluster conflict due to %s for threads:",\ (bf_abort) ? "high priority abort" : "certification failure" \ ); \ - if (bf_thd) WSREP_LOG_CONFLICT_THD(bf_thd, "Winning thread"); \ + if (bf_thd != NULL) WSREP_LOG_CONFLICT_THD(bf_thd, "Winning thread"); \ if (victim_thd) WSREP_LOG_CONFLICT_THD(victim_thd, "Victim thread"); \ } +#define WSREP_PROVIDER_EXISTS \ + (wsrep_provider && strncasecmp(wsrep_provider, WSREP_NONE, FN_REFLEN)) + extern void wsrep_ready_wait(); enum wsrep_trx_status { |