From 7d014142bae32729afe17c277aa7636e798dc2c9 Mon Sep 17 00:00:00 2001
From: robocop <robocop@users.sourceforge.net>
Date: Tue, 17 Jan 2012 06:20:36 +0000
Subject: [PATCH] Misc.

---
 src/jrd/dyn_del.epp | 2 +-
 src/jrd/gds.cpp     | 2 +-
 src/jrd/opt.cpp     | 1 +
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/jrd/dyn_del.epp b/src/jrd/dyn_del.epp
index fccd8100f0..009ddc2cad 100644
--- a/src/jrd/dyn_del.epp
+++ b/src/jrd/dyn_del.epp
@@ -1702,7 +1702,7 @@ void DYN_delete_role( Global* gbl, const UCHAR** ptr)
 		break;
 	case DEL_R_FAIL_SYSTEM:
 		DYN_error_punt(false, 284, SafeArg() << role_name.c_str());
-		// msg 284: can not drop system SQL role @1
+		// msg 284: cannot drop system SQL role @1
 		break;
 	}
 }
diff --git a/src/jrd/gds.cpp b/src/jrd/gds.cpp
index f55b9cc320..75afecacd5 100644
--- a/src/jrd/gds.cpp
+++ b/src/jrd/gds.cpp
@@ -997,7 +997,7 @@ const int SECS_PER_DAY	= SECS_PER_HOUR * 24;
 class CleanupTraceHandles
 {
 public:
-	CleanupTraceHandles(Firebird::MemoryPool&)
+	explicit CleanupTraceHandles(Firebird::MemoryPool&)
 	{};
 
 	~CleanupTraceHandles()
diff --git a/src/jrd/opt.cpp b/src/jrd/opt.cpp
index 9bee091532..1668a1efd0 100644
--- a/src/jrd/opt.cpp
+++ b/src/jrd/opt.cpp
@@ -6020,6 +6020,7 @@ static RecordSource* gen_union(thread_db* tdbb,
 
 	stream_array_t inner_streams;
 	inner_streams[0] = nstreams;
+	fb_assert(nstreams <= MAX_STREAMS);
 	memcpy(inner_streams + 1, streams, nstreams);
 
 	jrd_nod* clauses = union_node->nod_arg[e_uni_clauses];