diff options
author | Jon Olav Hauglid <jon.hauglid@oracle.com> | 2010-11-08 10:55:23 +0100 |
---|---|---|
committer | Jon Olav Hauglid <jon.hauglid@oracle.com> | 2010-11-08 10:55:23 +0100 |
commit | 05f9fa7f57617e643a4689d039ffe4105ea731cc (patch) | |
tree | e0082cc01eb2c287fa6f596056816dc23378086e /mysys/stacktrace.c | |
parent | 7cd6bb264557589fbe08fd3da944886bbab149ab (diff) | |
parent | 55086d79e1864f8a9f66af808d4566665d7bc846 (diff) | |
download | mariadb-git-05f9fa7f57617e643a4689d039ffe4105ea731cc.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.c | 4 |
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); |