Backport fix bug CORE-4225 : Server crashes when attempting to trace …

…activity on database having a db-level trigger
FirebirdSQL · Sep 18, 2013 · 8c3c0ba · 8c3c0ba
1 parent fa00f70
commit 8c3c0ba
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/src/jrd/trace/TraceObjects.cpp b/src/jrd/trace/TraceObjects.cpp
@@ -451,6 +451,9 @@ const char* TraceTriggerImpl::getTriggerName()
 
 const char* TraceTriggerImpl::getRelationName()
 {
+	if (m_which == trg_all)
+		return NULL;
+
 	const jrd_rel* rel = m_trig->req_rpb->rpb_relation;
 	return rel ? rel->rel_name.c_str() : NULL;
 }

diff --git a/src/utilities/ntrace/TracePluginImpl.cpp b/src/utilities/ntrace/TracePluginImpl.cpp
@@ -1898,7 +1898,7 @@ void TracePluginImpl::log_event_trigger_execute(TraceDatabaseConnection* connect
 	if (trgname.empty())
 		trgname = "<unknown>";
 
-	if (trigger->getRelationName())
+	if ((trigger->getWhich() != trg_all) && trigger->getRelationName())
 	{
 		string relation;
 		relation.printf(" FOR %s", trigger->getRelationName());