diff options
| author | Jan Lindström <jan.lindstrom@mariadb.com> | 2020-01-30 10:39:42 +0200 |
|---|---|---|
| committer | Jan Lindström <jan.lindstrom@mariadb.com> | 2020-01-30 10:39:42 +0200 |
| commit | 1ad3db8a6808d12b3db92412e189d44e92e43572 (patch) | |
| tree | e3d4d0c2b9b79cf1b56b8a904b7143be699dfe8d | |
| parent | 41bc736871078cf9a8f9888ed1a28249ee85549c (diff) | |
| parent | 6aa78acab5bc225a0bbc21e9b91dbd0cd9dc4ce5 (diff) | |
| download | mariadb-git-1ad3db8a6808d12b3db92412e189d44e92e43572.tar.gz | |
Merge branch 'codership-10.5-MDEV-21598' into 10.5
| -rw-r--r-- | sql/mysqld.cc | 4 | ||||
| -rw-r--r-- | 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) { |