bk commit into 4.1 tree (jonas:1.2409) BUG#10987

[jonas]

Below is the list of changes that have just been committed into a local
4.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
  1.2409 05/09/02 11:47:24 jonas@eel.(none) +5 -0
  ndb - bug #10987
    make sure not to cut log to early 
    (specificly not use LCP with maxGciStarted that has not yet completed)

  ndb/src/kernel/blocks/dbdih/DbdihMain.cpp
    1.25 05/09/02 11:47:09 jonas@eel.(none) +9 -3
    Add maxGciStarted/Completed to event report
    bug: dont use LCP for calcKeepGci in maxGciSTarted is not completed

  ndb/src/common/debugger/signaldata/StartRec.cpp
    1.2 05/09/02 11:47:08 jonas@eel.(none) +25 -0
    Add signal data printer for START_FRAG_REQ

  ndb/src/common/debugger/signaldata/SignalDataPrint.cpp
    1.9 05/09/02 11:47:08 jonas@eel.(none) +1 -0
    Add signal data printer for START_FRAG_REQ

  ndb/include/kernel/signaldata/StartFragReq.hpp
    1.2 05/09/02 11:47:08 jonas@eel.(none) +2 -0
    Add signal data printer for START_FRAG_REQ

  ndb/include/kernel/signaldata/SignalData.hpp
    1.8 05/09/02 11:47:08 jonas@eel.(none) +1 -0
    Add signal data printer for START_FRAG_REQ

# 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:	eel.(none)
# Root:	/home/jonas/src/mysql-4.1

--- 1.7/ndb/include/kernel/signaldata/SignalData.hpp	2004-10-21 21:01:54 +02:00
+++ 1.8/ndb/include/kernel/signaldata/SignalData.hpp	2005-09-02 11:47:08 +02:00
@@ -215,5 +215,6 @@
 
 GSN_PRINT_SIGNATURE(printCONTINUEB_NDBFS);
 GSN_PRINT_SIGNATURE(printCONTINUEB_DBDIH);
+GSN_PRINT_SIGNATURE(printSTART_FRAG_REQ);
 
 #endif

--- 1.1/ndb/include/kernel/signaldata/StartFragReq.hpp	2004-04-14 10:23:55 +02:00
+++ 1.2/ndb/include/kernel/signaldata/StartFragReq.hpp	2005-09-02 11:47:08 +02:00
@@ -32,6 +32,8 @@
 public:
   STATIC_CONST( SignalLength = 19 );
 
+  friend bool printSTART_FRAG_REQ(FILE *, const Uint32 *, Uint32, Uint16);
+  
 private:
   Uint32 userPtr;
   Uint32 userRef;

--- 1.8/ndb/src/common/debugger/signaldata/SignalDataPrint.cpp	2004-11-09 11:59:26 +01:00
+++ 1.9/ndb/src/common/debugger/signaldata/SignalDataPrint.cpp	2005-09-02 11:47:08 +02:00
@@ -195,6 +195,7 @@
   ,{ GSN_ACC_LOCKREQ, printACC_LOCKREQ }
   ,{ GSN_LQH_TRANSCONF, printLQH_TRANSCONF }
   ,{ GSN_SCAN_FRAGREQ, printSCAN_FRAGREQ }
+  ,{ GSN_START_FRAGREQ, printSTART_FRAG_REQ }
   ,{ 0, 0 }
 };
 

--- 1.1/ndb/src/common/debugger/signaldata/StartRec.cpp	2004-04-14 10:24:08 +02:00
+++ 1.2/ndb/src/common/debugger/signaldata/StartRec.cpp	2005-09-02 11:47:08 +02:00
@@ -17,6 +17,7 @@
 
 #include <RefConvert.hpp>
 #include <signaldata/StartRec.hpp>
+#include <signaldata/StartFragReq.hpp>
 
 bool
 printSTART_REC_REQ(FILE * output, 
@@ -49,4 +50,28 @@
 	  sig->startingNodeId);
 
   return true;
+}
+
+bool 
+printSTART_FRAG_REQ(FILE * output, 
+		    const Uint32 * theData, 
+		    Uint32 len, 
+		    Uint16 recBlockNo)
+{
+  StartFragReq* sig = (StartFragReq*)theData;
+
+  fprintf(output, " table: %d frag: %d lcpId: %d lcpNo: %d #nodes: %d \n",
+	  sig->tableId, sig->fragId, sig->lcpId, sig->lcpNo, 
+	  sig->noOfLogNodes);
+
+  for(Uint32 i = 0; i<sig->noOfLogNodes; i++)
+  {
+    fprintf(output, " (node: %d startGci: %d lastGci: %d)",
+	    sig->lqhLogNode[i],
+	    sig->startGci[i],
+	    sig->lastGci[i]);
+  }
+    
+  fprintf(output, "\n");
+  return true; 
 }

--- 1.24/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp	2005-08-31 16:14:58 +02:00
+++ 1.25/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp	2005-09-02 11:47:09 +02:00
@@ -9640,6 +9640,9 @@
   }
 
   bool tableDone = reportLcpCompletion(lcpReport);
+  
+  Uint32 started = lcpReport->maxGciStarted;
+  Uint32 completed = lcpReport->maxGciCompleted;
 
   if(tableDone){
     jam();
@@ -9673,7 +9676,9 @@
   signal->theData[1] = nodeId;
   signal->theData[2] = tableId;
   signal->theData[3] = fragId;
-  sendSignal(CMVMI_REF, GSN_EVENT_REP, signal, 4, JBB);
+  signal->theData[4] = started;
+  signal->theData[5] = completed;
+  sendSignal(CMVMI_REF, GSN_EVENT_REP, signal, 6, JBB);
 #endif
   
   bool ok = false;
@@ -10790,7 +10795,9 @@
   lcpNo = fmgReplicaPtr.p->nextLcp;
   do {
     ndbrequire(lcpNo < MAX_LCP_STORED);
-    if (fmgReplicaPtr.p->lcpStatus[lcpNo] == ZVALID) {
+    if (fmgReplicaPtr.p->lcpStatus[lcpNo] == ZVALID &&
+	fmgReplicaPtr.p->maxGciStarted[lcpNo] <= coldgcp)
+    {
       jam();
       keepGci = fmgReplicaPtr.p->maxGciCompleted[lcpNo];
       oldestRestorableGci = fmgReplicaPtr.p->maxGciStarted[lcpNo];
@@ -10798,7 +10805,6 @@
       return;
     } else {
       jam();
-      ndbrequire(fmgReplicaPtr.p->lcpStatus[lcpNo] == ZINVALID);
       if (fmgReplicaPtr.p->createGci[0] == fmgReplicaPtr.p->initialGci) {
         jam();
 	/*-------------------------------------------------------------------