Merge branch 'master' into rework_query_walkers

Author: funbringer

src/nodes_common.c

@@ -259,7 +259,7 @@ get_partitioned_attr_clauses(List *restrictinfo_list,
 							 Index partitioned_rel)
 {
 #define AdjustAttno(attno) \
-	( (AttrNumber) (part_attno + FirstLowInvalidHeapAttributeNumber) )
+	( (AttrNumber) (attno + FirstLowInvalidHeapAttributeNumber) )
 
 	List	   *result = NIL;
 	ListCell   *l;

src/pg_pathman.c

@@ -544,6 +544,7 @@ append_child_relation(PlannerInfo *root, RelOptInfo *rel, Index rti,
 	/* Recalc parent relation tuples count */
 	rel->tuples += childrel->tuples;
 
+	/* Close child relations, but keep locks */
 	heap_close(newrelation, NoLock);