1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

sql/mysqld.cc

Browse Source 
put back the things that the merge removed


sql/mysqld.cc:
  put back the things that the merge removed
This commit is contained in:
unknown 2001-05-09 22:42:49 -06:00
parent a4a4a1c29e
commit b59b5f4b6e
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
sql/mysqld.cc
View File

@ -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);