3 files changed, 22 insertions, 24 deletions
diff --git a/src/include/executor/execdebug.h b/src/include/executor/execdebug.h
index 7eb6667da03..c4ba3d1f5b6 100644
--- a/src/include/executor/execdebug.h
+++ b/src/include/executor/execdebug.h
@@ -7,7 +7,7 @@
  * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $Id: execdebug.h,v 1.13 2000/06/15 00:52:07 momjian Exp $
+ * $Id: execdebug.h,v 1.14 2000/09/12 21:07:09 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -129,16 +129,6 @@
  */
 
 /* ----------------
- *		EXEC_MERGEJOINPFREE is a flag which causes merge joins
- *		to pfree intermittant tuples (which is the proper thing)
- *		Not defining this means we avoid menory management problems
- *		at the cost of doing deallocation of stuff only at the
- *		end of the transaction
- * ----------------
-#undef EXEC_MERGEJOINPFREE
- */
-
-/* ----------------
  *		EXEC_DEBUGINTERACTIVE is a flag which enables the
  *		user to issue "DEBUG" commands from an interactive
  *		backend.
@@ -170,11 +160,10 @@
  *			  only as necessary -cim 10/26/89
  * ----------------------------------------------------------------
  */
-#define T_OR_F(b)				(b ? "true" : "false")
+#define T_OR_F(b)				((b) ? "true" : "false")
 #define NULL_OR_TUPLE(slot)		(TupIsNull(slot) ? "null" : "a tuple")
 
 
-/* #define EXEC_TUPLECOUNT - XXX take out for now for executor stubbing -- jolly*/
 /* ----------------
  *		tuple count debugging defines
  * ----------------
@@ -326,28 +315,31 @@ extern int	NIndexTupleInserted;
 #define MJ1_printf(s, p)				printf(s, p)
 #define MJ2_printf(s, p1, p2)			printf(s, p1, p2)
 #define MJ_debugtup(tuple, type)		debugtup(tuple, type, NULL)
-#define MJ_dump(context, state)			ExecMergeTupleDump(econtext, state)
+#define MJ_dump(state)					ExecMergeTupleDump(state)
 #define MJ_DEBUG_QUAL(clause, res) \
   MJ2_printf("  ExecQual(%s, econtext) returns %s\n", \
 			 CppAsString(clause), T_OR_F(res));
 
 #define MJ_DEBUG_MERGE_COMPARE(qual, res) \
-  MJ2_printf("  MergeCompare(mergeclauses, %s, ..) returns %s\n", \
+  MJ2_printf("  MergeCompare(mergeclauses, %s, ...) returns %s\n", \
 			 CppAsString(qual), T_OR_F(res));
 
 #define MJ_DEBUG_PROC_NODE(slot) \
-  MJ2_printf("  %s = ExecProcNode(innerPlan) returns %s\n", \
+  MJ2_printf("  %s = ExecProcNode(...) returns %s\n", \
 			 CppAsString(slot), NULL_OR_TUPLE(slot));
+
 #else
+
 #define MJ_nodeDisplay(l)
 #define MJ_printf(s)
 #define MJ1_printf(s, p)
 #define MJ2_printf(s, p1, p2)
 #define MJ_debugtup(tuple, type)
-#define MJ_dump(context, state)
+#define MJ_dump(state)
 #define MJ_DEBUG_QUAL(clause, res)
 #define MJ_DEBUG_MERGE_COMPARE(qual, res)
 #define MJ_DEBUG_PROC_NODE(slot)
+
 #endif	 /* EXEC_MERGEJOINDEBUG */
 
 /* ----------------------------------------------------------------
diff --git a/src/include/executor/execdefs.h b/src/include/executor/execdefs.h
index 89fed192cdd..6b9457969b1 100644
--- a/src/include/executor/execdefs.h
+++ b/src/include/executor/execdefs.h
@@ -7,7 +7,7 @@
  * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $Id: execdefs.h,v 1.6 2000/01/26 05:58:05 momjian Exp $
+ * $Id: execdefs.h,v 1.7 2000/09/12 21:07:09 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -42,9 +42,13 @@
 #define EXEC_MJ_NEXTOUTER				5
 #define EXEC_MJ_TESTOUTER				6
 #define EXEC_MJ_NEXTINNER				7
-#define EXEC_MJ_SKIPINNER				8
-#define EXEC_MJ_SKIPOUTER				9
-#define EXEC_MJ_FILLINNER			   10
-#define EXEC_MJ_FILLOUTER			   11
+#define EXEC_MJ_SKIPOUTER_BEGIN			8
+#define EXEC_MJ_SKIPOUTER_TEST			9
+#define EXEC_MJ_SKIPOUTER_ADVANCE		10
+#define EXEC_MJ_SKIPINNER_BEGIN			11
+#define EXEC_MJ_SKIPINNER_TEST			12
+#define EXEC_MJ_SKIPINNER_ADVANCE		13
+#define EXEC_MJ_ENDOUTER				14
+#define EXEC_MJ_ENDINNER				15
 
 #endif	 /* EXECDEFS_H */
diff --git a/src/include/executor/executor.h b/src/include/executor/executor.h
index 5eb7cbb93ba..5c330915e75 100644
--- a/src/include/executor/executor.h
+++ b/src/include/executor/executor.h
@@ -7,7 +7,7 @@
  * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $Id: executor.h,v 1.50 2000/08/24 23:34:09 tgl Exp $
+ * $Id: executor.h,v 1.51 2000/09/12 21:07:09 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -117,7 +117,9 @@ extern void ExecSetSlotDescriptorIsNew(TupleTableSlot *slot, bool isNew);
 extern void ExecInitResultTupleSlot(EState *estate, CommonState *commonstate);
 extern void ExecInitScanTupleSlot(EState *estate,
 					  CommonScanState *commonscanstate);
-extern void ExecInitOuterTupleSlot(EState *estate, HashJoinState *hashstate);
+extern TupleTableSlot *ExecInitExtraTupleSlot(EState *estate);
+extern TupleTableSlot *ExecInitNullTupleSlot(EState *estate,
+											 TupleDesc tupType);
 
 extern TupleDesc ExecGetTupType(Plan *node);
 extern TupleDesc ExecTypeFromTL(List *targetList);