bk commit into 5.1 tree (tomas:1.2439)

[tomas]

Below is the list of changes that have just been committed into a local
5.1 repository of tomas. When tomas 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.2439 07/02/21 10:50:55 tomas@stripped +2 -0
  Merge tulin@stripped:/home/bk/mysql-5.1-telco
  into  poseidon.mysql.com:/home/tomas/mysql-5.1-telco-merge

  storage/ndb/test/run-test/daily-basic-tests.txt
    1.72 07/02/21 10:50:37 tomas@stripped +0 -0
    Auto merged

  storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp
    1.141 07/02/21 10:50:37 tomas@stripped +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:	tomas
# Host:	poseidon.mysql.com
# Root:	/home/tomas/mysql-5.1-telco-merge/RESYNC

--- 1.71/storage/ndb/test/run-test/daily-basic-tests.txt	2007-02-19 20:55:50 +07:00
+++ 1.72/storage/ndb/test/run-test/daily-basic-tests.txt	2007-02-21 10:50:37 +07:00
@@ -533,6 +533,10 @@ max-time: 1000
 cmd: testNodeRestart
 args: -n Bug26457 T1
 
+max-time: 1000
+cmd: testNodeRestart
+args: -n Bug26481 T1
+
 #
 # DICT TESTS
 max-time: 1500

--- 1.140/storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp	2007-02-16 21:05:59 +07:00
+++ 1.141/storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp	2007-02-21 10:50:37 +07:00
@@ -11943,7 +11943,7 @@ void Dblqh::execGCP_SAVEREQ(Signal* sign
     return;
   }
 
-  if (getNodeState().getNodeRestartInProgress())
+  if (getNodeState().getNodeRestartInProgress() && cstartRecReq == ZFALSE)
   {
     GCPSaveRef * const saveRef = (GCPSaveRef*)&signal->theData[0];
     saveRef->dihPtr = dihPtr;
@@ -11990,7 +11990,6 @@ void Dblqh::execGCP_SAVEREQ(Signal* sign
   }//if
   
   ndbrequire(ccurrentGcprec == RNIL);
-    
   ccurrentGcprec = 0;
   gcpPtr.i = ccurrentGcprec;
   ptrCheckGuard(gcpPtr, cgcprecFileSize, gcpRecord);