From: Jon Olav Hauglid
Date: November 8 2010 11:45am
Subject: bzr push into mysql-5.5-bugteam branch (jon.hauglid:3261 to 3262)
List-Archive: http://lists.mysql.com/commits/123070
Message-Id: <201011081146.oA88Xg2e016899@acsinet15.oracle.com>
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit

 3262 Jon Olav Hauglid	2010-11-08 [merge]
      Merge from mysql-5.1-bugteam to mysql-5.5-bugteam
      No conflicts

    modified:
      mysys/stacktrace.c
 3261 Dmitry Shulga	2010-11-08 [merge]
      Auto-merge from mysql-5.1-bugteam for bug#47924.

    modified:
      mysql-test/r/log_tables.result
      mysql-test/t/log_tables.test
      sql/sql_rename.cc
=== modified file 'mysys/stacktrace.c'
--- a/mysys/stacktrace.c	2010-08-04 08:43:44 +0000
+++ b/mysys/stacktrace.c	2010-11-08 09:55:23 +0000
@@ -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);

No bundle (reason: useless for push emails).