Commit 106e90ed authored by unknown's avatar unknown

Merge dev3-138.dev.cn.tlan:/home/zhl/mysql/mysql-5.0/bug21799

into  dev3-138.dev.cn.tlan:/home/zhl/mysql/mysql-5.1/bug21799


sql/ha_ndbcluster.cc:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_view.cc:
  Auto merged
storage/ndb/src/mgmclient/CommandInterpreter.cpp:
  Auto merged
storage/ndb/src/ndbapi/NdbScanOperation.cpp:
  Auto merged
storage/ndb/src/ndbapi/ndberror.c:
  Auto merged
parents cbf40241 a51a8c1e
...@@ -525,6 +525,8 @@ int NdbScanOperation::nextResultImpl(bool fetchAllowed, bool forceSend) ...@@ -525,6 +525,8 @@ 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){
retVal = -1;
} else { } else {
idx = last; idx = last;
retVal = -2; //return_code; retVal = -2; //return_code;
...@@ -1436,7 +1438,11 @@ NdbIndexScanOperation::next_result_ordered(bool fetchAllowed, ...@@ -1436,7 +1438,11 @@ NdbIndexScanOperation::next_result_ordered(bool fetchAllowed,
continue; continue;
} }
if(DEBUG_NEXT_RESULT) ndbout_c("return -1"); if(DEBUG_NEXT_RESULT) ndbout_c("return -1");
setErrorCode(4028); if(return_code == -1){
setErrorCode(4008);
} else {
setErrorCode(4028);
}
return -1; return -1;
} }
......
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