postgrespro
diff --git a/‎src/backend/executor/nodeMergejoin.c
Lines changed: 15 additions & 1 deletion b/‎src/backend/executor/nodeMergejoin.c
Lines changed: 15 additions & 1 deletion
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *    $Header: /cvsroot/pgsql/src/backend/executor/nodeMergejoin.c,v 1.5 1996/11/10 02:59:54 momjian Exp $
+ *    $Header: /cvsroot/pgsql/src/backend/executor/nodeMergejoin.c,v 1.6 1997/08/06 03:41:29 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -374,6 +374,18 @@ ExecMergeTupleDump(ExprContext *econtext, MergeJoinState *mergestate)
     printf("******** \n");
 }
 
+static void
+CleanUpSort(Plan *plan) {
+
+    if (plan == NULL)
+	return;
+    
+    if (plan->type == T_Sort) {
+	Sort *sort = (Sort *)plan;
+	psort_end(sort);
+    }
+}
+
 /* ----------------------------------------------------------------
  *   	ExecMergeJoin
  *
@@ -676,6 +688,8 @@ ExecMergeJoin(MergeJoin *node)
 	     */
             if (TupIsNull(outerTupleSlot)) {
 		MJ_printf("ExecMergeJoin: **** outer tuple is nil ****\n");
+		CleanUpSort(node->join.lefttree->lefttree);
+		CleanUpSort(node->join.righttree->lefttree);
 		return NULL;
 	    }
Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@`
`7`	`7`	`*`
`8`	`8`	`*`
`9`	`9`	`* IDENTIFICATION`
`10`		`- * $Header: /cvsroot/pgsql/src/backend/executor/nodeMergejoin.c,v 1.5 1996/11/10 02:59:54 momjian Exp $`
	`10`	`+ * $Header: /cvsroot/pgsql/src/backend/executor/nodeMergejoin.c,v 1.6 1997/08/06 03:41:29 momjian Exp $`
`11`	`11`	`*`
`12`	`12`	`*-------------------------------------------------------------------------`
`13`	`13`	`*/`
`@@ -374,6 +374,18 @@ ExecMergeTupleDump(ExprContext econtext, MergeJoinState mergestate)`
`374`	`374`	`printf("******** \n");`
`375`	`375`	`}`
`376`	`376`
	`377`	`+static void`
	`378`	`+CleanUpSort(Plan *plan) {`
	`379`	`+`
	`380`	`+ if (plan == NULL)`
	`381`	`+ return;`
	`382`	`+`
	`383`	`+ if (plan->type == T_Sort) {`
	`384`	`+ Sort sort = (Sort )plan;`
	`385`	`+ psort_end(sort);`
	`386`	`+ }`
	`387`	`+}`
	`388`	`+`
`377`	`389`	`/* ----------------------------------------------------------------`
`378`	`390`	`* ExecMergeJoin`
`379`	`391`	`*`
`@@ -676,6 +688,8 @@ ExecMergeJoin(MergeJoin *node)`
`676`	`688`	`*/`
`677`	`689`	`if (TupIsNull(outerTupleSlot)) {`
`678`	`690`	`MJ_printf("ExecMergeJoin: ** outer tuple is nil **\n");`
	`691`	`+ CleanUpSort(node->join.lefttree->lefttree);`
	`692`	`+ CleanUpSort(node->join.righttree->lefttree);`
`679`	`693`	`return NULL;`
`680`	`694`	`}`
`681`	`695`