diff --git a/ndb/include/kernel/signaldata/TupFrag.hpp b/ndb/include/kernel/signaldata/TupFrag.hpp index fc88dacd48f..c0ce22651aa 100644 --- a/ndb/include/kernel/signaldata/TupFrag.hpp +++ b/ndb/include/kernel/signaldata/TupFrag.hpp @@ -105,8 +105,6 @@ public: enum ErrorCode { NoError = 0, InvalidRequest = 800, - NoFreeFragmentOper = 830, - NoFreeIndexFragment = 852, NoFreeFragment = 604, NoFreeAttributes = 827 }; diff --git a/ndb/src/kernel/blocks/dbtux/DbtuxMeta.cpp b/ndb/src/kernel/blocks/dbtux/DbtuxMeta.cpp index b30b555ccad..9495c487847 100644 --- a/ndb/src/kernel/blocks/dbtux/DbtuxMeta.cpp +++ b/ndb/src/kernel/blocks/dbtux/DbtuxMeta.cpp @@ -53,11 +53,7 @@ Dbtux::execTUXFRAGREQ(Signal* signal) } // get new operation record c_fragOpPool.seize(fragOpPtr); - if (fragOpPtr.i == RNIL) { - jam(); - errorCode = TuxFragRef::NoFreeFragmentOper; - break; - } + ndbrequire(fragOpPtr.i != RNIL); new (fragOpPtr.p) FragOp(); fragOpPtr.p->m_userPtr = req->userPtr; fragOpPtr.p->m_userRef = req->userRef; @@ -66,11 +62,7 @@ Dbtux::execTUXFRAGREQ(Signal* signal) fragOpPtr.p->m_fragNo = indexPtr.p->m_numFrags; fragOpPtr.p->m_numAttrsRecvd = 0; // check if index has place for more fragments - if (indexPtr.p->m_numFrags == MaxIndexFragments) { - jam(); - errorCode = TuxFragRef::NoFreeIndexFragment; - break; - } + ndbrequire(indexPtr.p->m_numFrags < MaxIndexFragments); // seize new fragment record FragPtr fragPtr; c_fragPool.seize(fragPtr);