*** pgsql/src/include/nodes/execnodes.h	2009/08/23 18:26:15	1.205.2.1
--- pgsql/src/include/nodes/execnodes.h	2010/01/05 23:25:44	1.205.2.2
***************
*** 7,13 ****
   * Portions Copyright (c) 1996-2009, PostgreSQL Global Development Group
   * Portions Copyright (c) 1994, Regents of the University of California
   *
!  * $PostgreSQL: pgsql/src/include/nodes/execnodes.h,v 1.205 2009/06/11 14:49:11 momjian Exp $
   *
   *-------------------------------------------------------------------------
   */
--- 7,13 ----
   * Portions Copyright (c) 1996-2009, PostgreSQL Global Development Group
   * Portions Copyright (c) 1994, Regents of the University of California
   *
!  * $PostgreSQL: pgsql/src/include/nodes/execnodes.h,v 1.205.2.1 2009/08/23 18:26:15 tgl Exp $
   *
   *-------------------------------------------------------------------------
   */
*************** typedef struct NestLoopState
*** 1344,1349 ****
--- 1344,1350 ----
   *		Clauses			   info for each mergejoinable clause
   *		JoinState		   current "state" of join.  see execdefs.h
   *		ExtraMarks		   true to issue extra Mark operations on inner scan
+  *		ConstFalseJoin	   true if we have a constant-false joinqual
   *		FillOuter		   true if should emit unjoined outer tuples anyway
   *		FillInner		   true if should emit unjoined inner tuples anyway
   *		MatchedOuter	   true if found a join match for current outer tuple
*************** typedef struct MergeJoinState
*** 1367,1372 ****
--- 1368,1374 ----
  	MergeJoinClause mj_Clauses; /* array of length mj_NumClauses */
  	int			mj_JoinState;
  	bool		mj_ExtraMarks;
+ 	bool		mj_ConstFalseJoin;
  	bool		mj_FillOuter;
  	bool		mj_FillInner;
  	bool		mj_MatchedOuter;