Commit bcdc77b3 authored by unknown's avatar unknown
Browse files

Fixed ndb backup bug 


ndb/src/kernel/blocks/backup/Backup.hpp:
  SCAN_FRAGCONF contains length of key(s) aswell
ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  Send correct signal length
parent 689f4f27

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

+2 −1
Original line number Diff line number Diff line
@@ -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

+2 −1
Original line number Diff line number Diff line
@@ -8569,7 +8569,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;

  }