bk commit into 5.1 tree (jonas:1.2691)

[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-08 15:19:41+01:00, jonas@stripped +2 -0
  ndb - micro gcp
    correct assertion that sometimes fire during disconnect

  storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp@stripped, 2008-01-08 15:19:38+01:00, jonas@stripped +1 -1
    correct assertion

  storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp@stripped, 2008-01-08 15:19:38+01:00, jonas@stripped +3 -3
    correct assertion

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-12-03 14:32:37 +01:00
+++ b/storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp	2008-01-08 15:19:38 +01:00
@@ -2842,7 +2842,7 @@ void Dblqh::sendCommitLqh(Signal* signal
   if (unlikely(!ndb_check_micro_gcp(getNodeInfo(Thostptr.i).m_version)))
   {
     jam();
-    ndbassert(gci_lo == 0);
+    ndbassert(gci_lo == 0 || getNodeInfo(Thostptr.i).m_connected == false);
     Thostptr.p->noOfPackedWordsLqh = pos + 4;
   }
 }//Dblqh::sendCommitLqh()
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-12-13 21:34:23 +01:00
+++ b/storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp	2008-01-08 15:19:38 +01:00
@@ -4108,7 +4108,7 @@ void Dbtc::sendtckeyconf(Signal* signal,
   if (unlikely(!ndb_check_micro_gcp(getNodeInfo(localHostptr.i).m_version)))
   {
     jam();
-    ndbassert(Tpack6 == 0);
+    ndbassert(Tpack6 == 0 || getNodeInfo(localHostptr.i).m_connected == false);
     localHostptr.p->noOfWordsTCKEYCONF = TcurrLen + TpacketLen; // no gci_lo
   }
 }//Dbtc::sendtckeyconf()
@@ -4579,7 +4579,7 @@ void Dbtc::sendCommitLqh(Signal* signal,
   if (unlikely(!ndb_check_micro_gcp(getNodeInfo(Thostptr.i).m_version)))
   {
     jam();
-    ndbassert(Tdata5 == 0);
+    ndbassert(Tdata5 == 0 || getNodeInfo(Thostptr.i).m_connected == false);
     Thostptr.p->noOfPackedWordsLqh = Tindex + 4; // no gci_lo
   }
 }//Dbtc::sendCommitLqh()
@@ -12190,7 +12190,7 @@ void Dbtc::sendTcIndxConf(Signal* signal
   if (unlikely(!ndb_check_micro_gcp(getNodeInfo(localHostptr.i).m_version)))
   {
     jam();
-    ndbassert(Tpack6 == 0);
+    ndbassert(Tpack6 == 0 || getNodeInfo(localHostptr.i).m_connected == false);
     localHostptr.p->noOfWordsTCINDXCONF = TcurrLen + TpacketLen; // no gci_lo
   }
 }//Dbtc::sendTcIndxConf()