bk commit into 5.1 tree (jonas:1.2576)

[jonas]

Below is the list of changes that have just been committed into a local
5.1 repository of jonas.  When jonas 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@stripped, 2008-03-28 18:45:34+01:00, jonas@stripped +1 -0
  fix automerge error

  storage/ndb/src/ndbapi/NdbScanOperation.cpp@stripped, 2008-03-28 18:45:31+01:00, jonas@stripped +1 -1
    fix automerge error

diff -Nrup a/storage/ndb/src/ndbapi/NdbScanOperation.cpp b/storage/ndb/src/ndbapi/NdbScanOperation.cpp
--- a/storage/ndb/src/ndbapi/NdbScanOperation.cpp	2008-03-28 10:19:15 +01:00
+++ b/storage/ndb/src/ndbapi/NdbScanOperation.cpp	2008-03-28 18:45:31 +01:00
@@ -1770,7 +1770,7 @@ NdbIndexScanOperation::ndbrecord_insert_
   /* Insert attribute header. */
   Uint32 tIndexAttrId= column->index_attrId;
   Uint32 sizeInWords= (len + 3) / 4;
-  AttributeHeader ah(tIndexAttrId, sizeInWords << 2);
+  AttributeHeader ah(tIndexAttrId, len);
   const Uint32 ahValue= ah.m_value;
   const bool aligned= (UintPtr(aValue) & 3) == 0;