*** pgsql/src/backend/rewrite/rewriteManip.c	2009/01/01 17:23:47	1.120
--- pgsql/src/backend/rewrite/rewriteManip.c	2009/02/25 03:30:37	1.121
***************
*** 7,13 ****
   *
   *
   * IDENTIFICATION
!  *	  $PostgreSQL: pgsql/src/backend/rewrite/rewriteManip.c,v 1.119 2008/12/28 18:53:59 tgl Exp $
   *
   *-------------------------------------------------------------------------
   */
--- 7,13 ----
   *
   *
   * IDENTIFICATION
!  *	  $PostgreSQL: pgsql/src/backend/rewrite/rewriteManip.c,v 1.120 2009/01/01 17:23:47 momjian Exp $
   *
   *-------------------------------------------------------------------------
   */
*************** OffsetVarNodes_walker(Node *node, Offset
*** 348,370 ****
  	{
  		JoinExpr   *j = (JoinExpr *) node;
  
! 		if (context->sublevels_up == 0)
  			j->rtindex += context->offset;
  		/* fall through to examine children */
  	}
- 	if (IsA(node, FlattenedSubLink))
- 	{
- 		FlattenedSubLink *fslink = (FlattenedSubLink *) node;
- 
- 		if (context->sublevels_up == 0)
- 		{
- 			fslink->lefthand = offset_relid_set(fslink->lefthand,
- 												context->offset);
- 			fslink->righthand = offset_relid_set(fslink->righthand,
- 												 context->offset);
- 		}
- 		/* fall through to examine children */
- 	}
  	if (IsA(node, PlaceHolderVar))
  	{
  		PlaceHolderVar *phv = (PlaceHolderVar *) node;
--- 348,357 ----
  	{
  		JoinExpr   *j = (JoinExpr *) node;
  
! 		if (j->rtindex && context->sublevels_up == 0)
  			j->rtindex += context->offset;
  		/* fall through to examine children */
  	}
  	if (IsA(node, PlaceHolderVar))
  	{
  		PlaceHolderVar *phv = (PlaceHolderVar *) node;
*************** ChangeVarNodes_walker(Node *node, Change
*** 530,550 ****
  			j->rtindex = context->new_index;
  		/* fall through to examine children */
  	}
- 	if (IsA(node, FlattenedSubLink))
- 	{
- 		FlattenedSubLink *fslink = (FlattenedSubLink *) node;
- 
- 		if (context->sublevels_up == 0)
- 		{
- 			fslink->lefthand = adjust_relid_set(fslink->lefthand,
- 												context->rt_index,
- 												context->new_index);
- 			fslink->righthand = adjust_relid_set(fslink->righthand,
- 												 context->rt_index,
- 												 context->new_index);
- 		}
- 		/* fall through to examine children */
- 	}
  	if (IsA(node, PlaceHolderVar))
  	{
  		PlaceHolderVar *phv = (PlaceHolderVar *) node;
--- 517,522 ----
*************** rangeTableEntry_used_walker(Node *node,
*** 838,844 ****
  		/* fall through to examine children */
  	}
  	/* Shouldn't need to handle planner auxiliary nodes here */
- 	Assert(!IsA(node, FlattenedSubLink));
  	Assert(!IsA(node, PlaceHolderVar));
  	Assert(!IsA(node, SpecialJoinInfo));
  	Assert(!IsA(node, AppendRelInfo));
--- 810,815 ----