Merge branch 'codership-10.5-MDEV-21598' into 10.5

1ad3db8a · Jan Lindström · 41bc7368 · 6aa78aca · 1ad3db8a · 1ad3db8a
Commit 1ad3db8a authored Jan 30, 2020 by Jan Lindström
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 3 deletions

sql/mysqld.cc sql/mysqld.cc +2 -2

sql/wsrep_mysqld.cc sql/wsrep_mysqld.cc +0 -1

No files found.
--- 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);

--- 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)
  {