bk commit into 5.1 tree (jonas:1.2694) BUG#33895

[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, 2008-01-23 07:52:25+01:00, jonas@stripped +1 -0
  ndb - bug#33895
    Fix upgrade bug(wo/ -> w/ micro gcp) with more than one packed tckeyconf in a
API_PACKED signal

  storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp@stripped, 2008-01-23 07:52:23+01:00,
jonas@stripped +0 -2
    ndb - bug#33895
      Fix upgrade bug(wo/ -> w/ micro gcp) with more than one packed tckeyconf in a
API_PACKED signal

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	2008-01-08 15:19:38 +01:00
+++ b/storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp	2008-01-23 07:52:23 +01:00
@@ -4109,7 +4109,6 @@ void Dbtc::sendtckeyconf(Signal* signal,
   {
     jam();
     ndbassert(Tpack6 == 0 || getNodeInfo(localHostptr.i).m_connected == false);
-    localHostptr.p->noOfWordsTCKEYCONF = TcurrLen + TpacketLen; // no gci_lo
   }
 }//Dbtc::sendtckeyconf()
 
@@ -12191,7 +12190,6 @@ void Dbtc::sendTcIndxConf(Signal* signal
   {
     jam();
     ndbassert(Tpack6 == 0 || getNodeInfo(localHostptr.i).m_connected == false);
-    localHostptr.p->noOfWordsTCINDXCONF = TcurrLen + TpacketLen; // no gci_lo
   }
 }//Dbtc::sendTcIndxConf()