diff options
author | unknown <lzhou/root@dev3-138.dev.cn.tlan> | 2006-09-19 18:08:14 +0000 |
---|---|---|
committer | unknown <lzhou/root@dev3-138.dev.cn.tlan> | 2006-09-19 18:08:14 +0000 |
commit | 106e90edfa54cab7157b387877214f085163f0c7 (patch) | |
tree | 5c0671910e00b5541c2f82ab6520eaa7085869aa /storage/ndb | |
parent | cbf402410e172712f3c87ff467fc6277cf28d449 (diff) | |
parent | a51a8c1e655e2b6997fb6f1603ea6f063eb20e0b (diff) | |
download | mariadb-git-106e90edfa54cab7157b387877214f085163f0c7.tar.gz |
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
Diffstat (limited to 'storage/ndb')
-rw-r--r-- | storage/ndb/src/ndbapi/NdbScanOperation.cpp | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/storage/ndb/src/ndbapi/NdbScanOperation.cpp b/storage/ndb/src/ndbapi/NdbScanOperation.cpp index 21e4f215c65..0293e6927df 100644 --- a/storage/ndb/src/ndbapi/NdbScanOperation.cpp +++ b/storage/ndb/src/ndbapi/NdbScanOperation.cpp @@ -525,6 +525,8 @@ 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){ + retVal = -1; } else { idx = last; retVal = -2; //return_code; @@ -1436,7 +1438,11 @@ NdbIndexScanOperation::next_result_ordered(bool fetchAllowed, continue; } if(DEBUG_NEXT_RESULT) ndbout_c("return -1"); - setErrorCode(4028); + if(return_code == -1){ + setErrorCode(4008); + } else { + setErrorCode(4028); + } return -1; } |