diff options
| author | jani@hynda.mysql.fi <> | 2007-08-21 19:03:28 +0300 |
|---|---|---|
| committer | jani@hynda.mysql.fi <> | 2007-08-21 19:03:28 +0300 |
| commit | 2fd7a743e42336c5158fc664f3a36ad1ed03ab1d (patch) | |
| tree | b11162ac1a6ea4a0f6b04559f50d2c6e44e51b38 /server-tools | |
| parent | 76d173fa9df9384c40f4ef368977aeac6381c7b7 (diff) | |
| parent | 9b6b53f0d0d747e47a707d7c579b9e2b66020ed3 (diff) | |
| download | mariadb-git-2fd7a743e42336c5158fc664f3a36ad1ed03ab1d.tar.gz | |
Merge hynda.mysql.fi:/home/my/mysql-5.1-main
into hynda.mysql.fi:/home/my/mysql-5.1-marvel
Diffstat (limited to 'server-tools')
| -rw-r--r-- | server-tools/instance-manager/angel.cc | 3 | ||||
| -rw-r--r-- | server-tools/instance-manager/thread_registry.cc | 4 |
2 files changed, 6 insertions, 1 deletions
diff --git a/server-tools/instance-manager/angel.cc b/server-tools/instance-manager/angel.cc index a1892112dc8..64515c8498c 100644 --- a/server-tools/instance-manager/angel.cc +++ b/server-tools/instance-manager/angel.cc @@ -176,6 +176,8 @@ static bool create_pid_file() appropriately. *************************************************************************/ +extern "C" void reap_child(int); + void reap_child(int __attribute__((unused)) signo) { /* NOTE: As we have only one child, no need to cycle waitpid(). */ @@ -197,6 +199,7 @@ void reap_child(int __attribute__((unused)) signo) Set termination status and return. *************************************************************************/ +extern "C" void terminate(int signo); void terminate(int signo) { shutdown_request_signo= signo; diff --git a/server-tools/instance-manager/thread_registry.cc b/server-tools/instance-manager/thread_registry.cc index 72d81523022..489caa0aaa8 100644 --- a/server-tools/instance-manager/thread_registry.cc +++ b/server-tools/instance-manager/thread_registry.cc @@ -27,7 +27,9 @@ enum { THREAD_KICK_OFF_SIGNAL= SIGUSR2 }; -static void handle_signal(int __attribute__((unused)) sig_no) +extern "C" void handle_signal(int); + +void handle_signal(int __attribute__((unused)) sig_no) { } #endif |