Fix executor to work correctly with mergejoins where left and

[postgresql] / src / include / nodes / execnodes.h

diff --git a/src/include/nodes/execnodes.h b/src/include/nodes/execnodes.h
index 45625c62e7b8957865361ddc309a22223d33c7ee..c7f6fa35b2d245a09ead74539f4e82395f52590f 100644 (file)
--- a/src/include/nodes/execnodes.h
+++ b/src/include/nodes/execnodes.h
@@ -1,12 +1,12 @@
 /*-------------------------------------------------------------------------
  *
- * execnodes.h--
+ * execnodes.h
  *       definitions for executor state nodes
  *
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: execnodes.h,v 1.23 1999/02/07 16:17:14 wieck Exp $
+ * $Id: execnodes.h,v 1.26 1999/02/28 00:36:04 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -463,8 +463,8 @@ typedef struct NestLoopState
 /* ----------------
  *      MergeJoinState information
  *
- *             OSortopI                   outerKey1 sortOp innerKey1 ...
- *             ISortopO                   innerkey1 sortOp outerkey1 ...
+ *             OuterSkipQual      outerKey1 < innerKey1 ...
+ *             InnerSkipQual      outerKey1 > innerKey1 ...
  *             JoinState                  current "state" of join. see executor.h
  *             MarkedTupleSlot    pointer to slot in tuple table for marked tuple
  *
@@ -483,8 +483,8 @@ typedef struct NestLoopState
 typedef struct MergeJoinState
 {
        JoinState       jstate;                 /* its first field is NodeTag */
-       List       *mj_OSortopI;
-       List       *mj_ISortopO;
+       List       *mj_OuterSkipQual;
+       List       *mj_InnerSkipQual;
        int                     mj_JoinState;
        TupleTableSlot *mj_MarkedTupleSlot;
 } MergeJoinState;
@@ -607,7 +607,7 @@ typedef struct GroupState
  *      SortState information
  *
  *|            sort nodes are really just a kind of a scan since
- *|            we implement sorts by retrieveing the entire subplan
+ *|            we implement sorts by retrieving the entire subplan
  *|            into a temp relation, sorting the temp relation into
  *|            another sorted relation, and then preforming a simple
  *|            unqualified sequential scan on the sorted relation..