diff options
| author | sasha@mysql.sashanet.com <> | 2001-05-09 22:42:49 -0600 |
|---|---|---|
| committer | sasha@mysql.sashanet.com <> | 2001-05-09 22:42:49 -0600 |
| commit | 4e04aa4abd0e540e6ce5cd48f2057ae993ee3336 (patch) | |
| tree | 91e0be90ef4a71a032e748f641dcf183a70c60d3 | |
| parent | c77547ea062731b18bbebec220fb62d59444fe93 (diff) | |
| download | mariadb-git-4e04aa4abd0e540e6ce5cd48f2057ae993ee3336.tar.gz | |
sql/mysqld.cc
put back the things that the merge removed
| -rw-r--r-- | sql/mysqld.cc | 5 |
1 files 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); |