database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-09 22:24:09 +03:00
Code Activity

MDEV-8492: Windows builds fail on current 10.1

Browse Source 
In non-wsrep builds, wsrep_running_threads should be defined to (0).
This commit is contained in:
Nirbhay Choubey
2015-07-19 21:33:12 -04:00
parent c57edf3b9a
commit 6d3bd6588e
2 changed files with 1 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
sql/mysqld.cc
View File

@@ -1901,13 +1901,11 @@ static void __cdecl kill_server(int sig_ptr)
} }
#endif #endif
#ifdef WITH_WSREP
/* Stop wsrep threads in case they are running. */ /* Stop wsrep threads in case they are running. */
if (wsrep_running_threads > 0) if (wsrep_running_threads > 0)
{ {
wsrep_stop_replication(NULL); wsrep_stop_replication(NULL);
} }
#endif
close_connections(); close_connections();

1
sql/wsrep_mysqld.h
View File

@@ -340,6 +340,7 @@ int wsrep_create_trigger_query(THD *thd, uchar** buf, size_t* buf_len);
#define wsrep_replicate_myisam (0) #define wsrep_replicate_myisam (0)
#define wsrep_thr_init() do {} while(0) #define wsrep_thr_init() do {} while(0)
#define wsrep_thr_deinit() do {} while(0) #define wsrep_thr_deinit() do {} while(0)
#define wsrep_running_threads (0)
#endif /* WITH_WSREP */ #endif /* WITH_WSREP */
#endif /* WSREP_MYSQLD_H */ #endif /* WSREP_MYSQLD_H */