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_var.cc | |
| 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_var.cc')
| -rw-r--r-- | sql/wsrep_var.cc | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/sql/wsrep_var.cc b/sql/wsrep_var.cc index ca921b7ef18..a6c2bafef13 100644 --- a/sql/wsrep_var.cc +++ b/sql/wsrep_var.cc @@ -295,6 +295,8 @@ bool wsrep_provider_options_check(sys_var *self, THD* thd, set_var* var) bool wsrep_provider_options_update(sys_var *self, THD* thd, enum_var_type type) { + DBUG_ASSERT(wsrep != NULL); + wsrep_status_t ret= wsrep->options_set(wsrep, wsrep_provider_options); if (ret != WSREP_OK) { @@ -495,6 +497,8 @@ bool wsrep_desync_check (sys_var *self, THD* thd, set_var* var) bool wsrep_desync_update (sys_var *self, THD* thd, enum_var_type type) { + DBUG_ASSERT(wsrep != NULL); + wsrep_status_t ret(WSREP_WARNING); if (wsrep_desync) { ret = wsrep->desync (wsrep); @@ -548,6 +552,7 @@ int wsrep_show_status (THD *thd, SHOW_VAR *var, char *buff, *v++= wsrep_status_vars[i]; DBUG_ASSERT(i < maxi); + DBUG_ASSERT(wsrep != NULL); wsrep_stats_var* stats= wsrep->stats_get(wsrep); for (wsrep_stats_var *sv= stats; i < maxi && sv && sv->name; i++, sv++, v++) |