diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2016-06-30 16:38:05 +0200 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2016-06-30 16:38:05 +0200 |
| commit | 932646b1ff6a8f5815a961340a9e1ee4702f5b44 (patch) | |
| tree | 5bc42ace8ae1f7e4d00baffd468bdb7564e851f1 /sql/wsrep_var.cc | |
| parent | 0bb30f3603b519780eaf3fe0527b1c6af285229a (diff) | |
| parent | 33492ec8d4e2077cf8e07d0628a959d8729bd1f9 (diff) | |
| download | mariadb-git-932646b1ff6a8f5815a961340a9e1ee4702f5b44.tar.gz | |
Merge branch '10.1' into 10.2
Diffstat (limited to 'sql/wsrep_var.cc')
| -rw-r--r-- | sql/wsrep_var.cc | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/sql/wsrep_var.cc b/sql/wsrep_var.cc index 1407f715fb4..8e443b573cb 100644 --- a/sql/wsrep_var.cc +++ b/sql/wsrep_var.cc @@ -384,7 +384,16 @@ bool wsrep_cluster_address_check (sys_var *self, THD* thd, set_var* var) bool wsrep_cluster_address_update (sys_var *self, THD* thd, enum_var_type type) { - bool wsrep_on_saved= thd->variables.wsrep_on; + bool wsrep_on_saved; + + /* Do not proceed if wsrep provider is not loaded. */ + if (!wsrep) + { + WSREP_INFO("wsrep provider is not loaded, can't re(start) replication."); + return false; + } + + wsrep_on_saved= thd->variables.wsrep_on; thd->variables.wsrep_on= false; /* stop replication is heavy operation, and includes closing all client |