bzr commit into mysql-5.1-telco-7.0 branch (jonas:4347)

[Jonas Oreland]

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

 4347 Jonas Oreland	2011-04-29
      ndb - fix a spj node-failure case, which broke with recent change to abort handling

    modified:
      storage/ndb/src/kernel/blocks/dbspj/DbspjMain.cpp
=== modified file 'storage/ndb/src/kernel/blocks/dbspj/DbspjMain.cpp'
--- a/storage/ndb/src/kernel/blocks/dbspj/DbspjMain.cpp	2011-03-29 06:50:49 +0000
+++ b/storage/ndb/src/kernel/blocks/dbspj/DbspjMain.cpp	2011-04-29 08:44:38 +0000
@@ -1583,8 +1583,6 @@ Dbspj::nodeFail(Signal* signal, Ptr<Requ
 {
   Uint32 cnt = 0;
   Uint32 iter = 0;
-  Uint32 outstanding = requestPtr.p->m_outstanding;
-  Uint32 aborting = requestPtr.p->m_state & Request::RS_ABORTING;
 
   {
     Ptr<TreeNode> nodePtr;
@@ -1623,12 +1621,6 @@ Dbspj::nodeFail(Signal* signal, Ptr<Requ
   {
     jam();
     abort(signal, requestPtr, DbspjErr::NodeFailure);
-
-    if (aborting && outstanding && requestPtr.p->m_outstanding == 0)
-    {
-      jam();
-      checkBatchComplete(signal, requestPtr, 0);
-    }
   }
 
   return cnt + iter;


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