bk commit into 5.1 tree (jonas:1.2117)

[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-03-16 15:24:35+01:00, jonas@stripped +4 -0
  Merge perch.ndb.mysql.com:/home/jonas/src/drop5
  into  perch.ndb.mysql.com:/home/jonas/src/drop6
  MERGE: 1.2071.1.50

  cluster_change_hist.txt@stripped, 2007-03-16 15:24:13+01:00, jonas@stripped +0 -1
    MERGE: 1.7.1.9

  configure.in@stripped, 2007-03-16 15:24:31+01:00, jonas@stripped +0 -2
    MERGE: 1.321.1.8

  storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp@stripped, 2007-03-16 15:23:58+01:00,
jonas@stripped +0 -0
    Auto merged
    MERGE: 1.89.1.4

  storage/ndb/src/kernel/blocks/ndbcntr/NdbcntrMain.cpp@stripped, 2007-03-16 15:23:58+01:00,
jonas@stripped +0 -0
    Auto merged
    MERGE: 1.28.1.1

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

--- 1.92/storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp	2007-03-16 15:24:38 +01:00
+++ 1.93/storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp	2007-03-16 15:24:38 +01:00
@@ -9573,6 +9573,15 @@
     closeCopyLab(signal);
     return;
   }//if
+
+  if (scanptr.p->scanState == ScanRecord::WAIT_LQHKEY_COPY &&
+      scanptr.p->scanErrorCounter)
+  {
+    jam();
+    closeCopyLab(signal);
+    return;
+  }
+  
   if (scanptr.p->scanState == ScanRecord::WAIT_LQHKEY_COPY) {
     jam();
 /*---------------------------------------------------------------------------*/
@@ -9649,13 +9658,16 @@
 void Dblqh::copyLqhKeyRefLab(Signal* signal) 
 {
   ndbrequire(tcConnectptr.p->transid[1] == signal->theData[4]);
-  tcConnectptr.p->copyCountWords -= signal->theData[3];
+  Uint32 copyWords = signal->theData[3];
   scanptr.i = tcConnectptr.p->tcScanRec;
   c_scanRecordPool.getPtr(scanptr);
   scanptr.p->scanErrorCounter++;
   tcConnectptr.p->errorCode = terrorCode;
-  closeCopyLab(signal);
-  return;
+  
+  LqhKeyConf* conf = (LqhKeyConf*)signal->getDataPtrSend();
+  conf->transId1 = copyWords;
+  conf->transId2 = tcConnectptr.p->transid[1];
+  copyCompletedLab(signal);
 }//Dblqh::copyLqhKeyRefLab()
 
 void Dblqh::closeCopyLab(Signal* signal) 
@@ -9666,6 +9678,7 @@
 // Wait until all of those have arrived until we start the
 // close process.
 /*---------------------------------------------------------------------------*/
+    scanptr.p->scanState = ScanRecord::WAIT_LQHKEY_COPY;
     jam();
     return;
   }//if

--- 1.29/storage/ndb/src/kernel/blocks/ndbcntr/NdbcntrMain.cpp	2007-03-16 15:24:38 +01:00
+++ 1.30/storage/ndb/src/kernel/blocks/ndbcntr/NdbcntrMain.cpp	2007-03-16 15:24:38 +01:00
@@ -190,6 +190,7 @@
     break;
 
   case SystemError::CopyFragRefError:
+    CRASH_INSERTION(1000);
     BaseString::snprintf(buf, sizeof(buf), 
 	     "Node %d killed this node because "
 	     "it could not copy a fragment during node restart. "