Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1-ndb

into mysql.com:/home/jonas/src/mysql-4.1-ndb


ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  Auto merged
ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
  Auto merged
ndb/src/kernel/blocks/dbtup/DbtupDebug.cpp:
  Auto merged
ndb/src/kernel/blocks/dbtup/DbtupSystemRestart.cpp:
  Auto merged

ndb/src/kernel/blocks/backup/Backup.hpp

@@ -696,6 +696,7 @@ Uint32 *
 Backup::OperationRecord::newVariableKey(Uint32 sz){
   attrLeft--;
   attrSzLeft = 0;
+  attrSzTotal += sz;
   
   dst = &dst_VariableData->Data[0];
   dst_VariableData->Sz = htonl(sz);
@@ -712,7 +713,7 @@ Backup::OperationRecord::finished(){
     return false;
   }
   
-  attrLen[opNoDone] = attrSzTotal;
+  attrLen[opNoDone] = attrSzTotal + sz_FixedKeys;
   opNoDone++;
   
   scanStop = dst = (Uint32 *)dst_VariableData;

ndb/src/kernel/blocks/dblqh/DblqhMain.cpp

@@ -8585,7 +8585,8 @@ void Dblqh::sendKeyinfo20(Signal* signal,
       return;
     }
     
-    EXECUTE_DIRECT(refToBlock(ref), GSN_KEYINFO20, signal, 3 + keyLen);
+    EXECUTE_DIRECT(refToBlock(ref), GSN_KEYINFO20, signal, 
+		   KeyInfo20::HeaderLength + keyLen);
     jamEntry();
     return;
   }