Commit 214fcab9 authored by unknown's avatar unknown

BUG#18594 ndb_restore log boken in 5.1

- corrected log read after fragment id addition

parent 52b0bb6e
......@@ -144,7 +144,7 @@ struct BackupFormat {
// If TriggerEvent & 0x10000 == true then GCI is right after data
Uint32 TriggerEvent;
Uint32 FragId;
Uint32 Data[1]; // Len = Length - 2
Uint32 Data[1]; // Len = Length - 3
};
};
......
......@@ -1036,7 +1036,7 @@ RestoreLogIterator::getNextLogEntry(int & res, bool *alloc_flag) {
m_logEntry.clear();
AttributeHeader * ah = (AttributeHeader *)&logE->Data[0];
AttributeHeader *end = (AttributeHeader *)&logE->Data[len - 2];
AttributeHeader *end = (AttributeHeader *)&logE->Data[len - 3];
AttributeS * attr;
m_logEntry.m_frag_id = ntohl(logE->FragId);
while(ah < end){
......
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