summaryrefslogtreecommitdiff
path: root/mysys/stacktrace.c
diff options
context:
space:
mode:
authorJon Olav Hauglid <jon.hauglid@oracle.com>2010-11-08 10:55:23 +0100
committerJon Olav Hauglid <jon.hauglid@oracle.com>2010-11-08 10:55:23 +0100
commit46697b35910aec0b73f07dc7a3a2077e61f5f8a1 (patch)
treee0082cc01eb2c287fa6f596056816dc23378086e /mysys/stacktrace.c
parent1f79894087a02932442284db3978065c1c30ce0d (diff)
parentacc716e309bc2fb6636e87bb6ef58503117d8920 (diff)
downloadmariadb-git-46697b35910aec0b73f07dc7a3a2077e61f5f8a1.tar.gz
Merge from mysql-5.1-bugteam to mysql-5.5-bugteam
No conflicts
Diffstat (limited to 'mysys/stacktrace.c')
-rw-r--r--mysys/stacktrace.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/mysys/stacktrace.c b/mysys/stacktrace.c
index ba62062ebc0..451a2c7d06a 100644
--- a/mysys/stacktrace.c
+++ b/mysys/stacktrace.c
@@ -315,6 +315,9 @@ end:
/* Produce a core for the thread */
void my_write_core(int sig)
{
+#ifdef HAVE_gcov
+ extern void __gcov_flush(void);
+#endif
signal(sig, SIG_DFL);
#ifdef HAVE_gcov
/*
@@ -322,7 +325,6 @@ void my_write_core(int sig)
information from this process, causing gcov output to be incomplete.
So we force the writing of coverage information here before terminating.
*/
- extern void __gcov_flush(void);
__gcov_flush();
#endif
pthread_kill(pthread_self(), sig);