Commit 2aa822b1 authored by unknown's avatar unknown

ndb - DICT minor

ndb/src/kernel/blocks/ERROR_codes.txt:
  downgrade some require to assert
ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
  downgrade some require to assert
parent cd004bd0
No related merge requests found
...@@ -4,9 +4,9 @@ Next NDBFS 2000 ...@@ -4,9 +4,9 @@ Next NDBFS 2000
Next DBACC 3002 Next DBACC 3002
Next DBTUP 4013 Next DBTUP 4013
Next DBLQH 5042 Next DBLQH 5042
Next DBDICT 6006 Next DBDICT 6007
Next DBDIH 7174 Next DBDIH 7174
Next DBTC 8035 Next DBTC 8037
Next CMVMI 9000 Next CMVMI 9000
Next BACKUP 10022 Next BACKUP 10022
Next DBUTIL 11002 Next DBUTIL 11002
...@@ -413,6 +413,7 @@ Drop Table/Index: ...@@ -413,6 +413,7 @@ Drop Table/Index:
8034: Fail next index create in TC 8034: Fail next index create in TC
8035: Fail next trigger drop in TC 8035: Fail next trigger drop in TC
8036: Fail next index drop in TC 8036: Fail next index drop in TC
6006: Crash participant in create index
System Restart: System Restart:
--------------- ---------------
......
...@@ -6468,6 +6468,9 @@ void ...@@ -6468,6 +6468,9 @@ void
Dbdict::createIndex_slavePrepare(Signal* signal, OpCreateIndexPtr opPtr) Dbdict::createIndex_slavePrepare(Signal* signal, OpCreateIndexPtr opPtr)
{ {
jam(); jam();
if (ERROR_INSERTED(6006) && ! opPtr.p->m_isMaster) {
ndbrequire(false);
}
} }
void void
...@@ -9668,7 +9671,7 @@ Dbdict::alterIndex_toDropTc(Signal* signal, OpAlterIndexPtr opPtr) ...@@ -9668,7 +9671,7 @@ Dbdict::alterIndex_toDropTc(Signal* signal, OpAlterIndexPtr opPtr)
// broken index allowed if force // broken index allowed if force
if (! (indexPtr.p->indexLocal & TableRecord::IL_CREATED_TC)) { if (! (indexPtr.p->indexLocal & TableRecord::IL_CREATED_TC)) {
jam(); jam();
ndbrequire(opPtr.p->m_requestFlag & RequestFlag::RF_FORCE); ndbassert(opPtr.p->m_requestFlag & RequestFlag::RF_FORCE);
alterIndex_sendReply(signal, opPtr, false); alterIndex_sendReply(signal, opPtr, false);
return; return;
} }
...@@ -11719,7 +11722,7 @@ Dbdict::alterTrigger_toDropLocal(Signal* signal, OpAlterTriggerPtr opPtr) ...@@ -11719,7 +11722,7 @@ Dbdict::alterTrigger_toDropLocal(Signal* signal, OpAlterTriggerPtr opPtr)
// broken trigger allowed if force // broken trigger allowed if force
if (! (triggerPtr.p->triggerLocal & TriggerRecord::TL_CREATED_TC)) { if (! (triggerPtr.p->triggerLocal & TriggerRecord::TL_CREATED_TC)) {
jam(); jam();
ndbrequire(opPtr.p->m_requestFlag & RequestFlag::RF_FORCE); ndbassert(opPtr.p->m_requestFlag & RequestFlag::RF_FORCE);
alterTrigger_sendReply(signal, opPtr, false); alterTrigger_sendReply(signal, opPtr, false);
return; return;
} }
...@@ -11729,7 +11732,7 @@ Dbdict::alterTrigger_toDropLocal(Signal* signal, OpAlterTriggerPtr opPtr) ...@@ -11729,7 +11732,7 @@ Dbdict::alterTrigger_toDropLocal(Signal* signal, OpAlterTriggerPtr opPtr)
// broken trigger allowed if force // broken trigger allowed if force
if (! (triggerPtr.p->triggerLocal & TriggerRecord::TL_CREATED_LQH)) { if (! (triggerPtr.p->triggerLocal & TriggerRecord::TL_CREATED_LQH)) {
jam(); jam();
ndbrequire(opPtr.p->m_requestFlag & RequestFlag::RF_FORCE); ndbassert(opPtr.p->m_requestFlag & RequestFlag::RF_FORCE);
alterTrigger_sendReply(signal, opPtr, false); alterTrigger_sendReply(signal, opPtr, false);
return; return;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment