summaryrefslogtreecommitdiff
path: root/server-tools
diff options
context:
space:
mode:
authormonty@mysql.com/nosik.monty.fi <>2007-08-13 16:11:25 +0300
committermonty@mysql.com/nosik.monty.fi <>2007-08-13 16:11:25 +0300
commite53a73e26cf858ac48ead40927d84d54e33c1695 (patch)
treea462885d0de8206ed3a0b18affdd892bafca84c8 /server-tools
parent113cd2d064e500cd3241046ab374c490d95dace8 (diff)
downloadmariadb-git-e53a73e26cf858ac48ead40927d84d54e33c1695.tar.gz
Fixed a lot of compiler warnings and errors detected by Forte C++ on Solaris
Faster thr_alarm() Added 'Opened_files' status variable to track calls to my_open() Don't give warnings when running mysql_install_db Added option --source-install to mysql_install_db I had to do the following renames() as used polymorphism didn't work with Forte compiler on 64 bit systems index_read() -> index_read_map() index_read_idx() -> index_read_idx_map() index_read_last() -> index_read_last_map()
Diffstat (limited to 'server-tools')
-rw-r--r--server-tools/instance-manager/angel.cc3
-rw-r--r--server-tools/instance-manager/thread_registry.cc4
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