List:Commits« Previous MessageNext Message »
From:jonas Date:January 14 2006 10:51am
Subject:bk commit into 5.1 tree (jonas:1.2057)
View as plain text  
Below is the list of changes that have just been committed into a local
5.1 repository of jonas. When jonas does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet
  1.2057 06/01/14 11:51:12 jonas@stripped +2 -0
  ndb - fix ndb_restore on solaris
    Fix alignment changes in tup page header

  storage/ndb/src/kernel/blocks/suma/Suma.hpp
    1.9 06/01/14 11:51:09 jonas@stripped +5 -1
    Fix alignment changes in tup page header

  storage/ndb/src/kernel/blocks/dbtup/Undo_buffer.cpp
    1.3 06/01/14 11:51:09 jonas@stripped +3 -2
    Fix alignment changes in tup page header

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	jonas
# Host:	perch.ndb.mysql.com
# Root:	/home/jonas/src/51-new

--- 1.2/storage/ndb/src/kernel/blocks/dbtup/Undo_buffer.cpp	2006-01-11 09:26:03 +01:00
+++ 1.3/storage/ndb/src/kernel/blocks/dbtup/Undo_buffer.cpp	2006-01-14 11:51:09 +01:00
@@ -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)

--- 1.8/storage/ndb/src/kernel/blocks/suma/Suma.hpp	2006-01-12 19:50:35 +01:00
+++ 1.9/storage/ndb/src/kernel/blocks/suma/Suma.hpp	2006-01-14 11:51:09 +01:00
@@ -557,7 +557,11 @@
   
   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;      
Thread
bk commit into 5.1 tree (jonas:1.2057)jonas17 Jan