diff options
| author | monty@narttu.mysql.fi <> | 2007-08-14 00:22:34 +0300 |
|---|---|---|
| committer | monty@narttu.mysql.fi <> | 2007-08-14 00:22:34 +0300 |
| commit | 9d609a59fdf6a13dd1fb615dca16957f359de62b (patch) | |
| tree | 2641806010f25bf6469538558e05487ecff3c959 /server-tools | |
| parent | 3ecef8c0b902b7ed213ba89ec3e8e5637033435e (diff) | |
| parent | e53a73e26cf858ac48ead40927d84d54e33c1695 (diff) | |
| download | mariadb-git-9d609a59fdf6a13dd1fb615dca16957f359de62b.tar.gz | |
Merge bk-internal.mysql.com:/home/bk/mysql-5.1
into mysql.com:/home/my/mysql-5.1
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 |