*** pgsql/src/backend/optimizer/util/plancat.c	2009/06/11 14:48:59	1.158
--- pgsql/src/backend/optimizer/util/plancat.c	2010/03/30 21:58:18	1.158.2.1
***************
*** 9,15 ****
   *
   *
   * IDENTIFICATION
!  *	  $PostgreSQL: pgsql/src/backend/optimizer/util/plancat.c,v 1.157 2009/05/12 00:56:05 tgl Exp $
   *
   *-------------------------------------------------------------------------
   */
--- 9,15 ----
   *
   *
   * IDENTIFICATION
!  *	  $PostgreSQL: pgsql/src/backend/optimizer/util/plancat.c,v 1.158 2009/06/11 14:48:59 momjian Exp $
   *
   *-------------------------------------------------------------------------
   */
*************** relation_excluded_by_constraints(Planner
*** 576,582 ****
  	/* 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))
  		return false;
  
  	/*
--- 576,585 ----
  	/* 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 ||
! 		   (root->hasInheritedTarget &&
! 			rel->reloptkind == RELOPT_BASEREL &&
! 			rel->relid == root->parse->resultRelation))))
  		return false;
  
  	/*