From 6d3bd6588e725362098054e07f8f5994d5ab4bfa Mon Sep 17 00:00:00 2001 From: Nirbhay Choubey Date: Sun, 19 Jul 2015 21:33:12 -0400 Subject: [PATCH] MDEV-8492: Windows builds fail on current 10.1 In non-wsrep builds, wsrep_running_threads should be defined to (0). --- sql/mysqld.cc | 2 -- sql/wsrep_mysqld.h | 1 + 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/sql/mysqld.cc b/sql/mysqld.cc index 471960608d0..9a71407730c 100644 --- a/sql/mysqld.cc +++ b/sql/mysqld.cc @@ -1901,13 +1901,11 @@ static void __cdecl kill_server(int sig_ptr) } #endif -#ifdef WITH_WSREP /* Stop wsrep threads in case they are running. */ if (wsrep_running_threads > 0) { wsrep_stop_replication(NULL); } -#endif close_connections(); diff --git a/sql/wsrep_mysqld.h b/sql/wsrep_mysqld.h index 6d0fcd6e058..d02d59e767e 100644 --- a/sql/wsrep_mysqld.h +++ b/sql/wsrep_mysqld.h @@ -340,6 +340,7 @@ int wsrep_create_trigger_query(THD *thd, uchar** buf, size_t* buf_len); #define wsrep_replicate_myisam (0) #define wsrep_thr_init() do {} while(0) #define wsrep_thr_deinit() do {} while(0) +#define wsrep_running_threads (0) #endif /* WITH_WSREP */ #endif /* WSREP_MYSQLD_H */