From: Tor Didriksen
Date: February 17 2011 4:16pm
Subject: bzr commit into mysql-trunk branch (tor.didriksen:3671) Bug#11752069
List-Archive: http://lists.mysql.com/commits/131563
X-Bug: 11752069
Message-Id: <20110217161630.80F2237BD@atum07.norway.sun.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============5845706807558728137=="

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

#At file:///export/home/didrik/repo/trunk/ based on revid:jon.hauglid@stripped

 3671 Tor Didriksen	2011-02-17
      Post-push fix for Followup to Bug #11752069

    modified:
      unittest/gunit/my_bitmap-t.cc
=== modified file 'unittest/gunit/my_bitmap-t.cc'
--- a/unittest/gunit/my_bitmap-t.cc	2011-02-17 14:39:47 +0000
+++ b/unittest/gunit/my_bitmap-t.cc	2011-02-17 16:16:26 +0000
@@ -423,7 +423,7 @@ bool test_intersect(MY_BITMAP *map, uint
 {
   uint bitsize2 = 1 + get_rand_bit(MAX_TESTED_BITMAP_SIZE - 1);
   MY_BITMAP map2;
-  my_bitmap_map map2buf[bitsize2];
+  my_bitmap_map *map2buf= new my_bitmap_map[bitsize2];
   uint i, test_bit1, test_bit2, test_bit3;
   bitmap_init(&map2, map2buf, bitsize2, false);
 
@@ -459,6 +459,7 @@ bool test_intersect(MY_BITMAP *map, uint
   bitmap_intersect(map, &map2);
   if (!bitmap_is_clear_all(map))
     goto error;
+  delete[] map2buf;
   return false;
 error:
   ADD_FAILURE() << "intersect error  bit1=" << test_bit1


--===============5845706807558728137==
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\
#   2g3opq3vv0qrd1al
# target_branch: file:///export/home/didrik/repo/trunk/
# testament_sha1: 6548faae3e37ba5e38af13312a733c4b1c2e4fee
# timestamp: 2011-02-17 17:16:30 +0100
# source_branch: file:///export/home/didrik/repo/5.5/
# base_revision_id: jon.hauglid@stripped\
#   klfkmdysi42vdkb9
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWZzfJ4gAAYRfgEAQWHP//1cA
RAq////wUAOHldV2xyG83u8JRFM0DUnqfqYTKZDQ0HqeoPUekBoEqmkwZTwSDQAAAAAACUQnqaJt
JhE9T0jTQaPUaABoAG1SNIMgNBk0aGgAAABoJKNEANCZT0yRG1NkENANMjTSiFxae3rxWu2QKqVo
QK7UZG1jVPJ2cPGVRVM8g+tDhansVRr9DofJbl78fjXnk7jVhOxCzklshq2cJkYqFB3rwoNfQRsL
zKyzaaQb334T0wWqRklSExLFqZsCKVqdwIDq+LxEWchZvIFw0Xl7uXjMFCzi//CdYlPhFe0ljEI0
gbd2iQQXz8Io+0ymkqorm6EcVhTUXvlGIieLQRh4xOliuWIo4nvzruLDGchohUVCLC7MNIiyUuSA
l8XQJn51CqEiQlCEjBSyzGtkKB2PcL+ib7SwHLBhikxiS3uLgewbpGExCwHAwTE1uMrmi8UuYx1T
agjazilqMocIt6gbM1ekquKXARZmE+GVGDX3qpiG6aA6gH0iNnT42V1qUjgRmoJ4Rg0TSVMRJFLG
jmLCeUnfIqVbUEcC0LJHQlS56J6lZCpwzkVlgRBp1nrys3Fztt0rnLtXHyyeEEolThx+qxndI/h6
Zd6lGpwTHr8Ykzw6Df7VZU8kivqLGCIuV10Mxcxy7K0PV4dnu53PodubmF5XHn694412kaHUiXgb
9XDd0LvbbgznJEEiymrHYXG2wqrU6XsaiKbnvRNpiGA5AyrC5BHmEfXi036oopKbN7GMnmDfjs16
WqvVuLpZ8VkzYQ5wOcuRUbVCK++wfIGlyQtNXHSdpxOh8NiwwPPjxLwk9fCgdreXdgr0PDeeOnuH
ByCqQaE8Q3l93asQ/nUlCl5OBuTGXWFvnpe0g56hg8WtkTCgIGZeFG4MQ0Kg2A1RoFoWvPk48prU
hxPDMO4Gy8Lax6RLVa+jMcFWKnCstMN5UzGg2VlF86IqIr54A97sLhkHqipoMLbPyJIoTpMNTy5I
1qd98PwJiTg1wnhltwsL0ScC7Gxg1UZlBSdQ9G1DqtSXFxQ1VGBIMAyyoaKCa8n67wKVm0owuI/U
ZPy0JuIFuebyzyDoCpnKWR4yLchUBaKKeepsHxxaCNCXWS9KzG0ZASPHiItTAaD4xei33m+QMY9b
uPNr3Cd4SSBwBkIsSmY02MyTMqnMmcApkR3+LuSKcKEhOb5PEA==


--===============5845706807558728137==--