From: Jon Olav Hauglid
Date: November 1 2010 1:13pm
Subject: bzr commit into mysql-5.5-bugteam branch (jon.hauglid:3113)
List-Archive: http://lists.mysql.com/commits/122427
Message-Id: <201011011314.oA1DESLc004386@acsinet15.oracle.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============1407193700885268532=="

--===============1407193700885268532==
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.5-bugteam-test/ based on revid:alexander.nozdrin@stripped

 3113 Jon Olav Hauglid	2010-11-01
      Backport from mysql-trunk-bugfixing of:
      
      ------------------------------------------------------------
      revno: 3309
      committer: Tor Didriksen <tor.didriksen@stripped>
      branch nick: trunk-bugfixing
      timestamp: Mon 2010-11-01 08:58:27 +0100
      message:
        Bug#45288: pb2 returns a lot of compilation warnings
        
        DBG build broken on binary-werror-linux-x86_64-tar-gz
        storage/innobase/os/os0sync.c:659: warning: 'timed_out' may be used uninitialized in this function

    modified:
      storage/innobase/os/os0sync.c
=== modified file 'storage/innobase/os/os0sync.c'
--- a/storage/innobase/os/os0sync.c	2010-10-28 17:12:23 +0000
+++ b/storage/innobase/os/os0sync.c	2010-11-01 13:12:59 +0000
@@ -656,7 +656,7 @@ os_event_wait_time_low(
 						os_event_reset(). */
 
 {
-	ibool		timed_out;
+	ibool		timed_out = FALSE;
 	ib_int64_t	old_signal_count;
 
 #ifdef __WIN__


--===============1407193700885268532==
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.5-bugteam-test/
# testament_sha1: 009dd8dba8792e42e305a09c28b67e068332faf7
# timestamp: 2010-11-01 14:13:08 +0100
# source_branch: file:///export/home/x/mysql-5.5-runtime/
# base_revision_id: alexander.nozdrin@stripped\
#   on303ap9dqz31t6y
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWT/Xp5cAAcLfgAAwWuv//3fW
jAC////wUAQ2vA0ve6nQdddAySQ0A9QA0DQHpPUZAANAANUxNT1BnqnqA9J6mEAAAGg0AA0RPRMQ
aaIj01NGQ9QA0ADQ0Gg0I0kAaaAaNAAAAAAAJJJkJgmJgKYp4jEU/VHpPKeo0DE9R6kpz04FwtN0
1sFlvegX4nxHCwkgOmAmekU7Ig9aiiV9IBJHctcZmKU9S2ItqRcijRFebG0DZyfkGHu7Vu1a9f0y
mdomxeWeFNKqlcZxXMEuvLOhjQtl5UDgOZwrDk4LIRGizh/NedWIj7Lyk4IKjvpWmFbu6lb8KqYv
imunMMwVEtSTlPhB87jHwnjFiM29nthF573CHpBrTFdy+bRZKtxAopjerKgYcucNrRVqewIplBmY
wi4vXs0SZAwuTpUyzL+tA9BYwnwctbxSxV5EJ0uapPeb2Umu/VljuvH1VFTJ/cT3zi2BL35GIh5N
3zZveLLJ1titleEv6N6oidqdDWt6107IxeajiL45a73q7BOT1ueYioWdyllnb31JZRpWL0B4Exgf
a8bzLXDSyXBIW3Cigr1CAJtysHX200Kj3E4PdoJtFRLXLinGuRyfaYqMqhFzF5J+yYqj2NhEo1c+
MqnUCBe1+MsScs71VbkXX9YD8CDIWRmsWJgwjBXRMHOhPJQWjQuTixLbHL1eCaHct9dbXzgSYZG5
BNU3CBBGVhG8ahoDnjhJvTQISin1BKwI5A2ILO10ugokc+YiBEjYtZ9yVTiMipXZQ8pbrS1oAs9f
aBI4MFpIN6RcdfEF2FJwOd0KhguXoSW2EDsuJhkLIaHYcGE6PDxKnLDTNr2g20E0PhprPzaYU8y4
5fKbHgxiEq3ULicChSbE/kpN/xNOVvYZC1Aq6tccBR6TLVJyujw2EyykToCNRertRBU/NV2aDYCw
VB4JtMlMFAFqPIvtzQbWJ8WMG/NToyvGKqmAKHDMlWd0XjDB4tN1jUad0bNu/lxR6N4nVMsMgtoI
/HhvvCGoWpOUW+Zc6+gz353p4u/abaj77enA2uJWZnHVpUnCHN1pWQdUpb50xubL7NOZz+ycl+eL
5XEhTtrwUaI9hIvDiFniVr1+9mmElJYHlzCbvLSExcKk9hqKdsyGOWgcxRcR/wO+QVB2FriB//MS
gmOnguYHJxpy4z/IVaQ4xbJWSRSjoVYPBFChhuRpvmDRAQoGAhMRrMwEhTEDlByKo6CN7Ibdl0UJ
0QZMDb4D5RpmvSTv37KcHUlKJQRQTB+RngAoQssCjGWIIFP1WC/YKXE129mTOI27C41b5OhBSahj
ckyAwIkTycnDR1SkJyaH2vubTle4zaQMOPilmWAEsDW0yEhgdSPAU5WciZF0qPANVFmt1fRQd2LS
x2yKsfSZtLPsp/L3s0bnL2qRYEFRVO9UF+P03FADG4m1Ioui2FErqolQjOM12C+mkUaktHKeoMRe
irDgaeaktUym/8XckU4UJA/16eXA


--===============1407193700885268532==--