Fix thinko for case of outer join where inner table is empty: should

tglsfdc · tglsfdc · commit 780992316fc8 · 2000-12-13T23:45:46.000Z
output first outer tuple before advancing...
diff --git a/src/backend/executor/nodeMergejoin.c b/src/backend/executor/nodeMergejoin.c
@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/executor/nodeMergejoin.c,v 1.39 2000/11/16 22:30:22 tgl Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/executor/nodeMergejoin.c,v 1.40 2000/12/13 23:45:46 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -537,12 +537,13 @@ ExecMergeJoin(MergeJoin *node)
 					if (doFillOuter)
 					{
 						/*
-						 * Need to emit left-join tuples for remaining
-						 * outer tuples.  We set MatchedOuter = true to
-						 * force the ENDINNER state to advance outer.
+						 * Need to emit left-join tuples for all outer tuples,
+						 * including the one we just fetched.  We set
+						 * MatchedOuter = false to force the ENDINNER state
+						 * to emit this tuple before advancing outer.
 						 */
 						mergestate->mj_JoinState = EXEC_MJ_ENDINNER;
-						mergestate->mj_MatchedOuter = true;
+						mergestate->mj_MatchedOuter = false;
 						break;
 					}
 					/* Otherwise we're done. */

Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@`
`8`	`8`	`*`
`9`	`9`	`*`
`10`	`10`	`* IDENTIFICATION`
`11`		`- * $Header: /cvsroot/pgsql/src/backend/executor/nodeMergejoin.c,v 1.39 2000/11/16 22:30:22 tgl Exp $`
	`11`	`+ * $Header: /cvsroot/pgsql/src/backend/executor/nodeMergejoin.c,v 1.40 2000/12/13 23:45:46 tgl Exp $`
`12`	`12`	`*`
`13`	`13`	`*-------------------------------------------------------------------------`
`14`	`14`	`*/`
`@@ -537,12 +537,13 @@ ExecMergeJoin(MergeJoin *node)`
`537`	`537`	`if (doFillOuter)`
`538`	`538`	`{`
`539`	`539`	`/*`
`540`		`- * Need to emit left-join tuples for remaining`
`541`		`- * outer tuples. We set MatchedOuter = true to`
`542`		`- * force the ENDINNER state to advance outer.`
	`540`	`+ * Need to emit left-join tuples for all outer tuples,`
	`541`	`+ * including the one we just fetched. We set`
	`542`	`+ * MatchedOuter = false to force the ENDINNER state`
	`543`	`+ * to emit this tuple before advancing outer.`
`543`	`544`	`*/`
`544`	`545`	`mergestate->mj_JoinState = EXEC_MJ_ENDINNER;`
`545`		`- mergestate->mj_MatchedOuter = true;`
	`546`	`+ mergestate->mj_MatchedOuter = false;`
`546`	`547`	`break;`
`547`	`548`	`}`
`548`	`549`	`/* Otherwise we're done. */`