diff options
| author | Nirbhay Choubey <nirbhay@mariadb.com> | 2015-05-29 11:26:46 -0400 |
|---|---|---|
| committer | Nirbhay Choubey <nirbhay@mariadb.com> | 2015-05-29 11:26:46 -0400 |
| commit | 903cfde149778daf67d21144a1172e1ef998599e (patch) | |
| tree | 9c9e1e5d60a8b8b4b8a69ba89d364a471f3e692e /sql/wsrep_mysqld.h | |
| parent | 1b00edc49a2f1e0a1995fc0562639d90d4c19ca2 (diff) | |
| download | mariadb-git-903cfde149778daf67d21144a1172e1ef998599e.tar.gz | |
MDEV-7067: Server outputs Galera (WSREP) information, even if Galera is disabled
* mysqld_safe: Since wsrep_on variable is mandatory in 10.1, skip wsrep
position recovery if its OFF.
* mysqld: Remove "-wsrep" from server version
* mysqld: Remove wsrep patch version from @@version_comment
* mysqld: Introduce @@wsrep_patch_version
Diffstat (limited to 'sql/wsrep_mysqld.h')
| -rw-r--r-- | sql/wsrep_mysqld.h | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/sql/wsrep_mysqld.h b/sql/wsrep_mysqld.h index b704295171e..f68b89e7994 100644 --- a/sql/wsrep_mysqld.h +++ b/sql/wsrep_mysqld.h @@ -118,6 +118,12 @@ int wsrep_show_status(THD *thd, SHOW_VAR *var, char *buff, enum enum_var_type scope); int wsrep_init(); void wsrep_deinit(bool free_options); + +/* Initialize wsrep thread LOCKs and CONDs */ +void wsrep_thr_init(); +/* Destroy wsrep thread LOCKs and CONDs */ +void wsrep_thr_deinit(); + void wsrep_recover(); bool wsrep_before_SE(); // initialize wsrep before storage // engines (true) or after (false) @@ -338,6 +344,8 @@ int wsrep_create_trigger_query(THD *thd, uchar** buf, size_t* buf_len); #define wsrep_recover() do { } while(0) #define wsrep_slave_threads (1) #define wsrep_replicate_myisam (0) +#define wsrep_thr_init() do {} while(0) +#define wsrep_thr_deinit() do {} while(0) #endif /* WITH_WSREP */ #endif /* WSREP_MYSQLD_H */ |