Commit 6363fd57 authored by unknown's avatar unknown
Browse files

ndb - bug#9994 backpatch fixes from 5.0 

      IGNORE on merge 4.1->5.0


ndb/src/kernel/blocks/ERROR_codes.txt:
  bug#9994 backpatch fixes from 5.0
ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
  bug#9994 backpatch fixes from 5.0
ndb/src/kernel/blocks/dbdict/Dbdict.hpp:
  bug#9994 backpatch fixes from 5.0
ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
  bug#9994 backpatch fixes from 5.0
ndb/src/kernel/blocks/dbtup/DbtupTrigger.cpp:
  bug#9994 backpatch fixes from 5.0
parent 6a47ca25

ndb/src/kernel/blocks/ERROR_codes.txt

+4 −1
Original line number Diff line number Diff line
@@ -6,7 +6,7 @@ Next DBTUP 4013 
Next DBLQH 5042

Next DBDICT 6006

Next DBDIH 7174

Next DBTC 8035

Next DBTC 8037

Next CMVMI 9000

Next BACKUP 10022

Next DBUTIL 11002
@@ -406,8 +406,11 @@ Drop Table/Index: 
4001: Crash on REL_TABMEMREQ in TUP

4002: Crash on DROP_TABFILEREQ in TUP

4003: Fail next trigger create in TUP

4004: Fail next trigger drop in TUP

8033: Fail next trigger create in TC

8034: Fail next index create in TC

8035: Fail next trigger drop in TC

8036: Fail next index drop in TC



System Restart:

---------------

ndb/src/kernel/blocks/dbdict/Dbdict.cpp

