From 6aa78acab5bc225a0bbc21e9b91dbd0cd9dc4ce5 Mon Sep 17 00:00:00 2001 From: mkaruza Date: Thu, 30 Jan 2020 09:28:16 +0100 Subject: 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. --- sql/mysqld.cc | 4 ++-- sql/wsrep_mysqld.cc | 1 - 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/sql/mysqld.cc b/sql/mysqld.cc index e2489f7706f..fa0520fc95f 100644 --- a/sql/mysqld.cc +++ b/sql/mysqld.cc @@ -5609,9 +5609,9 @@ 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); 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) { -- cgit v1.2.1