Fix compile errors:

- from xtradb merge - portability error in bitmap-t.c ( variable size array in non-portable)

Fix compile errors:
- from xtradb merge - portability error in bitmap-t.c ( variable size array in non-portable)
e6926b06 · Vladislav Vaintroub · 90e058e0 · e6926b06 · e6926b06
Commit e6926b06 authored May 02, 2011 by Vladislav Vaintroub
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 2 deletions

storage/xtradb/os/os0file.c storage/xtradb/os/os0file.c +2 -1

unittest/mysys/bitmap-t.c unittest/mysys/bitmap-t.c +1 -1

No files found.
--- 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);
 			}

--- 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))
  {