1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.1-jonas

Browse Source 
into  perch.ndb.mysql.com:/home/jonas/src/51-jonas
This commit is contained in:
jonas@perch.ndb.mysql.com 2006-06-09 12:17:00 +02:00
commit 246d76f154
1 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
storage/ndb/src/ndbapi/NdbScanOperation.cpp
View File

@ -478,10 +478,14 @@ int NdbScanOperation::nextResultImpl(bool fetchAllowed, bool forceSend)
*/ */
PollGuard poll_guard(tp, &theNdb->theImpl->theWaiter, PollGuard poll_guard(tp, &theNdb->theImpl->theWaiter,
theNdb->theNdbBlockNumber); theNdb->theNdbBlockNumber);
if(theError.code)
return -1;
Uint32 seq = theNdbCon->theNodeSequence; const Uint32 seq = theNdbCon->theNodeSequence;
if(theError.code)
{
goto err4;
}
if(seq == tp->getNodeSequence(nodeId) && send_next_scan(idx, false) == 0) if(seq == tp->getNodeSequence(nodeId) && send_next_scan(idx, false) == 0)
{ {
@ -564,6 +568,10 @@ int NdbScanOperation::nextResultImpl(bool fetchAllowed, bool forceSend)
if(theError.code == 0) if(theError.code == 0)
setErrorCode(4028); // seq changed = Node fail setErrorCode(4028); // seq changed = Node fail
break; break;
case -4:
err4:
setErrorCode(theError.code);
break;
} }
theNdbCon->theTransactionIsStarted = false; theNdbCon->theTransactionIsStarted = false;