diff options
Diffstat (limited to 'src/backend/optimizer/util/plancat.c')
| -rw-r--r-- | src/backend/optimizer/util/plancat.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/src/backend/optimizer/util/plancat.c b/src/backend/optimizer/util/plancat.c index fdce5bb5a3f..10800b488f6 100644 --- a/src/backend/optimizer/util/plancat.c +++ b/src/backend/optimizer/util/plancat.c @@ -9,7 +9,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/optimizer/util/plancat.c,v 1.162 2010/01/05 21:53:58 rhaas Exp $ + * $PostgreSQL: pgsql/src/backend/optimizer/util/plancat.c,v 1.163 2010/03/30 21:58:10 tgl Exp $ * *------------------------------------------------------------------------- */ @@ -580,7 +580,10 @@ relation_excluded_by_constraints(PlannerInfo *root, /* Skip the test if constraint exclusion is disabled for the rel */ if (constraint_exclusion == CONSTRAINT_EXCLUSION_OFF || (constraint_exclusion == CONSTRAINT_EXCLUSION_PARTITION && - rel->reloptkind != RELOPT_OTHER_MEMBER_REL)) + !(rel->reloptkind == RELOPT_OTHER_MEMBER_REL || + (root->hasInheritedTarget && + rel->reloptkind == RELOPT_BASEREL && + rel->relid == root->parse->resultRelation)))) return false; /* |