From: Jon Olav Hauglid
Date: February 23 2011 1:51pm
Subject: bzr commit into mysql-5.5 branch (jon.hauglid:3354) Bug#11752069
List-Archive: http://lists.mysql.com/commits/131946
X-Bug: 11752069
Message-Id: <201102231351.p1N1WKLm005033@rcsinet13.oracle.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============4513236063360595864=="

--===============4513236063360595864==
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-test/ based on revid:nirbhay.choubey@stripped

 3354 Jon Olav Hauglid	2011-02-23
      Bug #11752069 (former bug 43152)
      Assertion `bitmap_is_set_all(&table->s->all_set)' failed in
      handler::ha_reset
      
      Post-push fix for unit test compilation error on Windows.

    modified:
      unittest/mysys/bitmap-t.c
=== modified file 'unittest/mysys/bitmap-t.c'
--- a/unittest/mysys/bitmap-t.c	2011-02-16 17:19:10 +0000
+++ b/unittest/mysys/bitmap-t.c	2011-02-23 13:50:59 +0000
@@ -429,7 +429,7 @@ my_bool test_intersect(MY_BITMAP *map, u
 {
   uint bitsize2 = 1 + get_rand_bit(MAX_TESTED_BITMAP_SIZE - 1);
   MY_BITMAP map2;
-  uint32 map2buf[bitsize2];
+  uint32 map2buf[MAX_TESTED_BITMAP_SIZE];
   uint i, test_bit1, test_bit2, test_bit3;
   if (bitmap_init(&map2, map2buf, bitsize2, FALSE))
   {


--===============4513236063360595864==
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-test/
# testament_sha1: b336097397c4401728962dee474f6dacf9c37606
# timestamp: 2011-02-23 14:51:02 +0100
# source_branch: file:///export/home/x/mysql-5.1-bug50619/
# base_revision_id: nirbhay.choubey@stripped\
#   1he7tra0ymu1l2bg
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWSsVZ+4AAYPfgAAQWeP//3Zy
zNr////wUAPF5e2eeJd6S704aFTZGpiDKfoQ0J6jTTanqaaaNNDTTJ6NTQMlMhponhTT1T0m1Gho
GgDQAaBpoBJEmjJTwmgjEelH6U2oMQZGEGgACSSCeQmKemk9EPRABoAAAANBJJNAFPKfqNGmmmo0
myjI2SMhkZMAhXfwzH99NgllaV9pzQkA2Xg6xR4EQ/idTdsJmYZuKRxcCMRMjhpFYwuTEx7t/Tjh
ti5E+DJ8xltOLj53mQ6AhgmZsdahXJ+ycA1AinWMGoPGOqoG6a3Xx4mVoxdJpNbShKAE5Bz30Txi
1AzZDWwhyRsUtsJB5WKygdO82NQEbeiqWxljSUxbpRFxCbZSI+b45X2ZQmFCoerFkGgRuszNbaMQ
rwFVs4z0DfuoxrpEZPuQdB/DTA1unAKOrVzJkEs8QpPwkTmcVU1sFqpnJXwfOOSZZoAU/F8JuWSS
mn5UxlTKQZMMWNnbjDDGYvjuIk4sG0lA/uaiNmRoMkYW0bVG7betDGIngHYicJiCoQF4iIOiqoLI
xzKajpLbOIRL2VRFYywzAshOJVMMFuyZXtLybHOyksMNLnEUFUJQnbdtFmmpJPUxF7NSw0cRHeQr
4zmaJg9l+16lc496poTSagrCU2/XrM2/OV+fUuHZlSbgAyl9CC2ZgzOz5mNz8HO/krdVYre+++8n
Fa0oXw5WYcBxaTASqr2pRwXaSUBpzpUvOqB0AQZn7QEdXpNvjhdu9wGwG26QQm1rACNQuzWJBqk0
hJBr2l5lEWryH71eoLxaHt/QHcqvhlqqWkjm3ZTVDsA6RbZEWJTIc8zXcfZjVJa6U8Ei/Cd7ETgU
/XuFlrYRc/fyDjkrCcd0Dempnlp7zS5AA9HROqHFNlYcF4UCfBLexG3Qg7RwIyldmhj66NbtU88o
zPUQOWKfccPIWHLVxlRA88IzOyx/kw6soJUqtlmBrI0FKxZxghh3gHq1RyqRYx8xRdfyJwDr5cB2
VZHmY2h715rtGV8xcEFC8HXBe7hkto/ZtGdwTG3SZtArAylO/ANSsB8QNxe7W1AOWNaCs0NhhoSM
qvbOsxgddQYjV0k2oJ+AitPRRXTEiK0yRU+cUgOaNocwssygZJWBmTLGX2ZEL+qlWkBlwyG0ab/A
aQcG6OJfm36rXvFoV96cELmZWijJ8XTluurZzVSLOQ2wuZwzpwWOxRRjZloNtcZhW+EaIpnDQJjD
qXc1+G8NgqZwkuSKpARh2JCGfOkbPRLUNgG4m5Snrjy6MIdMNHtIUxeP4P87tq3NNzpnhuwGhcEw
sXBNFlQZ1JbNne1aC2ZjYoXvlTaoGkJHo54l2aVSskzRJqhRrtWtRYaHTihOPr/xdyRThQkCsVZ+
4A==


--===============4513236063360595864==--