diff options
| author | unknown <tomas@poseidon.ndb.mysql.com> | 2005-11-24 14:57:14 +0100 |
|---|---|---|
| committer | unknown <tomas@poseidon.ndb.mysql.com> | 2005-11-24 14:57:14 +0100 |
| commit | 705965362d3b1ec4f1142aaaa9cf022fc7b7c647 (patch) | |
| tree | 39e1b98704acce5851f399670cd00effa72ce1c7 | |
| parent | c9865bf9169bf596399bff1076b4006af862c93e (diff) | |
| download | mariadb-git-705965362d3b1ec4f1142aaaa9cf022fc7b7c647.tar.gz | |
added missing errorcode handling in NdbIndexStat causing test failure
| -rw-r--r-- | mysql-test/t/disabled.def | 1 | ||||
| -rw-r--r-- | storage/ndb/src/ndbapi/NdbIndexStat.cpp | 3 |
2 files changed, 3 insertions, 1 deletions
diff --git a/mysql-test/t/disabled.def b/mysql-test/t/disabled.def index 9f84643c6b3..fe95a543fb5 100644 --- a/mysql-test/t/disabled.def +++ b/mysql-test/t/disabled.def @@ -15,4 +15,3 @@ rpl_relayrotate : Unstable test case, bug#12429 rpl_until : Unstable test case, bug#12429 rpl_deadlock : Unstable test case, bug#12429 kill : Unstable test case, bug#9712 -ndb_alter_table : Martin will fix diff --git a/storage/ndb/src/ndbapi/NdbIndexStat.cpp b/storage/ndb/src/ndbapi/NdbIndexStat.cpp index 2d470249561..8740b80a81d 100644 --- a/storage/ndb/src/ndbapi/NdbIndexStat.cpp +++ b/storage/ndb/src/ndbapi/NdbIndexStat.cpp @@ -423,11 +423,13 @@ NdbIndexStat::records_in_range(NdbDictionary::Index* index, NdbIndexScanOperatio NdbTransaction* trans = op->m_transConnection; if (op->interpret_exit_last_row() == -1 || op->getValue(NdbDictionary::Column::RECORDS_IN_RANGE, (char*)out) == 0) { + m_error = op->getNdbError(); DBUG_PRINT("error", ("op:%d", op->getNdbError().code)); DBUG_RETURN(-1); } if (trans->execute(NdbTransaction::NoCommit, NdbTransaction::AbortOnError, forceSend) == -1) { + m_error = trans->getNdbError(); DBUG_PRINT("error", ("trans:%d op:%d", trans->getNdbError().code, op->getNdbError().code)); DBUG_RETURN(-1); @@ -443,6 +445,7 @@ NdbIndexStat::records_in_range(NdbDictionary::Index* index, NdbIndexScanOperatio cnt++; } if (ret == -1) { + m_error = op->getNdbError(); DBUG_PRINT("error", ("trans:%d op:%d", trans->getNdbError().code, op->getNdbError().code)); DBUG_RETURN(-1); |