Commit 0a5a8a51 authored by unknown's avatar unknown

ndb - fix ndb_restore on solaris

  Fix alignment changes in tup page header


storage/ndb/src/kernel/blocks/dbtup/Undo_buffer.cpp:
  Fix alignment changes in tup page header
storage/ndb/src/kernel/blocks/suma/Suma.hpp:
  Fix alignment changes in tup page header
parent ec67a6a3
...@@ -25,12 +25,13 @@ ...@@ -25,12 +25,13 @@
struct UndoPage struct UndoPage
{ {
File_formats::Page_header m_page_header; File_formats::Page_header m_page_header;
Uint32 _tupdata1;
Uint32 m_state; // Used by buddy alg Uint32 m_state; // Used by buddy alg
Uint32 m_words_used; Uint32 m_words_used;
Uint32 m_ref_count; 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) Undo_buffer::Undo_buffer(Dbtup* tup)
......
...@@ -557,7 +557,11 @@ private: ...@@ -557,7 +557,11 @@ private:
struct Buffer_page 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_state; // Used by TUP buddy algorithm
Uint32 m_page_chunk_ptr_i; Uint32 m_page_chunk_ptr_i;
Uint32 m_next_page; Uint32 m_next_page;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment