diff options
Diffstat (limited to 'sql/mysqld.cc')
| -rw-r--r-- | sql/mysqld.cc | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/sql/mysqld.cc b/sql/mysqld.cc index 7b36bcf861a..9988cdeab74 100644 --- a/sql/mysqld.cc +++ b/sql/mysqld.cc @@ -1878,6 +1878,7 @@ extern "C" void unireg_abort(int exit_code) #ifdef WITH_WSREP if (WSREP_ON && + Wsrep_server_state::is_inited() && Wsrep_server_state::instance().state() != wsrep::server_state::s_disconnected) { /* @@ -4944,6 +4945,7 @@ static int init_server_components() #ifdef WITH_WSREP if (wsrep_init_server()) unireg_abort(1); + if (WSREP_ON && !wsrep_recovery && !opt_abort) { if (opt_bootstrap) // bootsrap option given - disable wsrep functionality |