List:Commits« Previous MessageNext Message »
From:Ole John Aske Date:March 30 2011 7:02am
Subject:bzr commit into mysql-5.1-telco-7.0-spj-scan-vs-scan branch
(ole.john.aske:3458)
View as plain text  
#At file:///net/fimafeng09/export/home/tmp/oleja/mysql/mysql-5.1-telco-7.0-spj-scan-scan/ based on revid:jonas@stripped

 3458 Ole John Aske	2011-03-30
      SPJ: Fixed error handling in ::closeTcCursor() while waiting for a cursor to be (forcefully) closed
      
      If there was a node failure while waiting for close to be confirmed, we would call
      setFetchTerminated() twice - which is an error and would cause an assert to fire.

    modified:
      storage/ndb/src/ndbapi/NdbQueryOperation.cpp
=== modified file 'storage/ndb/src/ndbapi/NdbQueryOperation.cpp'
--- a/storage/ndb/src/ndbapi/NdbQueryOperation.cpp	2011-02-24 14:16:51 +0000
+++ b/storage/ndb/src/ndbapi/NdbQueryOperation.cpp	2011-03-30 07:02:22 +0000
@@ -2955,7 +2955,7 @@ NdbQueryImpl::closeTcCursor(bool forceSe
 
       if (unlikely(impl->getNodeSequence(nodeId) != seq))
         setFetchTerminated(Err_NodeFailCausedAbort,false);
-      if (unlikely(result != FetchResult_ok))
+      else if (unlikely(result != FetchResult_ok))
       {
         if (result == FetchResult_timeOut)
           setFetchTerminated(Err_ReceiveTimedOut,false);


Attachment: [text/bzr-bundle] bzr/ole.john.aske@oracle.com-20110330070222-uchf4z4pj0newlr6.bundle
Thread
bzr commit into mysql-5.1-telco-7.0-spj-scan-vs-scan branch(ole.john.aske:3458) Ole John Aske30 Mar