Commit 70467884 authored by Kristian Nielsen's avatar Kristian Nielsen

Fix build failures.

parent 13dbb6fa
...@@ -1901,11 +1901,13 @@ static void __cdecl kill_server(int sig_ptr) ...@@ -1901,11 +1901,13 @@ 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();
...@@ -5730,6 +5732,7 @@ int mysqld_main(int argc, char **argv) ...@@ -5730,6 +5732,7 @@ int mysqld_main(int argc, char **argv)
} }
#endif #endif
#ifdef WITH_WSREP
// Recover and exit. // Recover and exit.
if (wsrep_recovery) if (wsrep_recovery)
{ {
...@@ -5740,6 +5743,7 @@ int mysqld_main(int argc, char **argv) ...@@ -5740,6 +5743,7 @@ int mysqld_main(int argc, char **argv)
sql_print_information("WSREP: disabled, skipping position recovery"); sql_print_information("WSREP: disabled, skipping position recovery");
unireg_abort(0); unireg_abort(0);
} }
#endif
/* /*
init signals & alarm init signals & alarm
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment