From: Jon Olav Hauglid Date: February 16 2011 5:21pm Subject: bzr commit into mysql-5.5 branch (jon.hauglid:3332) List-Archive: http://lists.mysql.com/commits/131465 Message-Id: <201102161721.p1GHLWqW014567@rcsinet15.oracle.com> MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit #At file:///export/home/x/mysql-5.5-test/ based on revid:jon.hauglid@stripped 3332 Jon Olav Hauglid 2011-02-16 [merge] Merge from mysql-5.1 to mysql-5.5 No conflicts modified: unittest/mysys/bitmap-t.c === modified file 'unittest/mysys/bitmap-t.c' --- a/unittest/mysys/bitmap-t.c 2011-02-16 15:26:19 +0000 +++ b/unittest/mysys/bitmap-t.c 2011-02-16 17:19:10 +0000 @@ -253,7 +253,7 @@ error2: my_bool test_get_first_bit(MY_BITMAP *map, uint bitsize) { - uint i, test_bit; + uint i, test_bit= 0; uint no_loops= bitsize > 128 ? 128 : bitsize; bitmap_set_all(map); No bundle (reason: revision is a merge (you can force generation of a bundle with env var BZR_FORCE_BUNDLE=1)).