Commit 292e3031 authored by unknown's avatar unknown

Merge dev3-76.dev.cn.tlan:/home/dli/mysql/mysql-5.1/mysql-5.1-ndb-bj

into  dev3-76.dev.cn.tlan:/home/dli/mysql/mysql-5.1/mysql-5.1-bug-20395
parents 27f49667 07b8464f
...@@ -525,7 +525,7 @@ int NdbScanOperation::nextResultImpl(bool fetchAllowed, bool forceSend) ...@@ -525,7 +525,7 @@ int NdbScanOperation::nextResultImpl(bool fetchAllowed, bool forceSend)
int ret_code= poll_guard.wait_scan(3*timeout, nodeId, forceSend); int ret_code= poll_guard.wait_scan(3*timeout, nodeId, forceSend);
if (ret_code == 0 && seq == tp->getNodeSequence(nodeId)) { if (ret_code == 0 && seq == tp->getNodeSequence(nodeId)) {
continue; continue;
} else if(return_code == -1){ } else if(ret_code == -1){
retVal = -1; retVal = -1;
} else { } else {
idx = last; idx = last;
...@@ -1438,7 +1438,7 @@ NdbIndexScanOperation::next_result_ordered(bool fetchAllowed, ...@@ -1438,7 +1438,7 @@ NdbIndexScanOperation::next_result_ordered(bool fetchAllowed,
continue; continue;
} }
if(DEBUG_NEXT_RESULT) ndbout_c("return -1"); if(DEBUG_NEXT_RESULT) ndbout_c("return -1");
if(return_code == -1){ if(ret_code == -1){
setErrorCode(4008); setErrorCode(4008);
} else { } else {
setErrorCode(4028); setErrorCode(4028);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment