Merge branch 'merge_concurrent' into merge_concurrent_locks

funbringer · funbringer · commit 788988755be3 · 2016-08-31T14:08:02.000+03:00
diff --git a/src/pg_pathman.c b/src/pg_pathman.c
@@ -498,9 +498,11 @@ append_child_relation(PlannerInfo *root, RelOptInfo *rel, Index rti,
 		foreach(lc, rel->baserestrictinfo)
 		{
 			RestrictInfo *rinfo = (RestrictInfo *) lfirst(lc);
+			RestrictInfo *new_rinfo = (RestrictInfo *) copyObject(rinfo);
 
+			change_varnos((Node *)new_rinfo, rel->relid, childrel->relid);
 			childrel->baserestrictinfo = lappend(childrel->baserestrictinfo,
-												 (RestrictInfo *) copyObject(rinfo));
+												 (void *) new_rinfo);
 		}
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -498,9 +498,11 @@ append_child_relation(PlannerInfo root, RelOptInfo rel, Index rti,`
`498`	`498`	`foreach(lc, rel->baserestrictinfo)`
`499`	`499`	`{`
`500`	`500`	`RestrictInfo rinfo = (RestrictInfo ) lfirst(lc);`
	`501`	`+ RestrictInfo new_rinfo = (RestrictInfo ) copyObject(rinfo);`
`501`	`502`
	`503`	`+ change_varnos((Node *)new_rinfo, rel->relid, childrel->relid);`
`502`	`504`	`childrel->baserestrictinfo = lappend(childrel->baserestrictinfo,`
`503`		`- (RestrictInfo *) copyObject(rinfo));`
	`505`	`+ (void *) new_rinfo);`
`504`	`506`	`}`
`505`	`507`	`}`
`506`	`508`