bk commit into 5.1 tree (jonas:1.1875)

[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
  1.1875 05/09/06 12:50:30 jonas@eel.(none) +4 -0
  Merge joreland@stripped:/home/bk/mysql-5.1
  into  eel.(none):/home/jonas/src/mysql-5.1-push

  storage/ndb/tools/ndb_condig.cpp
    1.9 05/09/06 12:50:25 jonas@eel.(none) +0 -0
    Auto merged

  storage/ndb/tools/Makefile.am
    1.22 05/09/06 12:50:25 jonas@eel.(none) +0 -0
    Auto merged

  storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp
    1.87 05/09/06 12:50:24 jonas@eel.(none) +0 -0
    Auto merged

  storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp
    1.35 05/09/06 12:50:24 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.1-push/RESYNC

--- 1.8/storage/ndb/tools/ndb_condig.cpp	2005-08-27 07:42:51 +02:00
+++ 1.9/storage/ndb/tools/ndb_condig.cpp	2005-09-06 12:50:25 +02:00
@@ -42,6 +42,7 @@
 static const char * g_row_delimiter=" ";
 
 int g_print_full_config, opt_ndb_shm;
+my_bool opt_core;
 
 typedef ndb_mgm_configuration_iterator Iter;
 

--- 1.34/storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp	2005-09-06 06:51:58 +02:00
+++ 1.35/storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp	2005-09-06 12:50:24 +02:00
@@ -9716,6 +9716,9 @@
   }
 
   bool tableDone = reportLcpCompletion(lcpReport);
+  
+  Uint32 started = lcpReport->maxGciStarted;
+  Uint32 completed = lcpReport->maxGciCompleted;
 
   if(tableDone){
     jam();
@@ -9749,7 +9752,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;
@@ -10946,7 +10951,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];
@@ -10954,7 +10961,6 @@
       return;
     } else {
       jam();
-      ndbrequire(fmgReplicaPtr.p->lcpStatus[lcpNo] == ZINVALID);
       if (fmgReplicaPtr.p->createGci[0] == fmgReplicaPtr.p->initialGci) {
         jam();
 	/*-------------------------------------------------------------------

--- 1.86/storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp	2005-08-27 07:42:50 +02:00
+++ 1.87/storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp	2005-09-06 12:50:24 +02:00
@@ -4454,7 +4454,7 @@
    *------------------------------------------------------------------------*/
   tabortInd = ZFALSE;
   setupFailData(signal);
-  if (tabortInd == ZFALSE) {
+  if (false && tabortInd == ZFALSE) {
     jam();
     commitGciHandling(signal, Tgci);
     toCommitHandlingLab(signal);