postgrespro
diff --git a/‎src/backend/nodes/copyfuncs.c
Lines changed: 2 additions & 1 deletion b/‎src/backend/nodes/copyfuncs.c
Lines changed: 2 additions & 1 deletion
diff --git a/‎src/backend/nodes/outfuncs.c
Lines changed: 3 additions & 1 deletion b/‎src/backend/nodes/outfuncs.c
Lines changed: 3 additions & 1 deletion
diff --git a/‎src/backend/optimizer/plan/planner.c
Lines changed: 5 additions & 2 deletions b/‎src/backend/optimizer/plan/planner.c
Lines changed: 5 additions & 2 deletions
@@ -15,7 +15,7 @@
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/backend/nodes/copyfuncs.c,v 1.382 2007/09/03 18:46:30 tgl Exp $
+ *	  $PostgreSQL: pgsql/src/backend/nodes/copyfuncs.c,v 1.383 2007/10/11 18:05:26 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -83,6 +83,7 @@ _copyPlannedStmt(PlannedStmt *from)
 	COPY_BITMAPSET_FIELD(rewindPlanIDs);
 	COPY_NODE_FIELD(returningLists);
 	COPY_NODE_FIELD(rowMarks);
+	COPY_NODE_FIELD(relationOids);
 	COPY_SCALAR_FIELD(nParamExec);
 
 	return newnode;
 
@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/backend/nodes/outfuncs.c,v 1.314 2007/08/31 01:44:05 tgl Exp $
+ *	  $PostgreSQL: pgsql/src/backend/nodes/outfuncs.c,v 1.315 2007/10/11 18:05:27 tgl Exp $
  *
  * NOTES
  *	  Every node type that can appear in stored rules' parsetrees *must*
@@ -250,6 +250,7 @@ _outPlannedStmt(StringInfo str, PlannedStmt *node)
 	WRITE_BITMAPSET_FIELD(rewindPlanIDs);
 	WRITE_NODE_FIELD(returningLists);
 	WRITE_NODE_FIELD(rowMarks);
+	WRITE_NODE_FIELD(relationOids);
 	WRITE_INT_FIELD(nParamExec);
 }
 
@@ -1300,6 +1301,7 @@ _outPlannerGlobal(StringInfo str, PlannerGlobal *node)
 	WRITE_NODE_FIELD(subrtables);
 	WRITE_BITMAPSET_FIELD(rewindPlanIDs);
 	WRITE_NODE_FIELD(finalrtable);
+	WRITE_NODE_FIELD(relationOids);
 }
 
 static void
 
@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/backend/optimizer/plan/planner.c,v 1.222 2007/09/20 17:56:31 tgl Exp $
+ *	  $PostgreSQL: pgsql/src/backend/optimizer/plan/planner.c,v 1.223 2007/10/11 18:05:27 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -134,6 +134,7 @@ standard_planner(Query *parse, int cursorOptions, ParamListInfo boundParams)
 	glob->subrtables = NIL;
 	glob->rewindPlanIDs = NULL;
 	glob->finalrtable = NIL;
+	glob->relationOids = NIL;
 	glob->transientPlan = false;
 
 	/* Determine what fraction of the plan is likely to be scanned */
@@ -194,6 +195,7 @@ standard_planner(Query *parse, int cursorOptions, ParamListInfo boundParams)
 	result->rewindPlanIDs = glob->rewindPlanIDs;
 	result->returningLists = root->returningLists;
 	result->rowMarks = parse->rowMarks;
+	result->relationOids = glob->relationOids;
 	result->nParamExec = list_length(glob->paramlist);
 
 	return result;
@@ -1184,7 +1186,8 @@ grouping_planner(PlannerInfo *root, double tuple_fraction)
 		List	   *rlist;
 
 		Assert(parse->resultRelation);
-		rlist = set_returning_clause_references(parse->returningList,
+		rlist = set_returning_clause_references(root->glob,
+												parse->returningList,
 												result_plan,
 												parse->resultRelation);
 		root->returningLists = list_make1(rlist);
Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@`
`8`	`8`	`*`
`9`	`9`	`*`
`10`	`10`	`* IDENTIFICATION`
`11`		`- * $PostgreSQL: pgsql/src/backend/nodes/outfuncs.c,v 1.314 2007/08/31 01:44:05 tgl Exp $`
	`11`	`+ * $PostgreSQL: pgsql/src/backend/nodes/outfuncs.c,v 1.315 2007/10/11 18:05:27 tgl Exp $`
`12`	`12`	`*`
`13`	`13`	`* NOTES`
`14`	`14`	`* Every node type that can appear in stored rules' parsetrees must`
`@@ -250,6 +250,7 @@ _outPlannedStmt(StringInfo str, PlannedStmt *node)`
`250`	`250`	`WRITE_BITMAPSET_FIELD(rewindPlanIDs);`
`251`	`251`	`WRITE_NODE_FIELD(returningLists);`
`252`	`252`	`WRITE_NODE_FIELD(rowMarks);`
	`253`	`+ WRITE_NODE_FIELD(relationOids);`
`253`	`254`	`WRITE_INT_FIELD(nParamExec);`
`254`	`255`	`}`
`255`	`256`
`@@ -1300,6 +1301,7 @@ _outPlannerGlobal(StringInfo str, PlannerGlobal *node)`
`1300`	`1301`	`WRITE_NODE_FIELD(subrtables);`
`1301`	`1302`	`WRITE_BITMAPSET_FIELD(rewindPlanIDs);`
`1302`	`1303`	`WRITE_NODE_FIELD(finalrtable);`
	`1304`	`+ WRITE_NODE_FIELD(relationOids);`
`1303`	`1305`	`}`
`1304`	`1306`
`1305`	`1307`	`static void`