From: Tor Didriksen Date: February 17 2011 4:16pm Subject: bzr push into mysql-trunk branch (tor.didriksen:3670 to 3671) Bug#11752069 List-Archive: http://lists.mysql.com/commits/131564 X-Bug: 11752069 Message-Id: <20110217161648.D3FD137BD@atum07.norway.sun.com> MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit 3671 Tor Didriksen 2011-02-17 Post-push fix for Followup to Bug #11752069 modified: unittest/gunit/my_bitmap-t.cc 3670 Jon Olav Hauglid 2011-02-17 Followup to Bug #11752069 (former bug 43152) Assertion `bitmap_is_set_all(&table->s->all_set)' failed in handler::ha_reset This patch converts the my_bitmap unit test to the gunit framework. renamed: unittest/mysys/bitmap-t.c => unittest/gunit/my_bitmap-t.cc modified: .bzrignore unittest/README.txt unittest/gunit/CMakeLists.txt unittest/mysys/CMakeLists.txt 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 No bundle (reason: useless for push emails).