*** pgsql/src/backend/optimizer/util/plancat.c	2009/06/11 14:48:59	1.158
--- pgsql/src/backend/optimizer/util/plancat.c	2009/07/16 06:33:43	1.159
***************
*** 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 $
   *
   *-------------------------------------------------------------------------
   */
*************** build_physical_tlist(PlannerInfo *root,
*** 783,793 ****
   */
  Selectivity
  restriction_selectivity(PlannerInfo *root,
! 						Oid operator,
  						List *args,
  						int varRelid)
  {
! 	RegProcedure oprrest = get_oprrest(operator);
  	float8		result;
  
  	/*
--- 783,793 ----
   */
  Selectivity
  restriction_selectivity(PlannerInfo *root,
! 						Oid operatorid,
  						List *args,
  						int varRelid)
  {
! 	RegProcedure oprrest = get_oprrest(operatorid);
  	float8		result;
  
  	/*
*************** restriction_selectivity(PlannerInfo *roo
*** 799,805 ****
  
  	result = DatumGetFloat8(OidFunctionCall4(oprrest,
  											 PointerGetDatum(root),
! 											 ObjectIdGetDatum(operator),
  											 PointerGetDatum(args),
  											 Int32GetDatum(varRelid)));
  
--- 799,805 ----
  
  	result = DatumGetFloat8(OidFunctionCall4(oprrest,
  											 PointerGetDatum(root),
! 											 ObjectIdGetDatum(operatorid),
  											 PointerGetDatum(args),
  											 Int32GetDatum(varRelid)));
  
*************** restriction_selectivity(PlannerInfo *roo
*** 818,829 ****
   */
  Selectivity
  join_selectivity(PlannerInfo *root,
! 				 Oid operator,
  				 List *args,
  				 JoinType jointype,
  				 SpecialJoinInfo *sjinfo)
  {
! 	RegProcedure oprjoin = get_oprjoin(operator);
  	float8		result;
  
  	/*
--- 818,829 ----
   */
  Selectivity
  join_selectivity(PlannerInfo *root,
! 				 Oid operatorid,
  				 List *args,
  				 JoinType jointype,
  				 SpecialJoinInfo *sjinfo)
  {
! 	RegProcedure oprjoin = get_oprjoin(operatorid);
  	float8		result;
  
  	/*
*************** join_selectivity(PlannerInfo *root,
*** 835,841 ****
  
  	result = DatumGetFloat8(OidFunctionCall5(oprjoin,
  											 PointerGetDatum(root),
! 											 ObjectIdGetDatum(operator),
  											 PointerGetDatum(args),
  											 Int16GetDatum(jointype),
  											 PointerGetDatum(sjinfo)));
--- 835,841 ----
  
  	result = DatumGetFloat8(OidFunctionCall5(oprjoin,
  											 PointerGetDatum(root),
! 											 ObjectIdGetDatum(operatorid),
  											 PointerGetDatum(args),
  											 Int16GetDatum(jointype),
  											 PointerGetDatum(sjinfo)));