From 44ffbdb145c4d7c2e037eefa8c986129f204edf1 Mon Sep 17 00:00:00 2001
From: hvlad <hvlad@users.sourceforge.net>
Date: Wed, 11 Feb 2009 15:20:14 +0000
Subject: [PATCH] Avod assertion

---
 src/jrd/trace/TraceDSQLHelpers.h | 3 +++
 src/jrd/trace/TraceJrdHelpers.h  | 3 +++
 2 files changed, 6 insertions(+)

diff --git a/src/jrd/trace/TraceDSQLHelpers.h b/src/jrd/trace/TraceDSQLHelpers.h
index 112c864772..ea93615d89 100644
--- a/src/jrd/trace/TraceDSQLHelpers.h
+++ b/src/jrd/trace/TraceDSQLHelpers.h
@@ -178,7 +178,10 @@ public:
 	{
 		m_need_trace = m_request->req_traced && TraceManager::need_dsql_execute(m_attachment);
 		if (!m_need_trace)
+		{
+			m_request->req_fetch_baseline = NULL;
 			return;
+		}
 
 		m_start_clock = fb_utils::query_performance_counter();
 	}
diff --git a/src/jrd/trace/TraceJrdHelpers.h b/src/jrd/trace/TraceJrdHelpers.h
index 5acb845c15..13a385200e 100644
--- a/src/jrd/trace/TraceJrdHelpers.h
+++ b/src/jrd/trace/TraceJrdHelpers.h
@@ -184,7 +184,10 @@ public:
 	void fetch(bool eof, ntrace_result_t result)
 	{
 		if (!m_need_trace)
+		{
+			m_request->req_fetch_baseline = NULL;
 			return;
+		}
 
 		m_need_trace = false;
 		m_request->req_fetch_elapsed += fb_utils::query_performance_counter() - m_start_clock;