diff options
| author | Oleksandr Byelkin <sanja@mariadb.com> | 2020-01-24 14:16:20 +0100 |
|---|---|---|
| committer | Oleksandr Byelkin <sanja@mariadb.com> | 2020-01-24 14:16:20 +0100 |
| commit | ceda5f724fd1ca1bcb6fb113af55179849c057d0 (patch) | |
| tree | b6d8305dd4fbfae5d8e05b2e6c67cfd65214dd7b /sql/wsrep_mysqld.cc | |
| parent | ade89fc8980a0b2763734815df7634a129c6d5dc (diff) | |
| parent | f2ccfcaca191513d12f50672ae4545f9738670f0 (diff) | |
| download | mariadb-git-ceda5f724fd1ca1bcb6fb113af55179849c057d0.tar.gz | |
Merge branch '10.2' into 10.3
Diffstat (limited to 'sql/wsrep_mysqld.cc')
| -rw-r--r-- | sql/wsrep_mysqld.cc | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/sql/wsrep_mysqld.cc b/sql/wsrep_mysqld.cc index 5368a54bb2e..fe949298a76 100644 --- a/sql/wsrep_mysqld.cc +++ b/sql/wsrep_mysqld.cc @@ -637,7 +637,6 @@ int wsrep_init() { // enable normal operation in case no provider is specified wsrep_ready_set(TRUE); - wsrep_inited= 1; global_system_variables.wsrep_on = 0; wsrep_init_args args; args.logger_cb = wsrep_log_cb; @@ -648,10 +647,15 @@ int wsrep_init() { DBUG_PRINT("wsrep",("wsrep::init() failed: %d", rcode)); WSREP_ERROR("wsrep::init() failed: %d, must shutdown", rcode); + wsrep_ready_set(FALSE); wsrep->free(wsrep); free(wsrep); wsrep = NULL; } + else + { + wsrep_inited= 1; + } return rcode; } else |