From: Jon Olav Hauglid
Date: November 8 2010 11:51am
Subject: bzr commit into mysql-5.1-bugteam branch (jon.hauglid:3556) Bug#45288
List-Archive: http://lists.mysql.com/commits/123109
X-Bug: 45288
Message-Id: <201011081222.oA87vSXa010961@acsinet15.oracle.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============8758031502641209111=="

--===============8758031502641209111==
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:anitha.gopi@stripped

 3556 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 11:51:48 +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);


--===============8758031502641209111==
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: 0f0852b84e7151b1c41e9b7bcd0f8dd303469942
# timestamp: 2010-11-08 12:51:56 +0100
# base_revision_id: anitha.gopi@stripped\
#   vx5q7s8s7ok6xqaa
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWacb2s8AAZ1fgAAQWGP//3rx
jYC////wUAQm697PZt3Xbh13uy7DIiAAhqe0mmmEk8mmo9RpibKfqmBBpExNMmmU2Sn6ptNMiaDR
oAyAACUIBTJiZMoelNGwKD1HqMgBkaBkk0hoyaNpA2oNAAAAAGgkomQTap6YkxpomT0gBk02oAaA
z5xU6/ynT4GdVnvcysOqfpBtQjxpf2NtW5jdsrPKaPX5SIiHP0Hs2BigaAjFWSL28NjqZX7064Na
vno0QR5PxCjP5yh/szq8GdVjm8opGV+C04btd9+9eaMqGPb6Ro340PIQ8niRhvOqioPWmitHGWFU
+Ba5ZCHyhLSomoj667XSESVL8fivwHxHcGELBwhGbPnxdyRTI7RNWiZAQ1pYKrK66aR2XSKtFEtM
giavfEVToNRDM9BSLjHPrJ4yud4dcRjgvuqwEy04t0wE6iSGsdKNAWsRz0jtAKKhcRgcl12D0i97
DWwbsIGqkA2X9c81iua0tgUFTPC50FZ2OwYloq00tPMeRR1jejsTX0eJRXKt5fmJvNuvUoPyI6kN
yCUHEtuW2KmAarMiwFlSYMuLg6O8TTG+gZEvAotPWcWTDnhziQmy4FaMZ7C2lIZYU3viY8tAKQCT
AjBFogokCgywY9Ebqkh5N4SQL3WE7VPjGhrxAkUKy+3F+m3VW40KoWP0SVipicnIslgPCMl6e0uh
dqxsK7/Hk+8T3HrBIgRE6cZh1e8H2l5fXJubfPPk9/JvivFhRr8oiVq2sC6vql2L+6VG02hfAGgQ
UsE2uh4aFQWil5Vbg0hv3iGsIDDqYNVxE5GuRF3bQ3qhn3BdTuEsey1prRksWEU5QONz4qiXdEKm
/fp0GZsbGBpGATVIhg1SQS2Q01bo1t/c+EUengjOEKu/AtmpX9/OpxpSdsxiAHaQZmynNirkwAOQ
Fd3FEnIVzV5lmvOxgGVaXh8eiyIjq6xhSnKBsMVqYZqJunXs1iUoXhK5eWxb6L8pHkjIU7mPUY2D
vHGsMsyywgZ2SPCpR630jneoHDEJxEoP1JqEMMQ5RkRADkX13nhiouKgPkrRPP9V6T2wDbuOM6U9
+Iq7CwncyPbvQSOF5eFvADTOPfDW2AbAEqrAhO8QjxQdSL3PgZxUaiwLAn3OC/QDgoaDjo87WqIB
B+gBv13XRu7dAIgTIos9UosjuggfC9wXKQRPRyKZygG7iIxphWTCfaRclUSKK+IkFRUu2/7KVW44
o56EOIJnjCSh2pOEhfYJgBTAcAtqLYoC26dYLGohYrhPJAZ+T0SYBrzxV6gTZ84NGdlQRAtTxr2o
u072H8oo0UspSN0ZB1e43bFyXwTak68GtvuU33VgvChWvPmttaNQyc1QY9yNLIu1ZYm4zhi9xER4
3W20wfarsybHDXSRJ04QXIDI2KXHcR2+hgAyqp6yDLMVcmlEE5WYDRzfhOAaVo2W3j8PDcRxLlRx
ooAsM4YDVwFFG7yZLqP+LuSKcKEhTje1ng==


--===============8758031502641209111==--