+92 −56
Original line number Diff line number Diff line
@@ -6740,14 +6740,16 @@ Dbdict::createIndex_sendReply(Signal* signal, OpCreateIndexPtr opPtr, 
  CreateIndxRef* rep = (CreateIndxRef*)signal->getDataPtrSend();

  Uint32 gsn = GSN_CREATE_INDX_CONF;

  Uint32 length = CreateIndxConf::InternalLength;

  bool sendRef = opPtr.p->hasError();

  bool sendRef;

  if (! toUser) {

    sendRef = opPtr.p->hasLastError();

    rep->setUserRef(opPtr.p->m_coordinatorRef);

    rep->setConnectionPtr(opPtr.p->key);

    rep->setRequestType(opPtr.p->m_requestType);

    if (opPtr.p->m_requestType == CreateIndxReq::RT_DICT_ABORT)

      sendRef = false;

  } else {

    sendRef = opPtr.p->hasError();

    rep->setUserRef(opPtr.p->m_request.getUserRef());

    rep->setConnectionPtr(opPtr.p->m_request.getConnectionPtr());

    rep->setRequestType(opPtr.p->m_request.getRequestType());
@@ -6816,11 +6818,8 @@ Dbdict::execDROP_INDX_REQ(Signal* signal) 
	goto error;

      }



      if (tmp.p->indexState == TableRecord::IS_DROPPING){

	jam();

	err = DropIndxRef::IndexNotFound;

	goto error;

      }

      if (tmp.p->indexState != TableRecord::IS_ONLINE)

        req->addRequestFlag(RequestFlag::RF_FORCE);



      tmp.p->indexState = TableRecord::IS_DROPPING;
@@ -7083,14 +7082,16 @@ Dbdict::dropIndex_sendReply(Signal* signal, OpDropIndexPtr opPtr, 
  DropIndxRef* rep = (DropIndxRef*)signal->getDataPtrSend();

  Uint32 gsn = GSN_DROP_INDX_CONF;

  Uint32 length = DropIndxConf::InternalLength;

  bool sendRef = opPtr.p->hasError();

  bool sendRef;

  if (! toUser) {

    sendRef = opPtr.p->hasLastError();

    rep->setUserRef(opPtr.p->m_coordinatorRef);

    rep->setConnectionPtr(opPtr.p->key);

    rep->setRequestType(opPtr.p->m_requestType);

    if (opPtr.p->m_requestType == DropIndxReq::RT_DICT_ABORT)

      sendRef = false;

  } else {

    sendRef = opPtr.p->hasError();

    rep->setUserRef(opPtr.p->m_request.getUserRef());

    rep->setConnectionPtr(opPtr.p->m_request.getConnectionPtr());

    rep->setRequestType(opPtr.p->m_request.getRequestType());
@@ -9607,7 +9608,7 @@ Dbdict::alterIndex_fromCreateTc(Signal* signal, OpAlterIndexPtr opPtr) 
{

  jam();

  // mark created in local TC

  if (! opPtr.p->hasError()) {

  if (! opPtr.p->hasLastError()) {

    TableRecordPtr indexPtr;

    c_tableRecordPool.getPtr(indexPtr, opPtr.p->m_request.getIndexId());

    indexPtr.p->indexLocal |= TableRecord::IL_CREATED_TC;
@@ -9623,9 +9624,10 @@ Dbdict::alterIndex_toDropTc(Signal* signal, OpAlterIndexPtr opPtr) 
  jam();

  TableRecordPtr indexPtr;

  c_tableRecordPool.getPtr(indexPtr, opPtr.p->m_request.getIndexId());

  // broken index

  // broken index allowed if force

  if (! (indexPtr.p->indexLocal & TableRecord::IL_CREATED_TC)) {

    jam();

    ndbrequire(opPtr.p->m_requestFlag & RequestFlag::RF_FORCE);

    alterIndex_sendReply(signal, opPtr, false);

    return;

  }
@@ -9647,8 +9649,8 @@ Dbdict::alterIndex_fromDropTc(Signal* signal, OpAlterIndexPtr opPtr) 
{

  jam();

  ndbrequire(opPtr.p->m_requestType == AlterIndxReq::RT_DICT_TC);

  if (! opPtr.p->hasError()) {

    // mark dropped in local TC

  // mark dropped locally

  if (! opPtr.p->hasLastError()) {

    TableRecordPtr indexPtr;

    c_tableRecordPool.getPtr(indexPtr, opPtr.p->m_request.getIndexId());

    indexPtr.p->indexLocal &= ~TableRecord::IL_CREATED_TC;
@@ -9786,38 +9788,27 @@ Dbdict::alterIndex_toDropTrigger(Signal* signal, OpAlterIndexPtr opPtr) 
  req->setUserRef(reference());

  req->setConnectionPtr(opPtr.p->key);

  req->setRequestType(DropTrigReq::RT_ALTER_INDEX);

  req->addRequestFlag(opPtr.p->m_requestFlag);

  req->setTableId(opPtr.p->m_request.getTableId());

  req->setIndexId(opPtr.p->m_request.getIndexId());

  req->setTriggerInfo(0);       // not used

  opPtr.p->m_triggerCounter = 0;

  if (indexPtr.p->isHashIndex()) {

    // insert

  if (indexPtr.p->insertTriggerId != RNIL) {

    req->setTriggerId(indexPtr.p->insertTriggerId);

    sendSignal(reference(), GSN_DROP_TRIG_REQ, 

        signal, DropTrigReq::SignalLength, JBB);

    opPtr.p->m_triggerCounter++;

  }

    // update

  if (indexPtr.p->updateTriggerId != RNIL) {

    req->setTriggerId(indexPtr.p->updateTriggerId);

    sendSignal(reference(), GSN_DROP_TRIG_REQ, 

        signal, DropTrigReq::SignalLength, JBB);

    opPtr.p->m_triggerCounter++;

  }

    // delete

  if (indexPtr.p->deleteTriggerId != RNIL) {

    req->setTriggerId(indexPtr.p->deleteTriggerId);

    sendSignal(reference(), GSN_DROP_TRIG_REQ, 

        signal, DropTrigReq::SignalLength, JBB);

    opPtr.p->m_triggerCounter++;

  }

  // custom

  if (indexPtr.p->customTriggerId != RNIL) {

    req->setTriggerId(indexPtr.p->customTriggerId);

    sendSignal(reference(), GSN_DROP_TRIG_REQ, 

        signal, DropTrigReq::SignalLength, JBB);

    opPtr.p->m_triggerCounter++;

  }

    // build

    if (indexPtr.p->buildTriggerId != RNIL) {

      req->setTriggerId(indexPtr.p->buildTriggerId);
@@ -9825,12 +9816,18 @@ Dbdict::alterIndex_toDropTrigger(Signal* signal, OpAlterIndexPtr opPtr) 
          signal, DropTrigReq::SignalLength, JBB);

      opPtr.p->m_triggerCounter++;

    }

  if (opPtr.p->m_triggerCounter == 0) {

    // drop in each TC

    jam();

    opPtr.p->m_requestType = AlterIndxReq::RT_DICT_TC;

    alterIndex_sendSlaveReq(signal, opPtr);

    return;

  }

  if (indexPtr.p->isOrderedIndex()) {

    // custom

    req->addRequestFlag(RequestFlag::RF_NOTCTRIGGER);

    req->setTriggerId(indexPtr.p->customTriggerId);

    sendSignal(reference(), GSN_DROP_TRIG_REQ, 

        signal, DropTrigReq::SignalLength, JBB);

    opPtr.p->m_triggerCounter++;

    return;

  }

  ndbrequire(false);

}



void
@@ -9948,14 +9945,16 @@ Dbdict::alterIndex_sendReply(Signal* signal, OpAlterIndexPtr opPtr, 
  AlterIndxRef* rep = (AlterIndxRef*)signal->getDataPtrSend();

  Uint32 gsn = GSN_ALTER_INDX_CONF;

  Uint32 length = AlterIndxConf::InternalLength;

  bool sendRef = opPtr.p->hasError();

  bool sendRef;

  if (! toUser) {

    sendRef = opPtr.p->hasLastError();

    rep->setUserRef(opPtr.p->m_coordinatorRef);

    rep->setConnectionPtr(opPtr.p->key);

    rep->setRequestType(opPtr.p->m_requestType);

    if (opPtr.p->m_requestType == AlterIndxReq::RT_DICT_ABORT)

      sendRef = false;

  } else {

    sendRef = opPtr.p->hasError();

    rep->setUserRef(opPtr.p->m_request.getUserRef());

    rep->setConnectionPtr(opPtr.p->m_request.getConnectionPtr());

    rep->setRequestType(opPtr.p->m_request.getRequestType());
@@ -10368,8 +10367,10 @@ Dbdict::buildIndex_toOnline(Signal* signal, OpBuildIndexPtr opPtr) 
  req->setUserRef(reference());

  req->setConnectionPtr(opPtr.p->key);

  if (opPtr.p->m_requestType == BuildIndxReq::RT_DICT_TC) {

    jam();

    req->setRequestType(AlterIndxReq::RT_TC);

  } else if (opPtr.p->m_requestType == BuildIndxReq::RT_DICT_TUX) {

    jam();

    req->setRequestType(AlterIndxReq::RT_TUX);

  } else {

    ndbrequire(false);
@@ -10380,8 +10381,10 @@ Dbdict::buildIndex_toOnline(Signal* signal, OpBuildIndexPtr opPtr) 
  req->setOnline(true);

  BlockReference blockRef = 0;

  if (opPtr.p->m_requestType == BuildIndxReq::RT_DICT_TC) {

    jam();

    blockRef = calcTcBlockRef(getOwnNodeId());

  } else if (opPtr.p->m_requestType == BuildIndxReq::RT_DICT_TUX) {

    jam();

    blockRef = calcTuxBlockRef(getOwnNodeId());

  } else {

    ndbrequire(false);
@@ -10408,15 +10411,14 @@ Dbdict::buildIndex_sendSlaveReq(Signal* signal, OpBuildIndexPtr opPtr) 
  req->setConnectionPtr(opPtr.p->key);

  req->setRequestType(opPtr.p->m_requestType);

  req->addRequestFlag(opPtr.p->m_requestFlag);

  if(opPtr.p->m_requestFlag & RequestFlag::RF_LOCAL)

  {

  if(opPtr.p->m_requestFlag & RequestFlag::RF_LOCAL) {

    jam();

    opPtr.p->m_signalCounter.clearWaitingFor();

    opPtr.p->m_signalCounter.setWaitingFor(getOwnNodeId());

    sendSignal(reference(), GSN_BUILDINDXREQ,

	       signal, BuildIndxReq::SignalLength, JBB);

  }

  else

  {

  } else {

    jam();

    opPtr.p->m_signalCounter = c_aliveNodes;

    NodeReceiverGroup rg(DBDICT, c_aliveNodes);

    sendSignal(rg, GSN_BUILDINDXREQ,
@@ -10431,14 +10433,16 @@ Dbdict::buildIndex_sendReply(Signal* signal, OpBuildIndexPtr opPtr, 
  BuildIndxRef* rep = (BuildIndxRef*)signal->getDataPtrSend();

  Uint32 gsn = GSN_BUILDINDXCONF;

  Uint32 length = BuildIndxConf::InternalLength;

  bool sendRef = opPtr.p->hasError();

  bool sendRef;

  if (! toUser) {

    sendRef = opPtr.p->hasLastError();

    rep->setUserRef(opPtr.p->m_coordinatorRef);

    rep->setConnectionPtr(opPtr.p->key);

    rep->setRequestType(opPtr.p->m_requestType);

    if (opPtr.p->m_requestType == BuildIndxReq::RT_DICT_ABORT)

      sendRef = false;

  } else {

    sendRef = opPtr.p->hasError();

    rep->setUserRef(opPtr.p->m_request.getUserRef());

    rep->setConnectionPtr(opPtr.p->m_request.getConnectionPtr());

    rep->setRequestType(opPtr.p->m_request.getRequestType());
@@ -10925,14 +10929,16 @@ Dbdict::createTrigger_sendReply(Signal* signal, OpCreateTriggerPtr opPtr, 
  CreateTrigRef* rep = (CreateTrigRef*)signal->getDataPtrSend();

  Uint32 gsn = GSN_CREATE_TRIG_CONF;

  Uint32 length = CreateTrigConf::InternalLength;

  bool sendRef = opPtr.p->hasError();

  bool sendRef;

  if (! toUser) {

    sendRef = opPtr.p->hasLastError();

    rep->setUserRef(opPtr.p->m_coordinatorRef);

    rep->setConnectionPtr(opPtr.p->key);

    rep->setRequestType(opPtr.p->m_requestType);

    if (opPtr.p->m_requestType == CreateTrigReq::RT_DICT_ABORT)

      sendRef = false;

  } else {

    sendRef = opPtr.p->hasError();

    rep->setUserRef(opPtr.p->m_request.getUserRef());

    rep->setConnectionPtr(opPtr.p->m_request.getConnectionPtr());

    rep->setRequestType(opPtr.p->m_request.getRequestType());
@@ -11020,8 +11026,10 @@ Dbdict::execDROP_TRIG_REQ(Signal* signal) 
	OpDropTrigger opBad;

	opPtr.p = &opBad;

	opPtr.p->save(req);

        if (! (req->getRequestFlag() & RequestFlag::RF_FORCE)) {

          opPtr.p->m_errorCode = DropTrigRef::TriggerNotFound;

          opPtr.p->m_errorLine = __LINE__;

        }

	dropTrigger_sendReply(signal,  opPtr, true);

	return;

      }
@@ -11188,6 +11196,7 @@ Dbdict::dropTrigger_toAlterTrigger(Signal* signal, OpDropTriggerPtr opPtr) 
  req->setUserRef(reference());

  req->setConnectionPtr(opPtr.p->key);

  req->setRequestType(AlterTrigReq::RT_DROP_TRIGGER);

  req->addRequestFlag(opPtr.p->m_requestFlag);

  req->setTableId(opPtr.p->m_request.getTableId());

  req->setTriggerId(opPtr.p->m_request.getTriggerId());

  req->setTriggerInfo(0);       // not used
@@ -11283,14 +11292,16 @@ Dbdict::dropTrigger_sendReply(Signal* signal, OpDropTriggerPtr opPtr, 
  DropTrigRef* rep = (DropTrigRef*)signal->getDataPtrSend();

  Uint32 gsn = GSN_DROP_TRIG_CONF;

  Uint32 length = DropTrigConf::InternalLength;

  bool sendRef = opPtr.p->hasError();

  bool sendRef;

  if (! toUser) {

    sendRef = opPtr.p->hasLastError();

    rep->setUserRef(opPtr.p->m_coordinatorRef);

    rep->setConnectionPtr(opPtr.p->key);

    rep->setRequestType(opPtr.p->m_requestType);

    if (opPtr.p->m_requestType == DropTrigReq::RT_DICT_ABORT)

      sendRef = false;

  } else {

    sendRef = opPtr.p->hasError();

    rep->setUserRef(opPtr.p->m_request.getUserRef());

    rep->setConnectionPtr(opPtr.p->m_request.getConnectionPtr());

    rep->setRequestType(opPtr.p->m_request.getRequestType());
@@ -11514,28 +11525,37 @@ Dbdict::alterTrigger_recvReply(Signal* signal, const AlterTrigConf* conf, 
  if (! (opPtr.p->m_request.getRequestFlag() & RequestFlag::RF_NOTCTRIGGER)) {

    if (requestType == AlterTrigReq::RT_DICT_PREPARE) {

      jam();

      if (opPtr.p->m_request.getOnline())

      if (opPtr.p->m_request.getOnline()) {

        jam();

        opPtr.p->m_requestType = AlterTrigReq::RT_DICT_TC;

      else

      } else {

        jam();

        opPtr.p->m_requestType = AlterTrigReq::RT_DICT_LQH;

      }

      alterTrigger_sendSlaveReq(signal, opPtr);

      return;

    }

    if (requestType == AlterTrigReq::RT_DICT_TC) {

      jam();

      if (opPtr.p->m_request.getOnline())

      if (opPtr.p->m_request.getOnline()) {

        jam();

        opPtr.p->m_requestType = AlterTrigReq::RT_DICT_LQH;

      else

      } else {

        jam();

        opPtr.p->m_requestType = AlterTrigReq::RT_DICT_COMMIT;

      }

      alterTrigger_sendSlaveReq(signal, opPtr);

      return;

    }

    if (requestType == AlterTrigReq::RT_DICT_LQH) {

      jam();

      if (opPtr.p->m_request.getOnline())

      if (opPtr.p->m_request.getOnline()) {

        jam();

        opPtr.p->m_requestType = AlterTrigReq::RT_DICT_COMMIT;

      else

      } else {

        jam();

        opPtr.p->m_requestType = AlterTrigReq::RT_DICT_TC;

      }

      alterTrigger_sendSlaveReq(signal, opPtr);

      return;

    }
@@ -11595,8 +11615,10 @@ Dbdict::alterTrigger_toCreateLocal(Signal* signal, OpAlterTriggerPtr opPtr) 
  req->setUserRef(reference());

  req->setConnectionPtr(opPtr.p->key);

  if (opPtr.p->m_requestType == AlterTrigReq::RT_DICT_TC) {

    jam();

    req->setRequestType(CreateTrigReq::RT_TC);

  } else if (opPtr.p->m_requestType == AlterTrigReq::RT_DICT_LQH) {

    jam();

    req->setRequestType(CreateTrigReq::RT_LQH);

  } else {

    ndbassert(false);
@@ -11613,8 +11635,10 @@ Dbdict::alterTrigger_toCreateLocal(Signal* signal, OpAlterTriggerPtr opPtr) 
  req->setReceiverRef(opPtr.p->m_request.getReceiverRef());

  BlockReference blockRef = 0;

  if (opPtr.p->m_requestType == AlterTrigReq::RT_DICT_TC) {

    jam();

    blockRef = calcTcBlockRef(getOwnNodeId());

  } else if (opPtr.p->m_requestType == AlterTrigReq::RT_DICT_LQH) {

    jam();

    blockRef = calcLqhBlockRef(getOwnNodeId());

  } else {

    ndbassert(false);
@@ -11628,13 +11652,15 @@ void 
Dbdict::alterTrigger_fromCreateLocal(Signal* signal, OpAlterTriggerPtr opPtr)

{

  jam();

  if (! opPtr.p->hasError()) {

  if (! opPtr.p->hasLastError()) {

    // mark created locally

    TriggerRecordPtr triggerPtr;

    c_triggerRecordPool.getPtr(triggerPtr, opPtr.p->m_request.getTriggerId());

    if (opPtr.p->m_requestType == AlterTrigReq::RT_DICT_TC) {

      jam();

      triggerPtr.p->triggerLocal |= TriggerRecord::TL_CREATED_TC;

    } else if (opPtr.p->m_requestType == AlterTrigReq::RT_DICT_LQH) {

      jam();

      triggerPtr.p->triggerLocal |= TriggerRecord::TL_CREATED_LQH;

    } else {

      ndbrequire(false);
@@ -11654,17 +11680,21 @@ Dbdict::alterTrigger_toDropLocal(Signal* signal, OpAlterTriggerPtr opPtr) 
  req->setUserRef(reference());

  req->setConnectionPtr(opPtr.p->key);

  if (opPtr.p->m_requestType == AlterTrigReq::RT_DICT_TC) {

    // broken trigger

    jam();

    // broken trigger allowed if force

    if (! (triggerPtr.p->triggerLocal & TriggerRecord::TL_CREATED_TC)) {

      jam();

      ndbrequire(opPtr.p->m_requestFlag & RequestFlag::RF_FORCE);

      alterTrigger_sendReply(signal, opPtr, false);

      return;

    }

    req->setRequestType(DropTrigReq::RT_TC);

  } else if (opPtr.p->m_requestType == AlterTrigReq::RT_DICT_LQH) {

    // broken trigger

    jam();

    // broken trigger allowed if force

    if (! (triggerPtr.p->triggerLocal & TriggerRecord::TL_CREATED_LQH)) {

      jam();

      ndbrequire(opPtr.p->m_requestFlag & RequestFlag::RF_FORCE);

      alterTrigger_sendReply(signal, opPtr, false);

      return;

    }
@@ -11682,8 +11712,10 @@ Dbdict::alterTrigger_toDropLocal(Signal* signal, OpAlterTriggerPtr opPtr) 
  req->setMonitorAllAttributes(triggerPtr.p->monitorAllAttributes);

  BlockReference blockRef = 0;

  if (opPtr.p->m_requestType == AlterTrigReq::RT_DICT_TC) {

    jam();

    blockRef = calcTcBlockRef(getOwnNodeId());

  } else if (opPtr.p->m_requestType == AlterTrigReq::RT_DICT_LQH) {

    jam();

    blockRef = calcLqhBlockRef(getOwnNodeId());

  } else {

    ndbassert(false);
@@ -11696,13 +11728,15 @@ void 
Dbdict::alterTrigger_fromDropLocal(Signal* signal, OpAlterTriggerPtr opPtr)

{

  jam();

  if (! opPtr.p->hasError()) {

  if (! opPtr.p->hasLastError()) {

    // mark dropped locally

    TriggerRecordPtr triggerPtr;

    c_triggerRecordPool.getPtr(triggerPtr, opPtr.p->m_request.getTriggerId());

    if (opPtr.p->m_requestType == AlterTrigReq::RT_DICT_TC) {

      jam();

      triggerPtr.p->triggerLocal &= ~TriggerRecord::TL_CREATED_TC;

    } else if (opPtr.p->m_requestType == AlterTrigReq::RT_DICT_LQH) {

      jam();

      triggerPtr.p->triggerLocal &= ~TriggerRecord::TL_CREATED_LQH;

    } else {

      ndbrequire(false);
@@ -11759,8 +11793,9 @@ Dbdict::alterTrigger_sendReply(Signal* signal, OpAlterTriggerPtr opPtr, 
  AlterTrigRef* rep = (AlterTrigRef*)signal->getDataPtrSend();

  Uint32 gsn = GSN_ALTER_TRIG_CONF;

  Uint32 length = AlterTrigConf::InternalLength;

  bool sendRef = opPtr.p->hasError();

  bool sendRef;

  if (! toUser) {

    sendRef = opPtr.p->hasLastError();

    rep->setUserRef(opPtr.p->m_coordinatorRef);

    rep->setConnectionPtr(opPtr.p->key);

    rep->setRequestType(opPtr.p->m_requestType);
@@ -11771,6 +11806,7 @@ Dbdict::alterTrigger_sendReply(Signal* signal, OpAlterTriggerPtr opPtr, 
      jam();

    }

  } else {

    sendRef = opPtr.p->hasError();

    jam();

    rep->setUserRef(opPtr.p->m_request.getUserRef());

    rep->setConnectionPtr(opPtr.p->m_request.getConnectionPtr());

ndb/src/kernel/blocks/dbdict/Dbdict.hpp

+230 −99

File changed.

Preview size limit exceeded, changes collapsed.

ndb/src/kernel/blocks/dbtc/DbtcMain.cpp

+8 −2
Original line number Diff line number Diff line
@@ -10833,6 +10833,7 @@ void Dbtc::execCREATE_TRIG_REQ(Signal* signal) 
  if (ERROR_INSERTED(8033) ||

      !c_theDefinedTriggers.seizeId(triggerPtr, 

				    createTrigReq->getTriggerId())) {

    jam();

    CLEAR_ERROR_INSERT_VALUE;

    // Failed to allocate trigger record

    CreateTrigRef * const createTrigRef =
@@ -10867,8 +10868,10 @@ void Dbtc::execDROP_TRIG_REQ(Signal* signal) 
  DropTrigReq * const dropTrigReq =  (DropTrigReq *)&signal->theData[0];

  BlockReference sender = signal->senderBlockRef();



  if ((c_theDefinedTriggers.getPtr(dropTrigReq->getTriggerId())) == NULL) {

  if (ERROR_INSERTED(8035) ||

      (c_theDefinedTriggers.getPtr(dropTrigReq->getTriggerId())) == NULL) {

    jam();

    CLEAR_ERROR_INSERT_VALUE;

    // Failed to find find trigger record

    DropTrigRef * const dropTrigRef =  (DropTrigRef *)&signal->theData[0];
@@ -10900,6 +10903,7 @@ void Dbtc::execCREATE_INDX_REQ(Signal* signal) 
  

  if (ERROR_INSERTED(8034) ||

      !c_theIndexes.seizeId(indexPtr, createIndxReq->getIndexId())) {

    jam();

    CLEAR_ERROR_INSERT_VALUE;

    // Failed to allocate index record

     CreateIndxRef * const createIndxRef =
@@ -11111,8 +11115,10 @@ void Dbtc::execDROP_INDX_REQ(Signal* signal) 
  TcIndexData* indexData;

  BlockReference sender = signal->senderBlockRef();

  

  if ((indexData = c_theIndexes.getPtr(dropIndxReq->getIndexId())) == NULL) {

  if (ERROR_INSERTED(8036) ||

      (indexData = c_theIndexes.getPtr(dropIndxReq->getIndexId())) == NULL) {

    jam();

    CLEAR_ERROR_INSERT_VALUE;

    // Failed to find index record

    DropIndxRef * const dropIndxRef =  

      (DropIndxRef *)signal->getDataPtrSend();

ndb/src/kernel/blocks/dbtup/DbtupTrigger.cpp

+4 −0
Original line number Diff line number Diff line
@@ -305,6 +305,10 @@ Dbtup::primaryKey(Tablerec* const regTabPtr, Uint32 attrId) 
Uint32

Dbtup::dropTrigger(Tablerec* table, const DropTrigReq* req)

{

  if (ERROR_INSERTED(4004)) {

    CLEAR_ERROR_INSERT_VALUE;

    return 9999;

  }

  Uint32 triggerId = req->getTriggerId();



  TriggerType::Value ttype = req->getTriggerType();