summaryrefslogtreecommitdiff
path: root/unittest
diff options
context:
space:
mode:
authorMichael Widenius <monty@askmonty.org>2011-05-03 19:11:39 +0300
committerMichael Widenius <monty@askmonty.org>2011-05-03 19:11:39 +0300
commit547ef66609b479adeb3a25d5c37e4b185623a2cf (patch)
tree78265dc8ed941f1f55f331f5e86576df090043ff /unittest
parent1be5462d59fa5fbd1ca92286c3a0a049c00f4bb9 (diff)
parentf74853053ff7cb4420b09923d9c648620e7fa73c (diff)
downloadmariadb-git-547ef66609b479adeb3a25d5c37e4b185623a2cf.tar.gz
Automatic merge with MariaDB 5.1
Diffstat (limited to 'unittest')
-rw-r--r--unittest/mysys/bitmap-t.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/unittest/mysys/bitmap-t.c b/unittest/mysys/bitmap-t.c
index bb09aaa7b50..9fca9f8ef20 100644
--- a/unittest/mysys/bitmap-t.c
+++ b/unittest/mysys/bitmap-t.c
@@ -430,7 +430,7 @@ my_bool test_intersect(MY_BITMAP *map, uint bitsize)
{
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))
{