diff -Ncr ../base/src/backend/commands/vacuum.c src/backend/commands/vacuum.c
*** ../base/src/backend/commands/vacuum.c	Wed Jun  2 21:46:59 2004
--- src/backend/commands/vacuum.c	Thu Jun 10 18:50:26 2004
***************
*** 2288,2355 ****
  			vacpage->offsets_free > 0)
  		{
  			Buffer			buf;
- 			Page			page;
- 			OffsetNumber	unused[BLCKSZ / sizeof(OffsetNumber)];
- 			OffsetNumber	offnum,
- 							maxoff;
- 			int				uncnt;
- 			int				num_tuples = 0;
  
  			buf = ReadBuffer(onerel, vacpage->blkno);
  			LockBuffer(buf, BUFFER_LOCK_EXCLUSIVE);
! 			page = BufferGetPage(buf);
! 			maxoff = PageGetMaxOffsetNumber(page);
! 			for (offnum = FirstOffsetNumber;
! 				 offnum <= maxoff;
! 				 offnum = OffsetNumberNext(offnum))
! 			{
! 				ItemId	itemid = PageGetItemId(page, offnum);
! 				HeapTupleHeader htup;
! 
! 				if (!ItemIdIsUsed(itemid))
! 					continue;
! 				htup = (HeapTupleHeader) PageGetItem(page, itemid);
! 				if (htup->t_infomask & HEAP_XMIN_COMMITTED)
! 					continue;
! 
! 				/*
! 				** See comments in the walk-along-page loop above, why we
! 				** have Asserts here instead of if (...) elog(ERROR).
! 				*/
! 				Assert(!(htup->t_infomask & HEAP_MOVED_IN));
! 				Assert(htup->t_infomask & HEAP_MOVED_OFF);
! 				Assert(HeapTupleHeaderGetXvac(htup) == myXID);
! 
! 				itemid->lp_flags &= ~LP_USED;
! 				num_tuples++;
! 
! 			}
! 			Assert(vacpage->offsets_free == num_tuples);
! 
! 			START_CRIT_SECTION();
! 
! 			uncnt = PageRepairFragmentation(page, unused);
! 
! 			/* XLOG stuff */
! 			if (!onerel->rd_istemp)
! 			{
! 				XLogRecPtr	recptr;
! 
! 				recptr = log_heap_clean(onerel, buf, unused, uncnt);
! 				PageSetLSN(page, recptr);
! 				PageSetSUI(page, ThisStartUpID);
! 			}
! 			else
! 			{
! 				/*
! 				 * No XLOG record, but still need to flag that XID exists
! 				 * on disk
! 				 */
! 				MyXactMadeTempRelUpdate = true;
! 			}
! 
! 			END_CRIT_SECTION();
! 
  			LockBuffer(buf, BUFFER_LOCK_UNLOCK);
  			WriteBuffer(buf);
  		}
--- 2288,2297 ----
  			vacpage->offsets_free > 0)
  		{
  			Buffer			buf;
  
  			buf = ReadBuffer(onerel, vacpage->blkno);
  			LockBuffer(buf, BUFFER_LOCK_EXCLUSIVE);
! 			vacuum_page(onerel, buf, vacpage);
  			LockBuffer(buf, BUFFER_LOCK_UNLOCK);
  			WriteBuffer(buf);
  		}