From c9a46a43d274957f5faed3a9e0ed33e02407bb64 Mon Sep 17 00:00:00 2001
From: "guilhem@mysql.com" <>
Date: Fri, 13 Aug 2004 15:29:47 +0200
Subject: Escaping [] so that darwin[7-8] gets into 'configure' and not
 darwin7-8 Adding a compilation define so that on recent Darwin mysqld does
 not react to SIGHUP and SIGQUIT: this fixes a rpl000001 problem on our
 Powermac G5 machine (popping after an upgrade from 10.3.4 to 10.3.5) and is
 expected to fix BUG#2030 "relay bin log on slave resets multiple times a
 second" (i.e. under some Mac OS X Panther versions, mysqld receives many
 SIGHUP and SIGQUIT). So this fix is more a problem-hider than a real
 understanding of why mysqld receives so many signals. Note that we saw other
 problems on this OS where mysqld reacts to Ctrl-Z but apparently only once,
 where using SSL seems to make the problem more frequent...

---
 sql/mysqld.cc | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

(limited to 'sql')

diff --git a/sql/mysqld.cc b/sql/mysqld.cc
index 3f7c187ccdd..8f08099f340 100644
--- a/sql/mysqld.cc
+++ b/sql/mysqld.cc
@@ -1836,9 +1836,11 @@ static void init_signals(void)
   sigaddset(&set,SIGPIPE);
 #endif
   sigaddset(&set,SIGINT);
+#ifndef IGNORE_SIGHUP_SIGQUIT
   sigaddset(&set,SIGQUIT);
-  sigaddset(&set,SIGTERM);
   sigaddset(&set,SIGHUP);
+#endif
+  sigaddset(&set,SIGTERM);
 
   /* Fix signals if blocked by parents (can happen on Mac OS X) */
   sigemptyset(&sa.sa_mask);
@@ -1921,11 +1923,13 @@ extern "C" void *signal_hand(void *arg __attribute__((unused)))
 #ifdef USE_ONE_SIGNAL_HAND
   (void) sigaddset(&set,THR_SERVER_ALARM);	// For alarms
 #endif
+#ifndef IGNORE_SIGHUP_SIGQUIT
   (void) sigaddset(&set,SIGQUIT);
-  (void) sigaddset(&set,SIGTERM);
 #if THR_CLIENT_ALARM != SIGHUP
   (void) sigaddset(&set,SIGHUP);
 #endif
+#endif
+  (void) sigaddset(&set,SIGTERM);
   (void) sigaddset(&set,SIGTSTP);
 
   /* Save pid to this process (or thread on Linux) */
-- 
cgit v1.2.1