Commit 70596536 authored by unknown's avatar unknown
Browse files

added missing errorcode handling in NdbIndexStat causing test failure

parent c9865bf9

mysql-test/t/disabled.def

+0 −1
Original line number Diff line number Diff line
@@ -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

storage/ndb/src/ndbapi/NdbIndexStat.cpp

+3 −0
Original line number Diff line number Diff line
@@ -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);