diff options
| author | mkaruza <mario.karuza@galeracluster.com> | 2020-01-30 09:28:16 +0100 |
|---|---|---|
| committer | Jan Lindström <jan.lindstrom@mariadb.com> | 2020-01-30 14:53:42 +0200 |
| commit | 74f76206369c48cbde9c941b8bc6ed2270fc7db8 (patch) | |
| tree | 1a981160fb882da3a26f37df97833be040e98dc9 | |
| parent | 41bc736871078cf9a8f9888ed1a28249ee85549c (diff) | |
| download | mariadb-git-74f76206369c48cbde9c941b8bc6ed2270fc7db8.tar.gz | |
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.
| -rw-r--r-- | sql/mysqld.cc | 6 | ||||
| -rw-r--r-- | sql/wsrep_mysqld.cc | 1 |
2 files changed, 4 insertions, 3 deletions
diff --git a/sql/mysqld.cc b/sql/mysqld.cc index e2489f7706f..3824cbacbee 100644 --- a/sql/mysqld.cc +++ b/sql/mysqld.cc @@ -5598,6 +5598,7 @@ int mysqld_main(int argc, char **argv) if (Events::init((THD*) 0, opt_noacl || opt_bootstrap)) unireg_abort(1); +#ifdef WITH_WSREP if (WSREP_ON) { if (opt_bootstrap) @@ -5609,14 +5610,15 @@ int mysqld_main(int argc, char **argv) wsrep_init_globals(); 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_slave_threads - 1, wsrep_running_applier_threads); wsrep_create_appliers(wsrep_slave_threads - 1); } } +#endif /* WITH_WSREP */ if (opt_bootstrap) { diff --git a/sql/wsrep_mysqld.cc b/sql/wsrep_mysqld.cc index 4c1d683b03e..52ee3219ee5 100644 --- a/sql/wsrep_mysqld.cc +++ b/sql/wsrep_mysqld.cc @@ -752,7 +752,6 @@ void wsrep_init_globals() wsrep_get_binlog_gtid_seqno(gtid); wsrep_gtid_server.seqno(gtid.seqno); } - wsrep_new_cluster= 0; wsrep_init_schema(); if (WSREP_ON) { |