1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

BUG#18594 ndb_restore log boken in 5.1

Browse Source 
- corrected log read after fragment id addition
This commit is contained in:
tomas@poseidon.ndb.mysql.com 2006-04-20 22:04:09 +02:00
parent 6be87a41a2
commit 2bc490d42b
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
storage/ndb/src/kernel/blocks/backup/BackupFormat.hpp
View File

@ -144,7 +144,7 @@ struct BackupFormat {
// If TriggerEvent & 0x10000 == true then GCI is right after data // If TriggerEvent & 0x10000 == true then GCI is right after data
Uint32 TriggerEvent; Uint32 TriggerEvent;
Uint32 FragId; Uint32 FragId;
Uint32 Data[1]; // Len = Length - 2 Uint32 Data[1]; // Len = Length - 3
}; };
}; };

2
storage/ndb/tools/restore/Restore.cpp
View File

@ -1036,7 +1036,7 @@ RestoreLogIterator::getNextLogEntry(int & res, bool *alloc_flag) {
m_logEntry.clear(); m_logEntry.clear();
AttributeHeader * ah = (AttributeHeader *)&logE->Data[0]; AttributeHeader * ah = (AttributeHeader *)&logE->Data[0];
AttributeHeader *end = (AttributeHeader *)&logE->Data[len - 2]; AttributeHeader *end = (AttributeHeader *)&logE->Data[len - 3];
AttributeS * attr; AttributeS * attr;
m_logEntry.m_frag_id = ntohl(logE->FragId); m_logEntry.m_frag_id = ntohl(logE->FragId);
while(ah < end){ while(ah < end){