From: Jonas Oreland
Date: August 18 2009 1:09pm
Subject: bzr commit into mysql-5.1-telco-6.3 branch (jonas:3012) Bug#44563
List-Archive: http://lists.mysql.com/commits/80985
X-Bug: 44563
Message-Id: <20090818130906.76C2778BA99@perch.localdomain>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="Boundary_(ID_TP20WYtrCsBCQj3z5Ic8Hg)"

--Boundary_(ID_TP20WYtrCsBCQj3z5Ic8Hg)
MIME-version: 1.0
Content-type: text/plain; CHARSET=US-ASCII
Content-transfer-encoding: 7BIT
Content-disposition: inline

#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);


--Boundary_(ID_TP20WYtrCsBCQj3z5Ic8Hg)
MIME-version: 1.0
Content-type: text/bzr-bundle; CHARSET=US-ASCII;
 name="bzr/jonas@stripped"
Content-transfer-encoding: 7BIT
Content-disposition: inline;
 filename="bzr/jonas@stripped"

# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: jonas@stripped
# target_branch: file:///home/jonas/src/telco-6.3/
# testament_sha1: 02caa000d5bb3db9898a028e62ec2ce0b750ad31
# timestamp: 2009-08-18 15:09:06 +0200
# source_branch: file:///home/jonas/src/63-local/
# base_revision_id: jonas@stripped
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWdXYE/AAAZ5fgEAQWWP//14S
gAC////4UAO5vKSdRVLbASSJTyaYhpPSn7Um00DIg8lD1MRoyCShEzKbSelNppPUw0jQAyAA00Gp
poJqYmRoGhoAGgaNBoNBgAAAAAAAAAAEkiaZE0wIZGRTyNTE9TEAAD8EMUrPyadfUNEa0OBIeLAq
U1ALJAvtgOFQcYnbulkE7iIgKaEP1Lc9kMyiiSHlLMm1TP10d4xNImkmM9G4uxC753yy91t2H1mf
Ns0M1RSbfc4RmmlyMhS0uvrKBHPU9XOFzPsZPDBvwkaKsbS70RXHOIDs2EydW99YnOgwKq/mnE0F
E4bqEh5EUEjzHkdDpaT1iqaTQZf5bN9dI6WyosQUkrCwaZFlIRyJboCNsB7YGAdVsqpurezJuKFs
Jv7imOZWWjTEnBOdwqaBrjKE6CNw8caiIQJEinDeeyB+RcyUtXjTtYgDFRIct0nuKhu1QNZrYTkT
8bjYzAjhJ7FErxNK6c45KczyFxVBRRptmMdZDIVzYmUlhyppwONVxHBPjbp9Okh7ToUKxMaG4Yyt
2Rx4JDwUjHI1QiXnf0FPAoFtYQ6l0bhhbi4mCfU/gmGU0iwIeBh6lbC+DGM/i0hIvJtVTIq2+p0g
+RxIznuSHFDDH8/Hc9vvl120UqzUQZD5o1TnP1MyAUGR/uBwPLfZWskTi/ms63lMffo8zzoFzyAs
q528jmO7N/WDofRNvxUm7hxFn2HAnPiHAmk2dYOzFbtnVI0MsmfyppIk5NkExqoLDAu0QKw1lVUZ
338JI4sR9wPYcfrpp8B5TCZ0pEi+B43buE7qWL0yJq5vLtkHErvCFtIHZUKGEuatPqaVnkYkT25X
mvVB67XP3uFyAf7DSfFZacs+9m2g1FpETidC8NNDiWy8RQNvQWG8JibWswqp7ZvnwA2geArjwIuM
BTn7hgx2HJpL47FDoMHoUWC94/y5IyrEUUy3FjEVl+BfXLgYKdEqQ1xUUrNQW176TAtJyrJYbP2k
SnZN8bBOFrGBZ0E4ffjC+Yh48pnWBBkbXJ18Y8xTgK/EkcGPA/t6R4Uo1BFYNWXRaTKIOkW27V6d
xKG4l0rjLKN160JGnPsU4WcY7fqrIKjF+Zk+aPeKpPljDAJiDE3J6nrWc840yRO+xb4MUnEBvnOn
ip7FzYpEaAoRVJ+vHpA46FsXdbcSWzmPO/XSGoJmIMq3HJHXc9u6ViJemtyr+V4HX3265HVTqRce
Y9ZHqpYtZze+K2kbEhvBZ1HLfCvK1Yf8XckU4UJDV2BPwA==


--Boundary_(ID_TP20WYtrCsBCQj3z5Ic8Hg)--