diff options
| author | unknown <monty@narttu.mysql.fi> | 2007-08-14 00:22:34 +0300 |
|---|---|---|
| committer | unknown <monty@narttu.mysql.fi> | 2007-08-14 00:22:34 +0300 |
| commit | c5f0611fadd910a8a169e35bdd7e572080530efe (patch) | |
| tree | 2641806010f25bf6469538558e05487ecff3c959 /server-tools | |
| parent | 6930ac54068b88ce5ca2476f70d74ddb42f5d9fc (diff) | |
| parent | 09a53f28a73d8000bab902611f609a44d87f329d (diff) | |
| download | mariadb-git-c5f0611fadd910a8a169e35bdd7e572080530efe.tar.gz | |
Merge bk-internal.mysql.com:/home/bk/mysql-5.1
into mysql.com:/home/my/mysql-5.1
configure.in:
Auto merged
client/mysql.cc:
Auto merged
include/m_ctype.h:
Auto merged
sql/field.cc:
Auto merged
sql/handler.cc:
Auto merged
sql/handler.h:
Auto merged
sql/item.cc:
Auto merged
sql/item_func.cc:
Auto merged
sql/item_strfunc.cc:
Auto merged
sql/item_strfunc.h:
Auto merged
sql/log.cc:
Auto merged
sql/log_event.cc:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/mysqld.cc:
Auto merged
sql/set_var.cc:
Auto merged
sql/sp_head.cc:
Auto merged
sql/sql_class.cc:
Auto merged
sql/sql_class.h:
Auto merged
sql/sql_delete.cc:
Auto merged
sql/sql_insert.cc:
Auto merged
sql/sql_lex.cc:
Auto merged
sql/sql_select.cc:
Auto merged
sql/sql_string.cc:
Auto merged
sql/sql_table.cc:
Auto merged
sql/sql_yacc.yy:
Auto merged
sql/table.cc:
Auto merged
sql/table.h:
Auto merged
storage/myisam/mi_rkey.c:
Auto merged
client/mysqldump.c:
Manual merge (trivial)
scripts/mysql_install_db.sh:
Complex merge (parital rewrite of new code)
sql/sql_show.cc:
Manual merge
tests/mysql_client_test.c:
then
if ! test -x "$print_defaults"
then
missing_in_basedir my_print_defaults
exit 1
fi
else
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 |