*** pgsql/src/backend/access/heap/pruneheap.c	2009/06/11 14:48:53	1.18
--- pgsql/src/backend/access/heap/pruneheap.c	2009/12/19 01:32:32	1.19
***************
*** 8,14 ****
   *
   *
   * IDENTIFICATION
!  *	  $PostgreSQL: pgsql/src/backend/access/heap/pruneheap.c,v 1.17 2009/01/01 17:23:35 momjian Exp $
   *
   *-------------------------------------------------------------------------
   */
--- 8,14 ----
   *
   *
   * IDENTIFICATION
!  *	  $PostgreSQL: pgsql/src/backend/access/heap/pruneheap.c,v 1.18 2009/06/11 14:48:53 momjian Exp $
   *
   *-------------------------------------------------------------------------
   */
***************
*** 30,36 ****
  typedef struct
  {
  	TransactionId new_prune_xid;	/* new prune hint value for page */
! 	int			nredirected;	/* numbers of entries in arrays below */
  	int			ndead;
  	int			nunused;
  	/* arrays that accumulate indexes of items to be changed */
--- 30,37 ----
  typedef struct
  {
  	TransactionId new_prune_xid;	/* new prune hint value for page */
! 	TransactionId latestRemovedXid; /* latest xid to be removed by this prune */
! 	int			nredirected;		/* numbers of entries in arrays below */
  	int			ndead;
  	int			nunused;
  	/* arrays that accumulate indexes of items to be changed */
*************** heap_page_prune_opt(Relation relation, B
*** 85,90 ****
--- 86,99 ----
  		return;
  
  	/*
+ 	 * We can't write WAL in recovery mode, so there's no point trying to
+ 	 * clean the page. The master will likely issue a cleaning WAL record
+ 	 * soon anyway, so this is no particular loss.
+ 	 */
+ 	if (RecoveryInProgress())
+ 		return;
+ 
+ 	/*
  	 * We prune when a previous UPDATE failed to find enough space on the page
  	 * for a new tuple version, or when free space falls below the relation's
  	 * fill-factor target (but not less than 10%).
*************** heap_page_prune(Relation relation, Buffe
*** 176,181 ****
--- 185,191 ----
  	 * of our working state.
  	 */
  	prstate.new_prune_xid = InvalidTransactionId;
+ 	prstate.latestRemovedXid = InvalidTransactionId;
  	prstate.nredirected = prstate.ndead = prstate.nunused = 0;
  	memset(prstate.marked, 0, sizeof(prstate.marked));
  
*************** heap_page_prune(Relation relation, Buffe
*** 257,263 ****
  									prstate.redirected, prstate.nredirected,
  									prstate.nowdead, prstate.ndead,
  									prstate.nowunused, prstate.nunused,
! 									redirect_move);
  
  			PageSetLSN(BufferGetPage(buffer), recptr);
  			PageSetTLI(BufferGetPage(buffer), ThisTimeLineID);
--- 267,273 ----
  									prstate.redirected, prstate.nredirected,
  									prstate.nowdead, prstate.ndead,
  									prstate.nowunused, prstate.nunused,
! 									prstate.latestRemovedXid, redirect_move);
  
  			PageSetLSN(BufferGetPage(buffer), recptr);
  			PageSetTLI(BufferGetPage(buffer), ThisTimeLineID);
*************** heap_prune_chain(Relation relation, Buff
*** 395,400 ****
--- 405,412 ----
  				== HEAPTUPLE_DEAD && !HeapTupleHeaderIsHotUpdated(htup))
  			{
  				heap_prune_record_unused(prstate, rootoffnum);
+ 				HeapTupleHeaderAdvanceLatestRemovedXid(htup,
+ 													   &prstate->latestRemovedXid);
  				ndeleted++;
  			}
  
*************** heap_prune_chain(Relation relation, Buff
*** 520,526 ****
--- 532,542 ----
  		 * find another DEAD tuple is a fairly unusual corner case.)
  		 */
  		if (tupdead)
+ 		{
  			latestdead = offnum;
+ 			HeapTupleHeaderAdvanceLatestRemovedXid(htup,
+ 												   &prstate->latestRemovedXid);
+ 		}
  		else if (!recent_dead)
  			break;