From: Jon Olav Hauglid
Date: November 8 2010 9:48am
Subject: bzr commit into mysql-5.1-bugteam branch (jon.hauglid:3555) Bug#45288
List-Archive: http://lists.mysql.com/commits/123051
X-Bug: 45288
Message-Id: <201011080949.oA86ujsc015676@acsinet15.oracle.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============3344387803329812387=="

--===============3344387803329812387==
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

#At file:///export/home/x/mysql-5.1-bugteam-gcov/ based on revid:dmitry.shulga@stripped

 3555 Jon Olav Hauglid	2010-11-08
      Bug #45288 pb2 returns a lot of compilation warnings
      
      GCOV builds were broken after the patch for Bug#57933
      which added add -Wdeclaration-after-statement to gcc builds.
      
      This patch fixes:
      stacktrace.c:328: warning: ISO C90 forbids mixed
      declarations and code
      
      No test case added.

    modified:
      mysys/stacktrace.c
=== modified file 'mysys/stacktrace.c'
--- a/mysys/stacktrace.c	2010-07-30 20:33:10 +0000
+++ b/mysys/stacktrace.c	2010-11-08 09:48:31 +0000
@@ -318,6 +318,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
   /*
@@ -325,7 +328,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);


--===============3344387803329812387==
MIME-Version: 1.0
Content-Type: text/bzr-bundle; charset="us-ascii";
	name="bzr/jon.hauglid@stripped"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: jon.hauglid@stripped
# target_branch: file:///export/home/x/mysql-5.1-bugteam-gcov/
# testament_sha1: 8e9f4ed49c85f8e40cbd30c733589f053a7b1105
# timestamp: 2010-11-08 10:48:39 +0100
# base_revision_id: dmitry.shulga@stripped\
#   rr1n5tuj3t4mrgc7
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWdGWvaYAAZjfgAAQWGP//3rx
jYC////wUAQl4EmgoAHECGpT0zVPTRM2U01H6oADI2gzSnqAGiJMnqM9TU9EaaGQ0CDAIaYAFU0y
YAJgJgRgAAAmCZDmmJgATABMAAJgACYJKaCBpGjEaAmIEyZqNNRoZND1MNkuV+0ro1B0B9VnoDTn
SgBeQhuoR636lKk1zqtbM62YiIY8QxXIowDnpNajnyY++qqlqWFd0rWe/NmkyQSUKI/sOa9roZFL
szUPBhh+B0hsyVSudEf0SjIS0UhT9aWuOoIdX0wvNooq6LZuMcNKsE1OEIc9qStSrWdmfp2xQ53J
3zq/LtBCQ/tYRaPESp7IwV5kyogMKVcxQYZ0Fx40PjK1HfUKNLUCKfqxFBvNerwigwIRtKomGORi
rT9VVRmtGc0bsDGBOy9xJRMsT1BX1mrNcPkd8WzFaofhQPfpk2wkSzWSDo3EVMtzQdZniJ8Skctu
bO+h7W7nmO7ebasJXn6X+l0Iq8v0qmTPXG1Xwp62ie9ztJV2nT/Qopm0KFdbLRT1Tv41k1gRCcor
Fm+UsBupERQoSU1gy2LBMwRrchNWIAiwiEyEXTMTRie7iEds1BptBPIYiHxH6MhPZ6tHShc1zq4n
7uJ2VPYWt15WWEigmcBdwueEa56NTyw1wsUHUOeTYpi9OodEgEqHdfkbqcq7HCfhb5pAUEb5AmIi
K7vaF7PhFiw8eteC+GHqzi38056BOnu8p6PDHV2pviI49Q/aoGSKlZ6nN+nNIPei6qFGf5k0e/uX
cyBU0qjnilOGHn9PkWaRY/Mp9revfq9NrHajVkt95tIHFRa8phE9qGD7YbzY0HODiOSKppGhrFFV
0DUub1a7lsjJQWcbXpiI+j815ZoX8N/07jVK3gVqZbvHT6V38Jc7wYFzywKZwud3T04u3tZYFsLC
J8NmdfDW5wdlJeUQGVnU1C0fJhljGqsGiQoAoE7z9LDg6HbOwrEMu58Z9Nhkaivkf1k1TjR/OyB+
uFxxF14vDlSO8z8T8yjxW1VVnpYisCh3gvHkw4PRLsuuu+N9CwXfScr/QWZrseZhinpdj6/DxceG
RyUTd8gvzH+ct0KDWDsNYeKJxvzJ4rY/g/I6dvIyyCftAOvAIBnYIHh99jJ6Q40r6geGT91eru0C
KHc05s2EzisrN1NNA3siwT+bFcbJskdOqYnCwoCjMSeq5J8RQcnLPy+NVFnMZ6Qzj4pXkk5fZ0iv
I+EiYPDey23TVwtvFaNjnJyeSd9K7ZVDRPMVRTlYrk547xzg9JbpDRZGe3sYmo91CahZq65XblRS
pJ3PyOOx3e7MKmnBs+m5xbn9VMG6Vqfl5Oz2pqzU9phi6WJdoxwOw6r3lqi8oFAbJuRhDauToz4X
D1CsLFwB25UMm+y1cyjd9ywDJaF5q/YU7Y4U4OcXJswX9ZfUeqruHCwXI6yNZbaGQoCmaO4cBAFc
AOAdIH8XckU4UJDRlr2m


--===============3344387803329812387==--