Commit 894ec16b authored by unknown's avatar unknown
Browse files

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

into  perch.ndb.mysql.com:/home/jonas/src/51-jonas
parents a2e35a66 3fbc5ffe

storage/ndb/src/ndbapi/NdbScanOperation.cpp

+11 −3
Original line number Diff line number Diff line
@@ -478,10 +478,14 @@ int NdbScanOperation::nextResultImpl(bool fetchAllowed, bool forceSend) 
  */

  PollGuard poll_guard(tp, &theNdb->theImpl->theWaiter,

                       theNdb->theNdbBlockNumber);



  const Uint32 seq = theNdbCon->theNodeSequence;



  if(theError.code)

    return -1;

  {

    goto err4;

  }

  

  Uint32 seq = theNdbCon->theNodeSequence;

  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)

      setErrorCode(4028); // seq changed = Node fail

    break;

  case -4:

err4:

    setErrorCode(theError.code);

    break;

  }

    

  theNdbCon->theTransactionIsStarted = false;