bzr commit into mysql-5.1-telco-6.3 branch (jonas:3071)

[Jonas Oreland]

#At file:///home/jonas/src/telco-6.3/ based on revid:jonas@stripped

 3071 Jonas Oreland	2009-09-29
      ndb - fix some incorrect assertions, in debug-mode only

    modified:
      storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp
      storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp
=== modified file 'storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp'
--- a/storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp	2009-09-22 07:39:17 +0000
+++ b/storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp	2009-09-29 12:35:35 +0000
@@ -2953,7 +2953,7 @@ void Dblqh::sendCommitLqh(Signal* signal
   if (unlikely(!ndb_check_micro_gcp(getNodeInfo(Thostptr.i).m_version)))
   {
     jam();
-    ndbassert(gci_lo == 0 || getNodeInfo(Thostptr.i).m_connected == false);
+    ndbassert(gci_lo == 0 || getNodeInfo(Thostptr.i).m_version == 0);
     Thostptr.p->noOfPackedWordsLqh = pos + 4;
   }
 }//Dblqh::sendCommitLqh()

=== modified file 'storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp'
--- a/storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp	2009-09-21 08:30:42 +0000
+++ b/storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp	2009-09-29 12:35:35 +0000
@@ -4624,7 +4624,7 @@ void Dbtc::sendCommitLqh(Signal* signal,
   if (unlikely(!ndb_check_micro_gcp(getNodeInfo(Thostptr.i).m_version)))
   {
     jam();
-    ndbassert(Tdata5 == 0 || getNodeInfo(Thostptr.i).m_connected == false);
+    ndbassert(Tdata5 == 0 || getNodeInfo(Thostptr.i).m_version == 0);
     Thostptr.p->noOfPackedWordsLqh = Tindex + 4; // no gci_lo
   }
 }//Dbtc::sendCommitLqh()
@@ -12481,7 +12481,7 @@ void Dbtc::sendTcIndxConf(Signal* signal
   if (unlikely(!ndb_check_micro_gcp(getNodeInfo(localHostptr.i).m_version)))
   {
     jam();
-    ndbassert(Tpack6 == 0 || getNodeInfo(localHostptr.i).m_connected == false);
+    ndbassert(Tpack6 == 0 || getNodeInfo(localHostptr.i).m_version == 0);
   }
 }//Dbtc::sendTcIndxConf()
 


Attachment: [text/bzr-bundle] bzr/[e-mail]