Merge commit '43e6683f82a225d3d539cb41d53b9a868fce34ee' into PGPRO9_6_1C

dmpgpro · dmpgpro · commit ecf74d6a7699 · 2016-11-14T16:58:22.000+03:00
diff --git a/contrib/pg_pathman/src/pg_compat.h b/contrib/pg_pathman/src/pg_compat.h
@@ -35,8 +35,13 @@ extern void copy_targetlist_compat(RelOptInfo *dest, RelOptInfo *rel);
 #define check_index_predicates_compat(rool, rel) \
 		check_index_predicates(root, rel)
 
+#ifndef PGPRO_VERSION
 #define create_append_path_compat(rel, subpaths, required_outer, parallel_workers) \
 		create_append_path(rel, subpaths, required_outer, parallel_workers)
+#else
+#define create_append_path_compat(rel, subpaths, required_outer, parallel_workers) \
+		create_append_path(rel, subpaths, required_outer, false, NIL, parallel_workers)
+#endif
 
 #define pull_var_clause_compat(node, aggbehavior, phbehavior) \
 		pull_var_clause(node, aggbehavior | phbehavior)
