1 files changed, 13 insertions, 5 deletions
diff --git a/src/backend/optimizer/plan/subselect.c b/src/backend/optimizer/plan/subselect.c
index 040c6732ccc..b5e4b1d8c84 100644
--- a/src/backend/optimizer/plan/subselect.c
+++ b/src/backend/optimizer/plan/subselect.c
@@ -404,12 +404,20 @@ SS_process_sublinks(Node *expr)
 		((Expr *) expr)->args = (List *)
 			SS_process_sublinks((Node *) ((Expr *) expr)->args);
 	else if (IsA(expr, SubLink))/* got it! */
-	  {
-	    lfirst(((Expr *) lfirst(((SubLink *)expr)->oper))->args) = 
-				  lfirst(((SubLink *)expr)->lefthand);
-
+	{
+          /* Hack to make sure expr->oper->args points to the same VAR node
+           * as expr->lefthand does. Needed for subselects in the havingQual
+           * when used on views.
+           * Otherwise aggregate functions will fail later on (at execution 
+           * time!) Reason: The rewite System makes several copies of the
+           * VAR nodes and in this case it should not do so :-( */
+	    if(expr->lefthand != NULL)
+		{
+			lfirst(((Expr *) lfirst(((SubLink *)expr)->oper))->args) = 
+			lfirst(((SubLink *)expr)->lefthand);
+		}
 	    expr = _make_subplan((SubLink *) expr);
-	  }
+	}
 	
 	return (expr);
 }