Misc

src/jrd/opt.cpp

@@ -5787,6 +5787,7 @@ static RecordSource* gen_union(thread_db* tdbb,
 
 		mark_rsb_recursive(rsb);
 	}
+
 	return rsb;
 }
 
@@ -6807,6 +6808,7 @@ static void mark_rsb_recursive(RecordSource* rsb)
 	while (true)
 	{
 		rsb->rsb_flags |= rsb_recursive;
+
 		switch (rsb->rsb_type)
 		{
 			case rsb_indexed:

src/utilities/fbsvcmgr.cpp

@@ -133,7 +133,8 @@ bool putFileFromArgument(char**& av, ClumpletWriter& spb, unsigned int tag)
 	
 	fseek(file, 0, SEEK_END);
 	const long len = ftell(file);
-	if (!len) {
+	if (len == 0) {
+		fclose(file);
 		(Arg::Gds(isc_fbsvcmgr_fp_empty) << *av).raise();
 	}
 

src/utilities/ntrace/TracePluginImpl.cpp

@@ -1283,7 +1283,7 @@ void TracePluginImpl::log_event_proc_execute(TraceConnection* connection, TraceT
 								   "UNAUTHORIZED EXECUTE_PROCEDURE_FINISH";
 			break;
 		default:
-			event_type = "Unknown at executing procedure";
+			event_type = "Unknown event at executing procedure";
 			break;
 	}