Commit a4f7d138 authored by unknown's avatar unknown
Browse files

Merge mysql.com:/space/pekka/ndb/version/my50 

into  mysql.com:/space/pekka/ndb/version/my50-ndb
parents 29654f69 2aa822b1

ndb/src/kernel/blocks/ERROR_codes.txt

+6 −4
Original line number Diff line number Diff line
@@ -4,9 +4,9 @@ Next NDBFS 2000 
Next DBACC 3002

Next DBTUP 4013

Next DBLQH 5042

Next DBDICT 6006

Next DBDICT 6007

Next DBDIH 7174

Next DBTC 8035

Next DBTC 8037

Next CMVMI 9000

Next BACKUP 10022

Next DBUTIL 11002
@@ -408,10 +408,12 @@ 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

6006: Crash participant in create index



System Restart:

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

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

+95 −56
Original line number Diff line number Diff line
@@ -6468,6 +6468,9 @@ void 
Dbdict::createIndex_slavePrepare(Signal* signal, OpCreateIndexPtr opPtr)

{

  jam();

  if (ERROR_INSERTED(6006) && ! opPtr.p->m_isMaster) {

    ndbrequire(false);

  }

}



void
@@ -6781,14 +6784,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());
@@ -6857,11 +6862,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;
@@ -7124,14 +7126,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());
@@ -9648,7 +9652,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;
@@ -9664,9 +9668,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();

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

    alterIndex_sendReply(signal, opPtr, false);

    return;

  }
@@ -9688,8 +9693,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;
@@ -9827,38 +9832,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);
@@ -9866,12 +9860,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
@@ -9989,14 +9989,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());
@@ -10409,8 +10411,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);
@@ -10421,8 +10425,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);
@@ -10449,15 +10455,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,
@@ -10472,14 +10477,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());
@@ -10965,14 +10972,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());
@@ -11060,8 +11069,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;

      }
@@ -11228,6 +11239,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
@@ -11323,14 +11335,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());
@@ -11554,28 +11568,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;

    }
@@ -11630,8 +11653,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);
@@ -11648,8 +11673,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);
@@ -11663,13 +11690,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);
@@ -11689,17 +11718,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();

      ndbassert(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();

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

      alterTrigger_sendReply(signal, opPtr, false);

      return;

    }
@@ -11717,8 +11750,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);
@@ -11731,13 +11766,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);
@@ -11794,8 +11831,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);
@@ -11806,6 +11844,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
@@ -11043,6 +11043,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 =
@@ -11077,8 +11078,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];
@@ -11110,6 +11113,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 =
@@ -11321,8 +11325,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();