From 2e6a193c0f1987094471361f72094fe659852d92 Mon Sep 17 00:00:00 2001
From: unknown <monty@bitch.mysql.fi>
Date: Wed, 22 Aug 2001 12:22:46 +0300
Subject: Fix to get core files on Solaris

BUILD/compile-solaris-sparc-purify:
  Added -g
---
 sql/mysqld.cc    |  8 +++++---
 sql/stacktrace.c | 10 ++++++++--
 sql/stacktrace.h |  7 +------
 3 files changed, 14 insertions(+), 11 deletions(-)

(limited to 'sql')

diff --git a/sql/mysqld.cc b/sql/mysqld.cc
index 35aeaecc6e1..b484eee3480 100644
--- a/sql/mysqld.cc
+++ b/sql/mysqld.cc
@@ -1247,12 +1247,14 @@ static void init_signals(void)
 
   sigset(THR_KILL_SIGNAL,end_thread_signal);
   sigset(THR_SERVER_ALARM,print_signal_warning); // Should never be called!
-  struct sigaction sa; sa.sa_flags = 0;
-  sigemptyset(&sa.sa_mask);
-  sigprocmask(SIG_SETMASK,&sa.sa_mask,NULL);
 
   if (!(test_flags & TEST_NO_STACKTRACE) || (test_flags & TEST_CORE_ON_SIGNAL))
   {
+    struct sigaction sa;
+    sa.sa_flags = SA_RESETHAND | SA_NODEFER;
+    sigemptyset(&sa.sa_mask);
+    sigprocmask(SIG_SETMASK,&sa.sa_mask,NULL);
+
     init_stacktrace();
     sa.sa_handler=handle_segfault;
     sigaction(SIGSEGV, &sa, NULL);
diff --git a/sql/stacktrace.c b/sql/stacktrace.c
index ab1113f74cf..408006dac93 100644
--- a/sql/stacktrace.c
+++ b/sql/stacktrace.c
@@ -205,11 +205,17 @@ resolve it\n");
 
 /* Produce a core for the thread */
 
-#ifdef HAVE_WRITE_CORE
+#ifdef HAVE_LINUXTHREADS
 void write_core(int sig)
 {
   signal(sig, SIG_DFL);
   if (fork() != 0) exit(1);			// Abort main program
   // Core will be written at exit
 }
-#endif /* HAVE_WRITE_CORE */
+#else
+void write_core(int sig)
+{
+  signal(sig, SIG_DFL);
+  pthread_kill(pthread_self(), sig);
+}
+#endif
diff --git a/sql/stacktrace.h b/sql/stacktrace.h
index b6c0ec43a0f..980e1ea07eb 100644
--- a/sql/stacktrace.h
+++ b/sql/stacktrace.h
@@ -30,9 +30,6 @@ extern char* heap_start;
 void print_stacktrace(gptr stack_bottom, ulong thread_stack);
 void safe_print_str(const char* name, const char* val, int max_len);
 #endif /* (defined (__i386__) || (defined(__alpha__) && defined(__GNUC__))) */
-
-#define HAVE_WRITE_CORE
-void write_core(int sig);
 #endif /* HAVE_LINUXTHREADS */
 
 /* Define empty prototypes for functions that are not implemented */
@@ -42,9 +39,7 @@ void write_core(int sig);
 #define safe_print_str(A,B,C) {}
 #endif /* HAVE_STACKTRACE */
 
-#ifndef HAVE_WRITE_CORE
-#define write_core(A) {}
-#endif
+void write_core(int sig);
 
 #ifdef	__cplusplus
 }
-- 
cgit v1.2.1