diff options
| author | Oleksandr Byelkin <sanja@mariadb.com> | 2020-01-24 13:46:49 +0100 |
|---|---|---|
| committer | Oleksandr Byelkin <sanja@mariadb.com> | 2020-01-24 13:46:49 +0100 |
| commit | f2ccfcaca191513d12f50672ae4545f9738670f0 (patch) | |
| tree | b72f61d8ae7904020d97eb76fb7b7680883d323e /sql/wsrep_mysqld.cc | |
| parent | ac3e3e12adad505b9f09bd068ddd6819ac084a05 (diff) | |
| parent | 599a06098b967db3d636c1053bdbdd0011cba606 (diff) | |
| download | mariadb-git-f2ccfcaca191513d12f50672ae4545f9738670f0.tar.gz | |
Merge branch '10.1' into 10.2
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 cfcc04bff2c..ba6c2d24f77 100644 --- a/sql/wsrep_mysqld.cc +++ b/sql/wsrep_mysqld.cc @@ -628,7 +628,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; @@ -639,10 +638,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 |