From 2b52e34f3e126a0a7bfaeffaf71a595f42d480da Mon Sep 17 00:00:00 2001
From: asfernandes <asfernandes@users.sourceforge.net>
Date: Wed, 17 Apr 2013 15:54:00 +0000
Subject: [PATCH] Fixed CORE-4084 - GROUP BY fails if subselect-column is
 involved.

---
 src/jrd/RecordSourceNodes.cpp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/jrd/RecordSourceNodes.cpp b/src/jrd/RecordSourceNodes.cpp
index ca01a161eb..54f19add08 100644
--- a/src/jrd/RecordSourceNodes.cpp
+++ b/src/jrd/RecordSourceNodes.cpp
@@ -2247,7 +2247,9 @@ bool RseNode::dsqlMatch(const ExprNode* other, bool /*ignoreMapCast*/) const
 	if (!o)
 		return false;
 
-	return dsqlContext && dsqlContext == o->dsqlContext;
+	// ASF: Commented-out code "Fixed assertion when subquery is used in group by" to make
+	// CORE-4084 work again.
+	return /***dsqlContext &&***/ dsqlContext == o->dsqlContext;
 }
 
 // Make up join node and mark relations as "possibly NULL" if they are in outer joins (inOuterJoin).