Merge work:/my/mysql-3.23 into hundin.mysql.fi:/my/mysql-3.23

2 files changed, 5 insertions, 1 deletions

diff --git a/sql/mysqld.cc b/sql/mysqld.cc
index f7be5525e34..71b832f24f4 100644
--- a/sql/mysqld.cc
+++ b/sql/mysqld.cc
@@ -1326,7 +1326,11 @@ information that should help you find out what is causing the crash\n");
 #endif /* HAVE_STACKTRACE */
 
  if (test_flags & TEST_CORE_ON_SIGNAL)
+ {
+   fprintf(stderr, "Writing a core file\n");
+   fflush(stderr);
    write_core(sig);
+ }
  exit(1);
 }
 
diff --git a/sql/stacktrace.c b/sql/stacktrace.c
index f4415571f1b..d5711bcd78e 100644
--- a/sql/stacktrace.c
+++ b/sql/stacktrace.c
@@ -206,7 +206,7 @@ resolve it\n");
 
 /* Produce a core for the thread */
 
-#ifdef HAVE_LINUXTHREADS
+#ifdef NOT_USED /* HAVE_LINUXTHREADS */
 void write_core(int sig)
 {
   signal(sig, SIG_DFL);