From b59b5f4b6ec6bd5b0eb8cee832b6d4f51fa646fc Mon Sep 17 00:00:00 2001
From: unknown <sasha@mysql.sashanet.com>
Date: Wed, 9 May 2001 22:42:49 -0600
Subject: [PATCH] sql/mysqld.cc     put back the things that the merge removed

sql/mysqld.cc:
  put back the things that the merge removed
---
 sql/mysqld.cc | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/sql/mysqld.cc b/sql/mysqld.cc
index d51d7b590da..1db105c28f8 100644
--- a/sql/mysqld.cc
+++ b/sql/mysqld.cc
@@ -1362,7 +1362,8 @@ thread stack. Please read http://www.mysql.com/doc/L/i/Linux.html\n",
 	      thread_count);
     }
 #ifdef LINUX_STACK_TRACE
-  trace_stack();
+  if(!(test_flags & TEST_NO_STACKTRACE))
+    trace_stack();
   fflush(stderr);
 #endif /* LINUX_STACK_TRACE */
  if (test_flags & TEST_CORE_ON_SIGNAL)
@@ -1398,7 +1399,7 @@ static void init_signals(void)
   heap_start = (char*)&__bss_start;
 #endif
   
-  if (!(test_flags & TEST_NO_STACKTRACE))
+  if (!(test_flags & TEST_NO_STACKTRACE) || (test_flags & TEST_CORE_ON_SIGNAL))
   {
     sa.sa_handler=handle_segfault;
     sigaction(SIGSEGV, &sa, NULL);