Merge dev3-76.dev.cn.tlan:/home/dli/mysql/mysql-5.1/mysql-5.1-ndb-bj (a159fb42) · Commits · Software / OSDI20 Artifacts / mariadb

storage/ndb/src/ndbapi/NdbScanOperation.cpp

+2 −2

Original line number	Diff line number	Diff line
		@@ -525,7 +525,7 @@ int NdbScanOperation::nextResultImpl(bool fetchAllowed, bool forceSend)
		int ret_code= poll_guard.wait_scan(3*timeout, nodeId, forceSend);
		if (ret_code == 0 && seq == tp->getNodeSequence(nodeId)) {
		continue;
		} else if(return_code == -1){
		} else if(ret_code == -1){
		retVal = -1;
		} else {
		idx = last;
		@@ -1438,7 +1438,7 @@ NdbIndexScanOperation::next_result_ordered(bool fetchAllowed,
		continue;
		}
		if(DEBUG_NEXT_RESULT) ndbout_c("return -1");
		if(return_code == -1){
		if(ret_code == -1){
		setErrorCode(4008);
		} else {
		setErrorCode(4028);