From e6926b06da6406b36c0e6bf4ec8151cd0237151f Mon Sep 17 00:00:00 2001
From: Vladislav Vaintroub <wlad@montyprogram.com>
Date: Mon, 2 May 2011 23:03:26 +0200
Subject: [PATCH] Fix compile errors: - from xtradb merge - portability error
 in bitmap-t.c ( variable size  array in non-portable)

---
 storage/xtradb/os/os0file.c | 3 ++-
 unittest/mysys/bitmap-t.c   | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/storage/xtradb/os/os0file.c b/storage/xtradb/os/os0file.c
index 31dec031af3..5b8e656d8b2 100644
--- a/storage/xtradb/os/os0file.c
+++ b/storage/xtradb/os/os0file.c
@@ -3817,7 +3817,8 @@ try_again:
 							       slot->pos,
 							       &dummy_mess1,
 							       &dummy_mess2,
-							       &dummy_type);
+							       &dummy_type,
+							       &space_id);
 
 				return(retval);
 			}
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))
   {