Commit 74f76206 authored by mkaruza's avatar mkaruza Committed by Jan Lindström

MDEV-21598 Galera test galera.galera_sst_mysqldump does not take wsrep-new-cluster into account

Variable `wsrep_new_cluster` should be set to false after `wsrep_init_startup`.
Problem was that this was done before when mysqldump is used as SST method so option
wsrep-new-cluster didn't have any effect.
parent 41bc7368
...@@ -5598,6 +5598,7 @@ int mysqld_main(int argc, char **argv) ...@@ -5598,6 +5598,7 @@ int mysqld_main(int argc, char **argv)
if (Events::init((THD*) 0, opt_noacl || opt_bootstrap)) if (Events::init((THD*) 0, opt_noacl || opt_bootstrap))
unireg_abort(1); unireg_abort(1);
#ifdef WITH_WSREP
if (WSREP_ON) if (WSREP_ON)
{ {
if (opt_bootstrap) if (opt_bootstrap)
...@@ -5609,14 +5610,15 @@ int mysqld_main(int argc, char **argv) ...@@ -5609,14 +5610,15 @@ int mysqld_main(int argc, char **argv)
wsrep_init_globals(); wsrep_init_globals();
if (!wsrep_before_SE()) if (!wsrep_before_SE())
{ {
wsrep_init_startup (false); wsrep_init_startup(false);
} }
wsrep_new_cluster= false;
WSREP_DEBUG("Startup creating %ld applier threads running %lu", WSREP_DEBUG("Startup creating %ld applier threads running %lu",
wsrep_slave_threads - 1, wsrep_running_applier_threads); wsrep_slave_threads - 1, wsrep_running_applier_threads);
wsrep_create_appliers(wsrep_slave_threads - 1); wsrep_create_appliers(wsrep_slave_threads - 1);
} }
} }
#endif /* WITH_WSREP */
if (opt_bootstrap) if (opt_bootstrap)
{ {
......
...@@ -752,7 +752,6 @@ void wsrep_init_globals() ...@@ -752,7 +752,6 @@ void wsrep_init_globals()
wsrep_get_binlog_gtid_seqno(gtid); wsrep_get_binlog_gtid_seqno(gtid);
wsrep_gtid_server.seqno(gtid.seqno); wsrep_gtid_server.seqno(gtid.seqno);
} }
wsrep_new_cluster= 0;
wsrep_init_schema(); wsrep_init_schema();
if (WSREP_ON) if (WSREP_ON)
{ {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment