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)
List-Archive: http://lists.mysql.com/commits/134205
Message-Id: <20110330070227.656A7218@fimafeng09.norway.sun.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============2170795474489234117=="

--===============2170795474489234117==
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

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


--===============2170795474489234117==
MIME-Version: 1.0
Content-Type: text/bzr-bundle; charset="us-ascii";
	name="bzr/ole.john.aske@stripped"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: ole.john.aske@stripped\
#   uchf4z4pj0newlr6
# target_branch: file:///net/fimafeng09/export/home/tmp/oleja/mysql\
#   /mysql-5.1-telco-7.0-spj-scan-scan/
# testament_sha1: fd8154ee6065b5ac44cb2c4f8a93aae624d51298
# timestamp: 2011-03-30 09:02:27 +0200
# source_branch: bzr+ssh://oaske@stripped/bzrroot/server\
#   /mysql-5.1-telco-7.0/
# base_revision_id: jonas@stripped
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWbmMK0wAAZBfgBAQcGf/93sx
/AC////wUAQW3nR7e3vEgD3sGhFMGgU8p6MNRNPRiT1MgwgMgBoiDammEaSep6R6hoyADI2poAAa
EaTRkmk/RQep6mmmCAeoAZqDIYaKepqZPJqAaNBk0GgAAAABJITUzQhkNMUwAlPaQ1MgPI0anlFd
t2CHuzCyFslley94INVMtL1T5QJfxrbsVm2cBmY9MiY18UM0I1eeboZ9faGi2i4M43ezlYHfAw/p
1cuFlDkIcKOzxIWu5SgyqzLzbTnbWSGQfkgFBxWKvFLrlYjHMENJb7Nsb+Jt9YZrsuvoJsaMYzTg
VqKTkyTW4OphAUurufUUhKZ0SsT8oyCvSMLMNOmHeINMntGwXscHkLTNUU5rKgQuDd9wIKXElx0S
TwGorqXYttDaKahvOt18OUFpJ9WX9iYsLn7Y5xZ8MCxhFartyCqFnGcO1a3/kmIvNLmVS00hTcaP
0Z5xRqdUgq52KLxodxGfZUVlMy4qhZqXXb92vuU11u5PTzLYXvxzfAuwrdNVJCqCP0IaKGDVVE0I
QydEQUGieuKEKcR5rSsI4HQxJCRTBY4FjjGDxStpPeUnTywhRYK5HMGVxFWBtnuBpomrmqjaIUmQ
Um0kosJCZKU4ZSJ7hrR70E5yjzY64m+aYBBAaIRvmoLAefPQGa5KizrYzGDZLMU4iwsgQGYPjKpc
R5PhGU49NmC4EOZiEIUkyIHWBRUnW24OVdo2dmrHAis47i2CKPc7arrrh/fO+6GjTnRTJeCU/Ee0
lR2xO+nQdWkPyPNvIMR5dtke2WnAaygw94uhiOgLO5ksmZvJfPWkQg5NugMSY1cTldZflnXAmXR8
Fifl4YDfXT1OIvQ+5NazGiZbylAw0ajQiKQZrwzlbPE5UYHXcsie12mkscJC9X9Q9BPojz+KHZA+
nVfLOeb1QSe2WsYEZUBsLukly93eOh2XPEp94/oeFwqlHJ7Viw638zO7mTl/rviZRj0Y8iNMypFR
wPTgnK4JS2GqYXReIH2LFtiPsxyXut9PhNPmymi/l8nUjGucnN3RGiBP3bL5sIplSSrCoq4RqvS8
dBXzPH+EnqpbdzNrq2sk7EKvHgudnz5hIJBByLD3qVaWVJxx44G2cyLmKTymh7pCMG5qTa8g7ZNN
MvZROkDURc9Kp6ey3so9IDg7j7+b4EewmeHKUtS0omZMunVQx1evZLvttLRtfhIFWlOvJ9P9jVrM
5m5HclYiAbXLcr95Ck30X2syeZDk22N4uUpbJbD/Jw+hSlSxMs4uQ8FNBRe6jGdH0p66DJwoU77o
WYECoHkbADJyaiUVUNIoSSEyNMWLEKwD/HEThecRpTkAfwPOACoMrL5OozaCRj2reK2hFhVaJjbx
UUiwNJSgioIspoaKRfHyN5UdSlbmzcfjP5n1VizXBlXa0Psy1zCcatVsFdYMsGOweArfIlc1Hn/4
u5IpwoSFzGFaYA==


--===============2170795474489234117==--