bk commit into 5.1 tree (jonas:1.2068)

[jonas]

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.2068 06/02/06 07:30:12 jonas@eel.(none) +1 -0
  ndb 
    Fix for wierd var key restore problem

  storage/ndb/src/kernel/blocks/restore.cpp
    1.4 06/02/06 07:30:07 jonas@eel.(none) +5 -5
    Fix? for wierd var key restore problem

# 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:	eel.(none)
# Root:	/home/jonas/src/mysql-5.1-new

--- 1.3/storage/ndb/src/kernel/blocks/restore.cpp	2006-01-15 20:45:04 +01:00
+++ 1.4/storage/ndb/src/kernel/blocks/restore.cpp	2006-02-06 07:30:07 +01:00
@@ -790,7 +790,7 @@
   DataBuffer<15> variable(m_databuffer_pool);
   
   Uint32 null_offset = 0;
-  union { Column c; Uint32 _align[1];};
+  union { Column c; Uint32 _align[2];};
   for(Uint32 i = 0; i<tmpTab.NoOfAttributes; i++) {
     jam();
     DictTabInfo::Attribute tmp; tmp.init();
@@ -809,7 +809,7 @@
     
     union {
       Column c;
-      Uint32 _align[1];
+      Uint32 _align[2];
     };
     c.m_id = tmp.AttributeId;
     c.m_size = sz32;
@@ -935,11 +935,12 @@
   Uint32 *attrData = attr_start;
   union {
     Column c;
-    Uint32 _align[1];
+    Uint32 _align[2];
   };
   bool disk = false;
   bool rowid = false;
   bool gci = false;
+  Uint32 tableId = file_ptr.p->m_table_id;
 
   Uint64 gci_val;
   Local_key rowid_val;
@@ -998,7 +999,7 @@
 
     Uint32 sz32 = (sz + 3) >> 2;
     ndbassert(c.m_flags & (Column::COL_VAR | Column::COL_NULL));
-    if(c.m_flags & Column::COL_KEY)
+    if (c.m_flags & Column::COL_KEY)
     {
       memcpy(keyData, data, 4 * sz32);
       keyData += sz32;
@@ -1019,7 +1020,6 @@
   Uint32 attrLen = attrData - attr_start;
   LqhKeyReq * req = (LqhKeyReq *)signal->getDataPtrSend();
   
-  Uint32 tableId = file_ptr.p->m_table_id;
   const KeyDescriptor* desc = g_key_descriptor_pool.getPtr(tableId);
   if (desc->noOfKeyAttr != desc->noOfVarKeys)
   {