bk commit into 5.1 tree (tomas:1.2373) BUG#18594

[tomas]

Below is the list of changes that have just been committed into a local
5.1 repository of tomas. When tomas does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet
  1.2373 06/04/20 22:04:09 tomas@stripped +2 -0
  BUG#18594 ndb_restore log boken in 5.1
  - corrected log read after fragment id addition

  storage/ndb/tools/restore/Restore.cpp
    1.36 06/04/20 22:04:02 tomas@stripped +1 -1
    BUG#18594 ndb_restore log boken in 5.1
    - corrected log read after fragment id addition

  storage/ndb/src/kernel/blocks/backup/BackupFormat.hpp
    1.6 06/04/20 22:04:02 tomas@stripped +1 -1
    BUG#18594 ndb_restore log boken in 5.1
    - corrected log read after fragment id addition

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	tomas
# Host:	poseidon.ndb.mysql.com
# Root:	/home/tomas/mysql-5.1-new

--- 1.5/storage/ndb/src/kernel/blocks/backup/BackupFormat.hpp	2006-01-17 09:24:52 +01:00
+++ 1.6/storage/ndb/src/kernel/blocks/backup/BackupFormat.hpp	2006-04-20 22:04:02 +02:00
@@ -144,7 +144,7 @@
       // 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
     };
   };
 

--- 1.35/storage/ndb/tools/restore/Restore.cpp	2006-03-23 04:56:54 +01:00
+++ 1.36/storage/ndb/tools/restore/Restore.cpp	2006-04-20 22:04:02 +02:00
@@ -1036,7 +1036,7 @@
   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){