3 files changed, 6 insertions, 5 deletions
diff --git a/src/backend/executor/execMain.c b/src/backend/executor/execMain.c
index fd4f5fe6840..7c93fe2af66 100644
--- a/src/backend/executor/execMain.c
+++ b/src/backend/executor/execMain.c
@@ -26,7 +26,7 @@
  *
  *
  * IDENTIFICATION
- *    $Header: /cvsroot/pgsql/src/backend/executor/execMain.c,v 1.13 1997/05/31 16:52:00 momjian Exp $
+ *    $Header: /cvsroot/pgsql/src/backend/executor/execMain.c,v 1.14 1997/08/12 22:52:33 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -963,7 +963,7 @@ ExecDelete(TupleTableSlot *slot,
      *	delete the tuple
      * ----------------
      */
-    (void) heap_delete(resultRelationDesc, /* relation desc */
+    heap_delete(resultRelationDesc, /* relation desc */
 			tupleid);	    /* item pointer to tuple */
 
     IncrDeleted();
diff --git a/src/backend/executor/functions.c b/src/backend/executor/functions.c
index d9094c6b65e..19feea39e20 100644
--- a/src/backend/executor/functions.c
+++ b/src/backend/executor/functions.c
@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *    $Header: /cvsroot/pgsql/src/backend/executor/functions.c,v 1.5 1997/01/22 05:26:37 vadim Exp $
+ *    $Header: /cvsroot/pgsql/src/backend/executor/functions.c,v 1.6 1997/08/12 22:52:35 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -294,7 +294,7 @@ postquel_execute(execution_state  *es,
     
     if (es->status == F_EXEC_START)
 	{
-	    (void) postquel_start(es);
+	    postquel_start(es);
 	    es->status = F_EXEC_RUN;
 	}
 #ifndef INDEXSCAN_PATCH
diff --git a/src/backend/executor/nodeMergejoin.c b/src/backend/executor/nodeMergejoin.c
index 65d8482cad7..3f81b1b89a9 100644
--- a/src/backend/executor/nodeMergejoin.c
+++ b/src/backend/executor/nodeMergejoin.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *    $Header: /cvsroot/pgsql/src/backend/executor/nodeMergejoin.c,v 1.6 1997/08/06 03:41:29 momjian Exp $
+ *    $Header: /cvsroot/pgsql/src/backend/executor/nodeMergejoin.c,v 1.7 1997/08/12 22:52:38 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -82,6 +82,7 @@
 #include "executor/nodeMergejoin.h"
 #include "executor/execdebug.h"
 #include "utils/lsyscache.h"
+#include "utils/psort.h"
 
 /* ----------------------------------------------------------------
  *	MarkInnerTuple and RestoreInnerTuple macros