database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-01-06 05:22:24 +03:00
Code Activity

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

Browse Source 
into  dev3-76.dev.cn.tlan:/home/dli/mysql/mysql-5.1/mysql-5.1-bug-20395
This commit is contained in:
unknown
2006-09-20 18:56:38 +08:00
parent 0c6793d82b ffee9fd40f
commit a159fb42e5
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -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);