mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-16 20:12:31 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix build failures.

Browse source
This commit is contained in:
Kristian Nielsen 2015-07-19 10:31:24 +02:00
parent 13dbb6fa9e
commit 7046788448
1 changed files with 4 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
sql/mysqld.cc
View file

@ -1901,11 +1901,13 @@ 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();
@ -5730,6 +5732,7 @@ int mysqld_main(int argc, char **argv)
}
#endif
#ifdef WITH_WSREP
// Recover and exit.
if (wsrep_recovery)
{
@ -5740,6 +5743,7 @@ int mysqld_main(int argc, char **argv)
sql_print_information("WSREP: disabled, skipping position recovery");
unireg_abort(0);
}
#endif
/*
init signals & alarm