From: Tor Didriksen
Date: October 19 2010 7:31am
Subject: bzr push into mysql-5.5-bugteam branch (tor.didriksen:3250 to 3251) Bug#52172
List-Archive: http://lists.mysql.com/commits/121062
X-Bug: 52172
Message-Id: <20101019073123.D7FCA37B0@atum07.norway.sun.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============5982668655106325214=="

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

 3251 Tor Didriksen	2010-10-19 [merge]
      automerge from 5.1-bugteam: Bug#52172 post-push fix: init auto-variable to NULL

    modified:
      dbug/dbug.c
 3250 Davi Arnaut	2010-10-18 [merge]
      Merge of mysql-5.1-bugteam into mysql-5.5-bugteam.
     @ CMakeLists.txt
        Enable the maintainer mode if debug support is enabled.
        Does not cause it to be enabled if the user explicitly
        disabled the maintainer mode.

    modified:
      CMakeLists.txt
      config/ac-macros/maintainer.m4
      configure.in
=== modified file 'dbug/dbug.c'
--- a/dbug/dbug.c	2010-10-18 11:27:52 +0000
+++ b/dbug/dbug.c	2010-10-19 07:17:26 +0000
@@ -2370,7 +2370,7 @@ static void DbugFlush(CODE_STATE *cs)
 
 void _db_flush_()
 {
-  CODE_STATE *cs;
+  CODE_STATE *cs= NULL;
   get_code_state_or_return;
   (void) fflush(cs->stack->out_file);
 }


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

# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: tor.didriksen@stripped\
#   6paerzab83118qkb
# target_branch: file:///export/home/didrik/repo/5.5-bugteam-\
#   bug52172suicide/
# testament_sha1: 77bc48d4c478f9e33c6dc450938e89129bcd6358
# timestamp: 2010-10-19 09:31:23 +0200
# source_branch: file:///export/home/didrik/repo/5.1-bugteam-\
#   bug52172suicide/
# base_revision_id: davi.arnaut@stripped\
#   ik7p9poh4zdr2xnt
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWexN2CQAAw/fgAAQWHP//34F
jgC////wUAXY8CIBZpBQAASShT9In6I1PU8pmmp6RobSHkgaBptRocwAEwABMAAAAABKECU/Snpq
bCnlNANAaAaYhoAcwAEwABMAAAAABJIEACeoZACI9I2qeo00eo0aNE8uJvqa9RoPIsJXsJhflWpD
FRlRI4Sxc8ojBxCDOz2neWiiqqpr0obXj5DUqzMMoq7zNVbCDtw5cfgz4lRpNRs/R2uZcTUrFAgZ
MvEXFQ447s07Ac9gVJPi1YSAVgmM62yPcPQOW4yMVcIa80IGpZm4vH4uq4CqFtELQEbDXnjdJznW
SFWyZlsE2RwDA2vBJwRQgeMAPYG9x7yBTFzpCNoA/UPf0DMClFxHjUqiJWrkOlB4OY9C3kQUQSqY
Epn8hjoWWTMhRJD4lRVquwbIfMVvsfYtIjPvO16sNQmHLpbswEbeGNExRAPUJvCJAsKimvDCuIQ4
J0MqEqEp5x6XZAEVoRkLIMAmKE7IyoRIJcQRSN5OCOKKrnIkzCBN9IkUvQuEvJMknsVzqi8prJUC
ug8gpSjURXaIU5knm+gcWFWurJZDI2F+KbF1EZ4UYW731kEjUUUlQmNYRcY4Lc/ctBHmolGTsNu5
nmNzmd6nkXT5i2MfAzbWWR00Mg0HvkUlhPCTjaHIRHoF0eJZSK/J8bzePrUusDCrdQI0fpcXcYFe
u3MciIFLYE/97C8iqWs3BkIrngh4rja8baV5j3ifzBwsdhdTfG55MtFMfuN134Oq62QET1DzYwtU
BhQUDEuyvVIw2A2Jk6EXcu7hVAwBdZbeNqg/My4wCkH1F9uAbdRdloIzXfQvjkOsGwZTZwziAthc
M4kOCI4SkRXhJEjIUkBs7gtPzoLjdFMwaFVc5pLR5GJhB+PxDDCY22ym9hzvubgmORb8MODzBSzE
hMMl0XRBYQC2MVDoovEfXpOm/ilrLbdwhS9sIsRORSokpkyBjSI/4+or1UeaKhcid4nlR7fRHpL9
M87eG3MIuaukV44scWZHHUGQ5wPVF6DQLlPSWSYymMofLQY6F8ZyuoYjYjDioRC9xE4hPNy/ZPQ5
YHfTucjP4nSZWcdqOpWJxEUbTIXM3jA85GRQZ7QRvCgMz0UgF78lA/hhJdDz74GHmYRibuVehtdT
ryKTmeR82ZnZFKVXxkGo+PWP0IHUnc4tOg/F5lNxX2+48PgJGYeBMK/OZdLqbxdCAUgSF4Ty4ReH
duPTpYTl0iWBQEbgsD8HofkG9l8jQQQGruAKeZBKEKnzGo1rKEEIFIPquEbJ0aRZr7B1JiJq4bI2
lZ9RRPc8gRAsHA5UiRtFANO6WLj8cTYQNmYGwDI0LSB4ZYCPAT8MfcR2TC1LNLoqYiRUUBwA4PAt
HgQXEkeo8QnB22HMpInZhgFEczjkh6eMP3FIZhMMyJQSDmFGBETAhjkWCmUkkojPGKw+VJqTAQYT
C39AdXyTZCFBiAHzIMMdw+xIEf8ITJVIqcJjDWbxWqIaz0WzqLMcMKgqKgYw08K6k4SCo+fMOB5Z
iMxEReoWBJVHNgRwNiYcgCw0PaQi87GQUwG+FYkVogLfXG5UEkmFwluHmsSLthk5mVZzAYuXArMG
GY+h9xiJaYDFaXsNCwvOJiMoGInHkEBj5LjgZh3PYKzHsYBIuTiZMZyGHDO8GCWIt4NUwpnmGfyU
w/c7IVZ0GsJoOZaJwuIG7wI4GJxCRyVAnExeZfBTV8pCsVakOGEf+LuSKcKEh2JuwSA=


--===============5982668655106325214==--