bk commit into 5.1 tree (jonas:1.2264) BUG#21478

[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-08-07 14:32:43+02:00, jonas@stripped +1 -0
  ndb - bug#21478
    make fragment logpart in DIH "global"

  storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp@stripped, 2006-08-07 14:32:41+02:00,
jonas@stripped +7 -4
    Store logpart id in FRAGMENTATION as it goes very bad if 
      they differ on different nodes, as they are copied from master
      on node/system -restart

# 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.76/storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp	2006-08-07 14:32:47 +02:00
+++ 1.77/storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp	2006-08-07 14:32:47 +02:00
@@ -6628,6 +6628,7 @@
         ptrCheckGuard(NGPtr, MAX_NDB_NODES, nodeGroupRecord);
         const Uint32 max = NGPtr.p->nodeCount;
 	
+	fragments[count++] = c_nextLogPart++; // Store logpart first
 	Uint32 tmp= next_replica_node[NGPtr.i];
         for(Uint32 replicaNo = 0; replicaNo < noOfReplicas; replicaNo++)
         {
@@ -6674,7 +6675,8 @@
         FragmentstorePtr fragPtr;
         ReplicaRecordPtr replicaPtr;
         getFragstore(primTabPtr.p, fragNo, fragPtr);
-        fragments[count++]= fragPtr.p->preferredPrimary;
+	fragments[count++] = c_nextLogPart++;
+        fragments[count++] = fragPtr.p->preferredPrimary;
         for (replicaPtr.i = fragPtr.p->storedReplicas;
              replicaPtr.i != RNIL;
              replicaPtr.i = replicaPtr.p->nextReplica) {
@@ -6697,7 +6699,7 @@
         }
       }
     }
-    ndbrequire(count == (2U + noOfReplicas * noOfFragments)); 
+    ndbrequire(count == (2U + (1 + noOfReplicas) * noOfFragments)); 
     
     CreateFragmentationConf * const conf = 
       (CreateFragmentationConf*)signal->getDataPtrSend();
@@ -6870,8 +6872,8 @@
     FragmentstorePtr fragPtr;
     Uint32 activeIndex = 0;
     getFragstore(tabPtr.p, fragId, fragPtr);
+    fragPtr.p->m_log_part_id = fragments[index++];
     fragPtr.p->preferredPrimary = fragments[index];
-    fragPtr.p->m_log_part_id = c_nextLogPart++;
     
     for (Uint32 i = 0; i<noReplicas; i++) {
       const Uint32 nodeId = fragments[index++];
@@ -8543,7 +8545,8 @@
   else
   {
     char buf[256];
-    BaseString::snprintf(buf, "Error opening DIH schema files for table: %d",
+    BaseString::snprintf(buf, sizeof(buf), 
+		         "Error opening DIH schema files for table: %d",
 			 tabPtr.i);
     progError(__LINE__, NDBD_EXIT_AFS_NO_SUCH_FILE, buf);
   }