2 files changed, 18 insertions, 25 deletions
diff --git a/src/include/executor/execdebug.h b/src/include/executor/execdebug.h
index 58a987107de..9a6969ecefc 100644
--- a/src/include/executor/execdebug.h
+++ b/src/include/executor/execdebug.h
@@ -7,7 +7,7 @@
  * Portions Copyright (c) 1996-2005, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $PostgreSQL: pgsql/src/include/executor/execdebug.h,v 1.26 2005/03/16 21:38:09 tgl Exp $
+ * $PostgreSQL: pgsql/src/include/executor/execdebug.h,v 1.27 2005/05/13 21:20:16 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -258,17 +258,14 @@ extern int	NIndexTupleInserted;
 #define MJ2_printf(s, p1, p2)			printf(s, p1, p2)
 #define MJ_debugtup(slot)				debugtup(slot, NULL)
 #define MJ_dump(state)					ExecMergeTupleDump(state)
+#define MJ_DEBUG_COMPARE(res) \
+  MJ1_printf("  MJCompare() returns %d\n", (res))
 #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", \
-			 CppAsString(qual), T_OR_F(res));
-
+			 CppAsString(clause), T_OR_F(res))
 #define MJ_DEBUG_PROC_NODE(slot) \
   MJ2_printf("  %s = ExecProcNode(...) returns %s\n", \
-			 CppAsString(slot), NULL_OR_TUPLE(slot));
+			 CppAsString(slot), NULL_OR_TUPLE(slot))
 
 #else
 
@@ -278,8 +275,8 @@ extern int	NIndexTupleInserted;
 #define MJ2_printf(s, p1, p2)
 #define MJ_debugtup(slot)
 #define MJ_dump(state)
+#define MJ_DEBUG_COMPARE(res)
 #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 100049fdf83..e8ef7a47fd0 100644
--- a/src/include/executor/execdefs.h
+++ b/src/include/executor/execdefs.h
@@ -7,7 +7,7 @@
  * Portions Copyright (c) 1996-2005, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $PostgreSQL: pgsql/src/include/executor/execdefs.h,v 1.17 2004/12/31 22:03:29 pgsql Exp $
+ * $PostgreSQL: pgsql/src/include/executor/execdefs.h,v 1.18 2005/05/13 21:20:16 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -18,20 +18,16 @@
  *		Merge Join states
  * ----------------
  */
-#define EXEC_MJ_INITIALIZE				1
-#define EXEC_MJ_JOINMARK				2
-#define EXEC_MJ_JOINTEST				3
-#define EXEC_MJ_JOINTUPLES				4
-#define EXEC_MJ_NEXTOUTER				5
-#define EXEC_MJ_TESTOUTER				6
-#define EXEC_MJ_NEXTINNER				7
-#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
+#define EXEC_MJ_INITIALIZE_OUTER		1
+#define EXEC_MJ_INITIALIZE_INNER		2
+#define EXEC_MJ_JOINTUPLES				3
+#define EXEC_MJ_NEXTOUTER				4
+#define EXEC_MJ_TESTOUTER				5
+#define EXEC_MJ_NEXTINNER				6
+#define EXEC_MJ_SKIP_TEST				7
+#define EXEC_MJ_SKIPOUTER_ADVANCE		8
+#define EXEC_MJ_SKIPINNER_ADVANCE		9
+#define EXEC_MJ_ENDOUTER				10
+#define EXEC_MJ_ENDINNER				11
 
 #endif   /* EXECDEFS_H */