bk commit into 5.0 tree (jonas:1.1932)

[jonas]

Below is the list of changes that have just been committed into a local
5.0 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.1932 05/09/02 12:03:58 jonas@eel.(none) +5 -0
  Merge eel.(none):/home/jonas/src/mysql-4.1
  into  eel.(none):/home/jonas/src/mysql-5.0

  ndb/src/common/debugger/EventLogger.cpp
    1.22 05/09/02 12:03:54 jonas@eel.(none) +4 -7
    merge

  ndb/src/kernel/blocks/dbtc/DbtcMain.cpp
    1.82 05/09/02 11:57:26 jonas@eel.(none) +0 -0
    Auto merged

  ndb/src/kernel/blocks/dbdih/DbdihMain.cpp
    1.34 05/09/02 11:57:26 jonas@eel.(none) +0 -0
    Auto merged

  ndb/src/common/debugger/signaldata/SignalDataPrint.cpp
    1.11 05/09/02 11:57:26 jonas@eel.(none) +0 -0
    Auto merged

  ndb/include/kernel/signaldata/SignalData.hpp
    1.10 05/09/02 11:57:26 jonas@eel.(none) +0 -0
    Auto merged

# 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-5.0/RESYNC

--- 1.9/ndb/include/kernel/signaldata/SignalData.hpp	2005-01-19 08:14:46 +01:00
+++ 1.10/ndb/include/kernel/signaldata/SignalData.hpp	2005-09-02 11:57:26 +02:00
@@ -222,5 +222,6 @@
 
 GSN_PRINT_SIGNATURE(printCONTINUEB_NDBFS);
 GSN_PRINT_SIGNATURE(printCONTINUEB_DBDIH);
+GSN_PRINT_SIGNATURE(printSTART_FRAG_REQ);
 
 #endif

--- 1.21/ndb/src/common/debugger/EventLogger.cpp	2005-01-21 12:49:25 +01:00
+++ 1.22/ndb/src/common/debugger/EventLogger.cpp	2005-09-02 12:03:54 +02:00
@@ -33,7 +33,6 @@
   
 }
 
-
 #define QQQQ char *m_text, size_t m_text_len, const Uint32* theData
 
 void getTextConnected(QQQQ) {
@@ -434,10 +433,12 @@
 void getTextLCPFragmentCompleted(QQQQ) {
   BaseString::snprintf(m_text, m_text_len, 
 		       "Table ID = %u, fragment ID = %u has completed LCP "
-		       "on Node %u", 
+		       "on Node %u maxGciStarted: %d maxGciCompleted: %d", 
 		       theData[2], 
 		       theData[3], 
-		       theData[1]);
+		       theData[1],
+		       theData[4],
+		       theData[5]);
 }
 void getTextTransReportCounters(QQQQ) {
   // -------------------------------------------------------------------  

--- 1.10/ndb/src/common/debugger/signaldata/SignalDataPrint.cpp	2005-01-12 22:09:34 +01:00
+++ 1.11/ndb/src/common/debugger/signaldata/SignalDataPrint.cpp	2005-09-02 11:57:26 +02:00
@@ -198,6 +198,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.33/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp	2005-09-01 00:19:31 +02:00
+++ 1.34/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp	2005-09-02 11:57:26 +02:00
@@ -9673,6 +9673,9 @@
   }
 
   bool tableDone = reportLcpCompletion(lcpReport);
+  
+  Uint32 started = lcpReport->maxGciStarted;
+  Uint32 completed = lcpReport->maxGciCompleted;
 
   if(tableDone){
     jam();
@@ -9706,7 +9709,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;
@@ -10903,7 +10908,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];
@@ -10911,7 +10918,6 @@
       return;
     } else {
       jam();
-      ndbrequire(fmgReplicaPtr.p->lcpStatus[lcpNo] == ZINVALID);
       if (fmgReplicaPtr.p->createGci[0] == fmgReplicaPtr.p->initialGci) {
         jam();
 	/*-------------------------------------------------------------------

--- 1.81/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp	2005-08-22 10:59:21 +02:00
+++ 1.82/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp	2005-09-02 11:57:26 +02:00
@@ -4454,7 +4454,7 @@
    *------------------------------------------------------------------------*/
   tabortInd = ZFALSE;
   setupFailData(signal);
-  if (tabortInd == ZFALSE) {
+  if (false && tabortInd == ZFALSE) {
     jam();
     commitGciHandling(signal, Tgci);
     toCommitHandlingLab(signal);