Merge branch 'master' into picky_nodes

funbringer · funbringer · commit 810354b8dd0c · 2016-04-19T15:14:22.000+03:00
diff --git a/pg_pathman.c b/pg_pathman.c
@@ -738,7 +738,6 @@ append_child_relation(PlannerInfo *root, RelOptInfo *rel, Index rti,
 
 	/* Add child to relids */
 	rel->relids = bms_add_member(rel->relids, childRTindex);
-	root->all_baserels = bms_add_member(root->all_baserels, childRTindex);
 
 	/* Recalc parent relation tuples count */
 	rel->tuples += childrel->tuples;
