Commit e02ee413 authored by joreland@mysql.com's avatar joreland@mysql.com

Fixed ndb backup bug

parent 1a557525
...@@ -696,6 +696,7 @@ Uint32 * ...@@ -696,6 +696,7 @@ Uint32 *
Backup::OperationRecord::newVariableKey(Uint32 sz){ Backup::OperationRecord::newVariableKey(Uint32 sz){
attrLeft--; attrLeft--;
attrSzLeft = 0; attrSzLeft = 0;
attrSzTotal += sz;
dst = &dst_VariableData->Data[0]; dst = &dst_VariableData->Data[0];
dst_VariableData->Sz = htonl(sz); dst_VariableData->Sz = htonl(sz);
...@@ -712,7 +713,7 @@ Backup::OperationRecord::finished(){ ...@@ -712,7 +713,7 @@ Backup::OperationRecord::finished(){
return false; return false;
} }
attrLen[opNoDone] = attrSzTotal; attrLen[opNoDone] = attrSzTotal + sz_FixedKeys;
opNoDone++; opNoDone++;
scanStop = dst = (Uint32 *)dst_VariableData; scanStop = dst = (Uint32 *)dst_VariableData;
......
...@@ -8569,7 +8569,8 @@ void Dblqh::sendKeyinfo20(Signal* signal, ...@@ -8569,7 +8569,8 @@ void Dblqh::sendKeyinfo20(Signal* signal,
return; return;
} }
EXECUTE_DIRECT(refToBlock(ref), GSN_KEYINFO20, signal, 3 + keyLen); EXECUTE_DIRECT(refToBlock(ref), GSN_KEYINFO20, signal,
KeyInfo20::HeaderLength + keyLen);
jamEntry(); jamEntry();
return; return;
} }
......
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