Fix for drop database and junk filters.

bmomjian · bmomjian · commit b15b768bfaa7 · 1998-05-26T03:44:07.000Z
diff --git a/src/backend/executor/execMain.c b/src/backend/executor/execMain.c
@@ -26,7 +26,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/executor/execMain.c,v 1.46 1998/05/21 03:53:50 scrappy Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/executor/execMain.c,v 1.47 1998/05/26 03:44:07 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -530,7 +530,8 @@ InitPlan(CmdType operation, Query *parseTree, Plan *plan, EState *estate)
 		JunkFilter *j = (JunkFilter *) ExecInitJunkFilter(targetList);
 		estate->es_junkFilter = j;
 
-		tupType = j->jf_cleanTupType;       /*  Added by daveh@insightdist.com  5/20/98   */
+		if (operation == CMD_SELECT)
+			tupType = j->jf_cleanTupType;
 	}
 	else
 		estate->es_junkFilter = NULL;

Original file line number	Diff line number	Diff line change
`@@ -26,7 +26,7 @@`
`26`	`26`	`*`
`27`	`27`	`*`
`28`	`28`	`* IDENTIFICATION`
`29`		`- * $Header: /cvsroot/pgsql/src/backend/executor/execMain.c,v 1.46 1998/05/21 03:53:50 scrappy Exp $`
	`29`	`+ * $Header: /cvsroot/pgsql/src/backend/executor/execMain.c,v 1.47 1998/05/26 03:44:07 momjian Exp $`
`30`	`30`	`*`
`31`	`31`	`*-------------------------------------------------------------------------`
`32`	`32`	`*/`
`@@ -530,7 +530,8 @@ InitPlan(CmdType operation, Query parseTree, Plan plan, EState *estate)`
`530`	`530`	`JunkFilter j = (JunkFilter ) ExecInitJunkFilter(targetList);`
`531`	`531`	`estate->es_junkFilter = j;`
`532`	`532`
`533`		`- tupType = j->jf_cleanTupType; /* Added by daveh@insightdist.com 5/20/98 */`
	`533`	`+ if (operation == CMD_SELECT)`
	`534`	`+ tupType = j->jf_cleanTupType;`
`534`	`535`	`}`
`535`	`536`	`else`
`536`	`537`	`estate->es_junkFilter = NULL;`