aboutsummaryrefslogtreecommitdiff
path: root/src/include/nodes
diff options
context:
space:
mode:
Diffstat (limited to 'src/include/nodes')
-rw-r--r--src/include/nodes/plannodes.h4
-rw-r--r--src/include/nodes/relation.h8
2 files changed, 6 insertions, 6 deletions
diff --git a/src/include/nodes/plannodes.h b/src/include/nodes/plannodes.h
index 9541e64b14e..5de80471b3d 100644
--- a/src/include/nodes/plannodes.h
+++ b/src/include/nodes/plannodes.h
@@ -6,7 +6,7 @@
*
* Copyright (c) 1994, Regents of the University of California
*
- * $Id: plannodes.h,v 1.16 1998/07/15 14:54:39 momjian Exp $
+ * $Id: plannodes.h,v 1.17 1998/08/04 16:44:24 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -211,7 +211,7 @@ typedef struct MergeJoin
{
Join join;
List *mergeclauses;
- Oid mergesortop;
+ Oid mergejoinop;
Oid *mergerightorder;/* inner sort operator */
Oid *mergeleftorder; /* outer sort operator */
MergeJoinState *mergestate;
diff --git a/src/include/nodes/relation.h b/src/include/nodes/relation.h
index baee1b1d079..11871611445 100644
--- a/src/include/nodes/relation.h
+++ b/src/include/nodes/relation.h
@@ -6,7 +6,7 @@
*
* Copyright (c) 1994, Regents of the University of California
*
- * $Id: relation.h,v 1.8 1998/07/18 04:22:45 momjian Exp $
+ * $Id: relation.h,v 1.9 1998/08/04 16:44:26 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -215,8 +215,8 @@ typedef struct CInfo
bool notclause;
List *indexids;
- /* mergesort only */
- MergeOrder *mergesortorder;
+ /* mergejoin only */
+ MergeOrder *mergejoinorder;
/* hashjoin only */
Oid hashjoinoperator;
@@ -247,7 +247,7 @@ typedef struct JInfo
NodeTag type;
List *otherrels;
List *jinfoclauseinfo;
- bool mergesortable;
+ bool mergejoinable;
bool hashjoinable;
bool inactive;
} JInfo;