bk commit into 5.1 tree (jonas:1.2615)

[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, 2007-08-28 15:42:33+02:00, jonas@stripped +2 -0
  ndb - micro gcp
    more compiler fixes

  storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp@stripped, 2007-08-28 15:42:31+02:00, jonas@stripped +25 -9
    more compile fixes

  storage/ndb/src/ndbapi/NdbEventOperationImpl.cpp@stripped, 2007-08-28 15:42:31+02:00, jonas@stripped +11 -9
    more compile fixes

# 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/telco-6.2-micro-commit

--- 1.138/storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp	2007-08-28 15:42:39 +02:00
+++ 1.139/storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp	2007-08-28 15:42:39 +02:00
@@ -481,6 +481,7 @@
     CopyGCIReq::CopyReason reason = (CopyGCIReq::CopyReason)signal->theData[1];
     ndbrequire(c_copyGCIMaster.m_copyReason == reason);
 
+#ifdef ERROR_INSERT
     if (reason == CopyGCIReq::GLOBAL_CHECKPOINT && ERROR_INSERTED(7189))
     {
       sendToRandomNodes("COPY_GCI", signal, &c_COPY_GCIREQ_Counter,
@@ -489,6 +490,7 @@
       sendSignalWithDelay(CMVMI_REF, GSN_NDB_TAMPER, signal, 1000, 1);
       return;
     }
+#endif
 
     sendLoopMacro(COPY_GCIREQ, sendCOPY_GCIREQ);
     return;
@@ -7984,6 +7986,7 @@
   m_micro_gcp.m_master_state = MicroGcp::M_GCP_PREPARE;
   signal->setTrace(TestOrd::TraceGlobalCheckpoint);
 
+#ifdef ERROR_INSERT
   if (ERROR_INSERTED(7186))
   {
     sendToRandomNodes("GCP_PREPARE",
@@ -7992,6 +7995,7 @@
     sendSignalWithDelay(CMVMI_REF, GSN_NDB_TAMPER, signal, 1000, 1);
     return;
   }
+#endif
 
   sendLoopMacro(GCP_PREPARE, sendGCP_PREPARE);
 }//Dbdih::startGcpLab()
@@ -8018,6 +8022,7 @@
 
   m_micro_gcp.m_master_state = MicroGcp::M_GCP_COMMIT;
 
+#ifdef ERROR_INSERT
   if (ERROR_INSERTED(7187))
   {
     sendToRandomNodes("GCP_COMMIT",
@@ -8026,6 +8031,7 @@
     sendSignalWithDelay(CMVMI_REF, GSN_NDB_TAMPER, signal, 1000, 1);
     return;
   }
+#endif
 
   sendLoopMacro(GCP_COMMIT, sendGCP_COMMIT);
   return;
@@ -8089,6 +8095,7 @@
     rep->gci = m_micro_gcp.m_old_gci >> 32;
 #endif
 
+#ifdef ERROR_INSERT
     if (ERROR_INSERTED(7190))
     {
       sendToRandomNodes("GCP_COMPLETE_REP", signal, 0, 0,
@@ -8100,6 +8107,7 @@
       sendSignalWithDelay(CMVMI_REF, GSN_NDB_TAMPER, signal, 1000, 1);
     }
     else
+#endif
     {
       NodeRecordPtr specNodePtr;
       specNodePtr.i = cfirstAliveNode;
@@ -8160,6 +8168,7 @@
   m_gcp_save.m_gci = m_micro_gcp.m_old_gci >> 32;
   m_gcp_save.m_start_time = now;
 
+#ifdef ERROR_INSERT
   if (ERROR_INSERTED(7188))
   {
     sendToRandomNodes("GCP_SAVE",
@@ -8168,6 +8177,7 @@
     sendSignalWithDelay(CMVMI_REF, GSN_NDB_TAMPER, signal, 1000, 1);
     return;
   }
+#endif
 
   sendLoopMacro(GCP_SAVEREQ, sendGCP_SAVEREQ);
   return;
@@ -8776,6 +8786,7 @@
   }
   c_copyGCIMaster.m_copyReason = reason;
 
+#ifdef ERROR_INSERT
   if (reason == CopyGCIReq::GLOBAL_CHECKPOINT && ERROR_INSERTED(7189))
   {
     sendToRandomNodes("COPY_GCI",
@@ -8784,6 +8795,7 @@
     sendSignalWithDelay(CMVMI_REF, GSN_NDB_TAMPER, signal, 1000, 1);
     return;
   }
+#endif
 
   sendLoopMacro(COPY_GCIREQ, sendCOPY_GCIREQ);
 
@@ -8824,6 +8836,7 @@
     break;
   }
   case CopyGCIReq::GLOBAL_CHECKPOINT:
+  {
     ok = true;
     jam();
     checkToCopyCompleted(signal);
@@ -8872,6 +8885,7 @@
     CRASH_INSERTION(7004);
     emptyWaitGCPMasterQueue(signal);    
     break;
+  }
   case CopyGCIReq::INITIAL_START_COMPLETED:
     ok = true;
     jam();
@@ -16180,15 +16194,17 @@
     goto do_send;
   }
 
-  Uint32 remove = (rand() % cnt);
-  if (remove == 0)
-    remove = 1;
-
-  for (Uint32 i = 0; i<remove; i++)
-  {
-    Uint32 i = rand() % nodes.size();
-    masked.set(nodes[i]);
-    nodes.erase(i);
+  {
+    Uint32 remove = (rand() % cnt);
+    if (remove == 0)
+      remove = 1;
+
+    for (Uint32 i = 0; i<remove; i++)
+    {
+      Uint32 i = rand() % nodes.size();
+      masked.set(nodes[i]);
+      nodes.erase(i);
+    }
   }
 
 do_send:

--- 1.98/storage/ndb/src/ndbapi/NdbEventOperationImpl.cpp	2007-08-28 15:42:39 +02:00
+++ 1.99/storage/ndb/src/ndbapi/NdbEventOperationImpl.cpp	2007-08-28 15:42:39 +02:00
@@ -1496,19 +1496,21 @@
     return;
   }
 
-  Uint64 last = m_known_gci[minpos];
-  MMASSERT(last > m_latestGCI);
-  MMASSERT(find_bucket(last) != 0);
-  MMASSERT(maxpos == m_max_gci_index);
-
-  minpos = (minpos + 1) & mask;
-  while (minpos != maxpos)
   {
-    MMASSERT(m_known_gci[minpos] > last);
-    last = m_known_gci[minpos];
+    Uint64 last = m_known_gci[minpos];
+    MMASSERT(last > m_latestGCI);
     MMASSERT(find_bucket(last) != 0);
     MMASSERT(maxpos == m_max_gci_index);
+
     minpos = (minpos + 1) & mask;
+    while (minpos != maxpos)
+    {
+      MMASSERT(m_known_gci[minpos] > last);
+      last = m_known_gci[minpos];
+      MMASSERT(find_bucket(last) != 0);
+      MMASSERT(maxpos == m_max_gci_index);
+      minpos = (minpos + 1) & mask;
+    }
   }
 
   {