diff options
Diffstat (limited to 'src/include')
-rw-r--r-- | src/include/nodes/relation.h | 6 | ||||
-rw-r--r-- | src/include/optimizer/paths.h | 1 |
2 files changed, 6 insertions, 1 deletions
diff --git a/src/include/nodes/relation.h b/src/include/nodes/relation.h index a2853fbf044..57083d3ec94 100644 --- a/src/include/nodes/relation.h +++ b/src/include/nodes/relation.h @@ -150,7 +150,8 @@ typedef struct PlannerInfo /* * all_baserels is a Relids set of all base relids (but not "other" * relids) in the query; that is, the Relids identifier of the final join - * we need to form. + * we need to form. This is computed in make_one_rel, just before we + * start making Paths. */ Relids all_baserels; @@ -243,6 +244,9 @@ typedef struct PlannerInfo /* optional private data for join_search_hook, e.g., GEQO */ void *join_search_private; + + /* This will be in a saner place in 9.4: */ + Relids nullable_baserels; } PlannerInfo; diff --git a/src/include/optimizer/paths.h b/src/include/optimizer/paths.h index 9ef93c70c64..96ffdb195fe 100644 --- a/src/include/optimizer/paths.h +++ b/src/include/optimizer/paths.h @@ -109,6 +109,7 @@ extern Expr *canonicalize_ec_expression(Expr *expr, extern void reconsider_outer_join_clauses(PlannerInfo *root); extern EquivalenceClass *get_eclass_for_sort_expr(PlannerInfo *root, Expr *expr, + Relids nullable_relids, List *opfamilies, Oid opcintype, Oid collation, |