firebird/firebird-mirror
firebird/firebird-mirror
8
0
Fork 1
mirror of https://github.com/FirebirdSQL/firebird.git synced 2025-01-23 10:43:03 +01:00
Code Issues

Fixed CORE-4555 - DDL trigger remains active after dropped.

Browse Source
This commit is contained in:
asfernandes 2014-09-18 15:55:08 +00:00
parent b83e16c0a1
commit 252abbf676
1 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/jrd/dfw.epp
View File

@ -4619,11 +4619,20 @@ static bool delete_trigger(thread_db* tdbb, SSHORT phase, DeferredWork* work, jr
fb_assert(arg);
// ASF: arg->dfw_id is RDB$TRIGGER_TYPE truncated to USHORT
if (arg && (arg->dfw_id & TRIGGER_TYPE_MASK) == TRIGGER_TYPE_DB)
if (arg)
{
MET_release_trigger(tdbb,
&tdbb->getAttachment()->att_triggers[arg->dfw_id & ~TRIGGER_TYPE_DB],
work->dfw_name);
if ((arg->dfw_id & TRIGGER_TYPE_MASK) == TRIGGER_TYPE_DB)
{
MET_release_trigger(tdbb,
&tdbb->getAttachment()->att_triggers[arg->dfw_id & ~TRIGGER_TYPE_DB],
work->dfw_name);
}
else if ((arg->dfw_id & TRIGGER_TYPE_MASK) == TRIGGER_TYPE_DDL)
{
MET_release_trigger(tdbb,
&tdbb->getAttachment()->att_ddl_triggers,
work->dfw_name);
}
}
}
}