bk commit into 5.1 tree (jonas:1.2609)

[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-09-07 12:16:18+02:00, jonas@stripped +5 -0
  ndb - micro gcp
    Fix LqhTransConf wrt micro gcp
    (i.e add gci_lo)

  storage/ndb/include/kernel/signaldata/LqhTransConf.hpp@stripped, 2007-09-07 12:16:15+02:00,
jonas@stripped +3 -2
    Fix tc takeover to handle correct gci hi/lo

  storage/ndb/src/common/debugger/signaldata/LqhTrans.cpp@stripped, 2007-09-07 12:16:15+02:00,
jonas@stripped +2 -1
    Fix tc takeover to handle correct gci hi/lo

  storage/ndb/src/common/debugger/signaldata/PackedSignal.cpp@stripped, 2007-09-07
12:16:15+02:00, jonas@stripped +1 -1
    Fix tc takeover to handle correct gci hi/lo

  storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp@stripped, 2007-09-07 12:16:16+02:00,
jonas@stripped +2 -1
    Fix tc takeover to handle correct gci hi/lo

  storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp@stripped, 2007-09-07 12:16:16+02:00,
jonas@stripped +3 -1
    Fix tc takeover to handle correct gci hi/lo

diff -Nrup a/storage/ndb/include/kernel/signaldata/LqhTransConf.hpp
b/storage/ndb/include/kernel/signaldata/LqhTransConf.hpp
--- a/storage/ndb/include/kernel/signaldata/LqhTransConf.hpp	2006-12-23 20:20:05 +01:00
+++ b/storage/ndb/include/kernel/signaldata/LqhTransConf.hpp	2007-09-07 12:16:15 +02:00
@@ -35,7 +35,7 @@ class LqhTransConf {
 
   friend bool printLQH_TRANSCONF(FILE *, const Uint32 *, Uint32, Uint16);  
 public:
-  STATIC_CONST( SignalLength = 15 );
+  STATIC_CONST( SignalLength = 16 );
 private:
 
   /**
@@ -69,11 +69,12 @@ private:
   Uint32 lqhConnectPtr;
   Uint32 oldTcOpRec;
   Uint32 requestInfo;
-  Uint32 gci;
+  Uint32 gci_hi;
   Uint32 nextNodeId1;
   Uint32 nextNodeId2;
   Uint32 nextNodeId3;
   Uint32 tableId;
+  Uint32 gci_lo;
 
   /**
    * Getters
diff -Nrup a/storage/ndb/src/common/debugger/signaldata/LqhTrans.cpp
b/storage/ndb/src/common/debugger/signaldata/LqhTrans.cpp
--- a/storage/ndb/src/common/debugger/signaldata/LqhTrans.cpp	2006-12-23 20:20:10 +01:00
+++ b/storage/ndb/src/common/debugger/signaldata/LqhTrans.cpp	2007-09-07 12:16:15 +02:00
@@ -29,7 +29,8 @@ printLQH_TRANSCONF(FILE * output, const 
   fprintf(output, " lqhConnectPtr: %x\n", sig->lqhConnectPtr);
   fprintf(output, " oldTcOpRec: %x\n", sig->oldTcOpRec);
   fprintf(output, " requestInfo: %x\n", sig->requestInfo);
-  fprintf(output, " gci: %x\n", sig->gci);
+  fprintf(output, " gci_hi: %x\n", sig->gci_hi);
+  fprintf(output, " gci_lo: %x\n", sig->gci_lo);
   fprintf(output, " nextNodeId1: %x\n", sig->nextNodeId1);
   fprintf(output, " nextNodeId2: %x\n", sig->nextNodeId2);
   fprintf(output, " nextNodeId3: %x\n", sig->nextNodeId3);
diff -Nrup a/storage/ndb/src/common/debugger/signaldata/PackedSignal.cpp
b/storage/ndb/src/common/debugger/signaldata/PackedSignal.cpp
--- a/storage/ndb/src/common/debugger/signaldata/PackedSignal.cpp	2007-03-02 03:09:28
+01:00
+++ b/storage/ndb/src/common/debugger/signaldata/PackedSignal.cpp	2007-09-07 12:16:15
+02:00
@@ -29,7 +29,7 @@ printPACKED_SIGNAL(FILE * output, const 
   for (i = 0; i < len;) {
     switch (PackedSignal::getSignalType(theData[i])) {
     case ZCOMMIT: {
-      Uint32 signalLength = 4;
+      Uint32 signalLength = 5;
       fprintf(output, "--------------- Signal ----------------\n");
       fprintf(output, "r.bn: %u \"%s\", length: %u \"COMMIT\"\n", 
 	      receiverBlockNo, getBlockName(receiverBlockNo,""), signalLength);
diff -Nrup a/storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp
b/storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp
--- a/storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp	2007-09-07 07:29:59 +02:00
+++ b/storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp	2007-09-07 12:16:16 +02:00
@@ -18472,13 +18472,14 @@ void Dblqh::sendLqhTransconf(Signal* sig
   lqhTransConf->transId2        = tcConnectptr.p->transid[1];
   lqhTransConf->oldTcOpRec      = tcConnectptr.p->tcOprec;
   lqhTransConf->requestInfo     = reqInfo;
-  lqhTransConf->gci             = tcConnectptr.p->gci_hi;
+  lqhTransConf->gci_hi          = tcConnectptr.p->gci_hi;
   lqhTransConf->nextNodeId1     = tcConnectptr.p->nextReplica;
   lqhTransConf->nextNodeId2     = tcConnectptr.p->nodeAfterNext[0];
   lqhTransConf->nextNodeId3     = tcConnectptr.p->nodeAfterNext[1];
   lqhTransConf->apiRef          = tcConnectptr.p->applRef;
   lqhTransConf->apiOpRec        = tcConnectptr.p->applOprec;
   lqhTransConf->tableId         = tcConnectptr.p->tableref;
+  lqhTransConf->gci_lo          = tcConnectptr.p->gci_lo;
   sendSignal(tcNodeFailptr.p->newTcBlockref, GSN_LQH_TRANSCONF, 
 	     signal, LqhTransConf::SignalLength, JBB);
   tcNodeFailptr.p->tcRecNow = tcConnectptr.i + 1;
diff -Nrup a/storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp
b/storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp
--- a/storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp	2007-09-06 07:41:39 +02:00
+++ b/storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp	2007-09-07 12:16:16 +02:00
@@ -7384,13 +7384,15 @@ void Dbtc::execLQH_TRANSCONF(Signal* sig
   ttransid2    = lqhTransConf->transId2;
   ttcOprec     = lqhTransConf->oldTcOpRec;
   treqinfo     = lqhTransConf->requestInfo;
-  tgci         = Uint64(lqhTransConf->gci) << 32;
+  tgci         = Uint64(lqhTransConf->gci_hi) << 32;
   cnodes[0]    = lqhTransConf->nextNodeId1;
   cnodes[1]    = lqhTransConf->nextNodeId2;
   cnodes[2]    = lqhTransConf->nextNodeId3;
   const Uint32 ref = tapplRef = lqhTransConf->apiRef;
   tapplOprec   = lqhTransConf->apiOpRec;
   const Uint32 tableId = lqhTransConf->tableId;
+  Uint32 gci_lo = lqhTransConf->gci_lo;
+  tgci |= gci_lo;
 
   if (ttransStatus == LqhTransConf::LastTransConf){
     jam();