bk commit into 5.1 tree (jonas:1.2350) BUG#24914

[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, 2006-12-08 16:15:59+01:00, jonas@stripped +3 -0
  ndb - bug#24914
    Fix start transaction with hint from ndbapi

  storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp@stripped, 2006-12-08 16:15:57+01:00,
jonas@stripped +1 -1
    Fix fragments array for API

  storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp@stripped, 2006-12-08 16:15:57+01:00,
jonas@stripped +1 -1
    Fix fragments array for API

  storage/ndb/src/ndbapi/NdbDictionaryImpl.cpp@stripped, 2006-12-08 16:15:58+01:00,
jonas@stripped +7 -2
    Fix fragments array for API

# 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:	jonas
# Host:	perch.ndb.mysql.com
# Root:	/home/jonas/src/51-work

--- 1.109/storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp	2006-12-08 16:16:05 +01:00
+++ 1.110/storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp	2006-12-08 16:16:05 +01:00
@@ -479,7 +479,7 @@
 		   CreateFragmentationReq::SignalLength);
     ndbrequire(signal->theData[0] == 0);
     Uint16 *data = (Uint16*)&signal->theData[25];
-    Uint32 count = 2 + data[0] * data[1];
+    Uint32 count = 2 + (1 + data[0]) * data[1];
     w.add(DictTabInfo::ReplicaDataLen, 2*count);
     for (Uint32 i = 0; i < count; i++)
       data[i] = htons(data[i]);

--- 1.93/storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp	2006-12-08 16:16:05 +01:00
+++ 1.94/storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp	2006-12-08 16:16:05 +01:00
@@ -6728,7 +6728,7 @@
         FragmentstorePtr fragPtr;
         ReplicaRecordPtr replicaPtr;
         getFragstore(primTabPtr.p, fragNo, fragPtr);
-	fragments[count++] = c_nextLogPart++;
+	fragments[count++] = fragPtr.p->m_log_part_id;
         fragments[count++] = fragPtr.p->preferredPrimary;
         for (replicaPtr.i = fragPtr.p->storedReplicas;
              replicaPtr.i != RNIL;

--- 1.154/storage/ndb/src/ndbapi/NdbDictionaryImpl.cpp	2006-12-08 16:16:05 +01:00
+++ 1.155/storage/ndb/src/ndbapi/NdbDictionaryImpl.cpp	2006-12-08 16:16:05 +01:00
@@ -2191,9 +2191,14 @@
     impl->m_replicaCount = replicaCount;
     impl->m_fragmentCount = fragCount;
     DBUG_PRINT("info", ("replicaCount=%x , fragCount=%x",replicaCount,fragCount));
-    for(i = 0; i < (Uint32) (fragCount*replicaCount); i++)
+    Uint32 pos = 2;
+    for(i = 0; i < (Uint32) fragCount;i++)
     {
-      impl->m_fragments.push_back(ntohs(tableDesc->ReplicaData[i+2]));
+      pos++; // skip logpart
+      for (Uint32 j = 0; j<(Uint32)replicaCount; j++)
+      {
+	impl->m_fragments.push_back(ntohs(tableDesc->ReplicaData[pos++]));
+      }
     }
 
     Uint32 topBit = (1 << 31);