diff --git a/storage/ndb/src/kernel/blocks/dbtup/Undo_buffer.cpp b/storage/ndb/src/kernel/blocks/dbtup/Undo_buffer.cpp
index 0adbec7d57b..0e57bb7d0c3 100644
--- a/storage/ndb/src/kernel/blocks/dbtup/Undo_buffer.cpp
+++ b/storage/ndb/src/kernel/blocks/dbtup/Undo_buffer.cpp
@@ -25,12 +25,13 @@
 struct UndoPage
 {
   File_formats::Page_header m_page_header;
+  Uint32 _tupdata1;
   Uint32 m_state; // Used by buddy alg
   Uint32 m_words_used;
   Uint32 m_ref_count;
-  Uint32 m_data[GLOBAL_PAGE_SIZE_WORDS-3-(sizeof(File_formats::Page_header)>>2)];
+  Uint32 m_data[GLOBAL_PAGE_SIZE_WORDS-4-(sizeof(File_formats::Page_header)>>2)];
   
-  STATIC_CONST( DATA_WORDS = GLOBAL_PAGE_SIZE_WORDS-3-(sizeof(File_formats::Page_header)>>2) );
+  STATIC_CONST( DATA_WORDS = GLOBAL_PAGE_SIZE_WORDS-4-(sizeof(File_formats::Page_header)>>2) );
 };
 
 Undo_buffer::Undo_buffer(Dbtup* tup)
diff --git a/storage/ndb/src/kernel/blocks/suma/Suma.hpp b/storage/ndb/src/kernel/blocks/suma/Suma.hpp
index 913e16df8f2..68cd3499fde 100644
--- a/storage/ndb/src/kernel/blocks/suma/Suma.hpp
+++ b/storage/ndb/src/kernel/blocks/suma/Suma.hpp
@@ -557,7 +557,11 @@ private:
   
   struct Buffer_page 
   {
-    STATIC_CONST( DATA_WORDS = 8192 - 5);
+    STATIC_CONST( DATA_WORDS = 8192 - 9);
+    Uint32 _tupdata1;
+    Uint32 _tupdata2;
+    Uint32 _tupdata3;
+    Uint32 _tupdata4;
     Uint32 m_page_state;     // Used by TUP buddy algorithm
     Uint32 m_page_chunk_ptr_i;
     Uint32 m_next_page;