Supress empty output message for Execute Block

Author: aafemt

src/dsql/StmtNodes.cpp

@@ -5078,9 +5078,14 @@ void ExecBlockNode::genBlr(DsqlCompilerScratch* dsqlScratch)
 		DsqlDescMaker::fromNode(dsqlScratch, &param->par_desc, varNode, true);
 	}
 
-	revertParametersOrder(statement->getReceiveMsg()->msg_parameters);
-	if (!subRoutine)
-		GEN_port(dsqlScratch, statement->getReceiveMsg());
+	if (returns.hasData())
+	{
+		revertParametersOrder(statement->getReceiveMsg()->msg_parameters);
+		if (!subRoutine)
+			GEN_port(dsqlScratch, statement->getReceiveMsg());
+	}
+	else
+		statement->setReceiveMsg(nullptr);
 
 	if (subRoutine)
 	{

src/jrd/Statement.cpp

@@ -206,7 +206,9 @@ Statement::Statement(thread_db* tdbb, MemoryPool* p, CompilerScratch* csb)
 		{
 			if (auto message = csb->csb_rpt[i].csb_message)
 			{
-				fb_assert(i == message->messageNumber);
+				// When outer messages are mapped to inner just pointers are assigned so they keep original numbers inside.
+				// That's why this assert is commented out.
+				//fb_assert(i == message->messageNumber);
 				messages[i] = message;
 			}
 		}