mirror of
https://github.com/MariaDB/server.git
synced 2025-01-19 05:22:25 +01:00
Merge neptunus.(none):/home/msvensson/mysql/my41-bug13711
into neptunus.(none):/home/msvensson/mysql/mysql-5.0 sql/mysqld.cc: Auto merged
This commit is contained in:
commit
e6e74dc411
1 changed files with 14 additions and 1 deletions
|
@ -934,7 +934,20 @@ void kill_mysql(void)
|
||||||
DBUG_VOID_RETURN;
|
DBUG_VOID_RETURN;
|
||||||
}
|
}
|
||||||
|
|
||||||
/* Force server down. kill all connections and threads and exit */
|
/*
|
||||||
|
Force server down. Kill all connections and threads and exit
|
||||||
|
|
||||||
|
SYNOPSIS
|
||||||
|
kill_server
|
||||||
|
|
||||||
|
sig_ptr Signal number that caused kill_server to be called.
|
||||||
|
|
||||||
|
NOTE!
|
||||||
|
A signal number of 0 mean that the function was not called
|
||||||
|
from a signal handler and there is thus no signal to block
|
||||||
|
or stop, we just want to kill the server.
|
||||||
|
|
||||||
|
*/
|
||||||
|
|
||||||
#if defined(OS2) || defined(__NETWARE__)
|
#if defined(OS2) || defined(__NETWARE__)
|
||||||
extern "C" void kill_server(int sig_ptr)
|
extern "C" void kill_server(int sig_ptr)
|
||||||
|
|
Loading…
Reference in a new issue