bk commit into 5.0 tree (tomas:1.2412)

[tomas]

Below is the list of changes that have just been committed into a local
5.0 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.2412 07/03/23 13:10:58 tomas@stripped +2 -0
  Merge tulin@stripped:/home/bk/mysql-5.0-ndb
  into  poseidon.mysql.com:/home/tomas/mysql-5.0-ndb

  ndb/src/kernel/blocks/dbtc/DbtcMain.cpp
    1.108 07/03/23 13:10:49 tomas@stripped +0 -0
    Auto merged

  ndb/src/kernel/blocks/dbtc/Dbtc.hpp
    1.44 07/03/23 13:10:48 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.0-ndb/RESYNC

--- 1.43/ndb/src/kernel/blocks/dbtc/Dbtc.hpp	2007-03-08 18:46:32 +01:00
+++ 1.44/ndb/src/kernel/blocks/dbtc/Dbtc.hpp	2007-03-23 13:10:48 +01:00
@@ -1958,5 +1958,8 @@ private:
   // those variables should be removed and exchanged for stack
   // variable communication.
   /**************************************************************************/
+
+  Uint32 c_gcp_ref;
 };
+
 #endif

--- 1.107/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp	2007-03-08 18:46:32 +01:00
+++ 1.108/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp	2007-03-23 13:10:49 +01:00
@@ -6977,6 +6977,7 @@ next:  
 void Dbtc::execGCP_NOMORETRANS(Signal* signal) 
 {
   jamEntry();
+  c_gcp_ref = signal->theData[0];
   tcheckGcpId = signal->theData[1];
   if (cfirstgcp != RNIL) {
     jam();
@@ -10027,6 +10028,7 @@ void Dbtc::sendScanTabConf(Signal* signa
 
 void Dbtc::gcpTcfinished(Signal* signal) 
 {
+  signal->theData[0] = c_gcp_ref;
   signal->theData[1] = tcheckGcpId;
   sendSignal(cdihblockref, GSN_GCP_TCFINISHED, signal, 2, JBB);
 }//Dbtc::gcpTcfinished()