bzr commit into mysql-5.1-telco-6.3 branch (jonas:3012) Bug#44563

[Jonas Oreland]

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

 3012 Jonas Oreland	2009-08-18
      ndb - bug#44563 - remove obsolete warning message

    modified:
      storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp
=== modified file 'storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp'
--- a/storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp	2009-08-18 06:57:20 +0000
+++ b/storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp	2009-08-18 13:09:00 +0000
@@ -15950,15 +15950,7 @@ void Dbdih::execBLOCK_COMMIT_ORD(Signal*
   BlockCommitOrd* const block = (BlockCommitOrd *)&signal->theData[0];
 
   jamEntry();
-#if 0
-  ndbrequire(c_blockCommit == false || 
-	     c_blockCommitNo == block->failNo);
-#else
-  if(!(c_blockCommit == false || c_blockCommitNo == block->failNo)){
-    infoEvent("Possible bug in Dbdih::execBLOCK_COMMIT_ORD c_blockCommit = %d c_blockCommitNo = %d"
-	      " sig->failNo = %d", c_blockCommit, c_blockCommitNo, block->failNo);
-  }
-#endif
+
   c_blockCommit = true;
   c_blockCommitNo = block->failNo;
 }
@@ -15969,9 +15961,9 @@ void Dbdih::execUNBLOCK_COMMIT_ORD(Signa
 
   jamEntry();
   
-  if(c_blockCommit == true){
+  if(c_blockCommit == true)
+  {
     jam();
-    //    ndbrequire(c_blockCommitNo == unblock->failNo);
     
     c_blockCommit = false;
     emptyverificbuffer(signal, true);


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