Merge branch 'master' into picky_nodes

funbringer · funbringer · commit ef9f5d93912e · 2016-04-19T15:30:11.000+03:00
diff --git a/pg_pathman.c b/pg_pathman.c
@@ -736,9 +736,6 @@ append_child_relation(PlannerInfo *root, RelOptInfo *rel, Index rti,
 	}
 	childrel->has_eclass_joins = rel->has_eclass_joins;
 
-	/* Add child to relids */
-	rel->relids = bms_add_member(rel->relids, childRTindex);
-
 	/* Recalc parent relation tuples count */
 	rel->tuples += childrel->tuples;
 

Original file line number	Diff line number	Diff line change
`@@ -736,9 +736,6 @@ append_child_relation(PlannerInfo root, RelOptInfo rel, Index rti,`
`736`	`736`	`}`
`737`	`737`	`childrel->has_eclass_joins = rel->has_eclass_joins;`
`738`	`738`
`739`		`- /* Add child to relids */`
`740`		`- rel->relids = bms_add_member(rel->relids, childRTindex);`
`741`		`-`
`742`	`739`	`/* Recalc parent relation tuples count */`
`743`	`740`	`rel->tuples += childrel->tuples;`
`744`	`741`