aboutsummaryrefslogtreecommitdiff
path: root/src/backend/executor/nodeMergejoin.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/backend/executor/nodeMergejoin.c')
-rw-r--r--src/backend/executor/nodeMergejoin.c14
1 files changed, 9 insertions, 5 deletions
diff --git a/src/backend/executor/nodeMergejoin.c b/src/backend/executor/nodeMergejoin.c
index 3f81b1b89a9..9151479d306 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.7 1997/08/12 22:52:38 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/executor/nodeMergejoin.c,v 1.8 1997/08/19 21:31:10 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -84,6 +84,8 @@
#include "utils/lsyscache.h"
#include "utils/psort.h"
+static bool MergeCompare(List *eqQual, List *compareQual, ExprContext *econtext);
+
/* ----------------------------------------------------------------
* MarkInnerTuple and RestoreInnerTuple macros
*
@@ -251,7 +253,7 @@ MJFormISortopO(List *qualList, Oid sortOp)
* if (key1i > key2i) is true and (key1j = key2j) for 0 < j < i.
* ----------------------------------------------------------------
*/
-bool
+static bool
MergeCompare(List *eqQual, List *compareQual, ExprContext *econtext)
{
List *clause;
@@ -319,6 +321,7 @@ MergeCompare(List *eqQual, List *compareQual, ExprContext *econtext)
* when EXEC_MERGEJOINDEBUG is defined
* ----------------------------------------------------------------
*/
+#ifdef EXEC_MERGEJOINDEBUG
void
ExecMergeTupleDumpInner(ExprContext *econtext)
{
@@ -332,7 +335,7 @@ ExecMergeTupleDumpInner(ExprContext *econtext)
debugtup(innerSlot->val,
innerSlot->ttc_tupleDescriptor);
}
-
+
void
ExecMergeTupleDumpOuter(ExprContext *econtext)
{
@@ -346,7 +349,7 @@ ExecMergeTupleDumpOuter(ExprContext *econtext)
debugtup(outerSlot->val,
outerSlot->ttc_tupleDescriptor);
}
-
+
void
ExecMergeTupleDumpMarked(ExprContext *econtext,
MergeJoinState *mergestate)
@@ -362,7 +365,7 @@ ExecMergeTupleDumpMarked(ExprContext *econtext,
debugtup(markedSlot->val,
markedSlot->ttc_tupleDescriptor);
}
-
+
void
ExecMergeTupleDump(ExprContext *econtext, MergeJoinState *mergestate)
{
@@ -374,6 +377,7 @@ ExecMergeTupleDump(ExprContext *econtext, MergeJoinState *mergestate)
printf("******** \n");
}
+#endif
static void
CleanUpSort(Plan *plan) {