*** postgresql-7.1.2/src/backend/commands/vacuum.c.orig	Mon Mar 26 08:23:58 2001
--- postgresql-7.1.2/src/backend/commands/vacuum.c	Fri Jul  6 11:30:48 2001
***************
*** 8,14 ****
   *
   *
   * IDENTIFICATION
!  *	  $Header: /home/projects/pgsql/cvsroot/pgsql/src/backend/commands/vacuum.c,v 1.189 2001/03/25 23:23:58 tgl Exp $
   *
   *-------------------------------------------------------------------------
   */
--- 8,14 ----
   *
   *
   * IDENTIFICATION
!  *	  $Header: /home/projects/pgsql/cvsroot/pgsql/src/backend/commands/vacuum.c,v 1.189.2.1 2001/06/29 16:34:49 tgl Exp $
   *
   *-------------------------------------------------------------------------
   */
***************
*** 577,583 ****
  				maxoff;
  	bool		pgchanged,
  				tupgone,
- 				dobufrel,
  				notup;
  	char	   *relname;
  	VacPage		vacpage,
--- 577,582 ----
***************
*** 876,890 ****
  			}
  		}
  
- 		if (pgchanged)
- 		{
- 			WriteBuffer(buf);
- 			dobufrel = false;
- 			changed_pages++;
- 		}
- 		else
- 			dobufrel = true;
- 
  		if (tempPage != (Page) NULL)
  		{						/* Some tuples are gone */
  			PageRepairFragmentation(tempPage, NULL);
--- 875,880 ----
***************
*** 900,907 ****
  			free_size += vacpage->free;
  			reap_page(vacuum_pages, vacpage);
  		}
! 		if (dobufrel)
  			ReleaseBuffer(buf);
  		if (notup)
  			empty_end_pages++;
  		else
--- 890,904 ----
  			free_size += vacpage->free;
  			reap_page(vacuum_pages, vacpage);
  		}
! 
! 		if (pgchanged)
! 		{
! 			WriteBuffer(buf);
! 			changed_pages++;
! 		}
! 		else
  			ReleaseBuffer(buf);
+ 
  		if (notup)
  			empty_end_pages++;
  		else
*** postgresql-7.1.2/src/test/regress/expected/abstime-solaris-1947.out.orig	Fri May  4 04:00:37 2001
--- postgresql-7.1.2/src/test/regress/expected/abstime-solaris-1947.out	Fri Jul  6 11:30:48 2001
***************
*** 47,56 ****
       | Sun Jan 14 03:14:21 1973 PST
       | Mon May 01 00:30:30 1995 PDT
       | epoch
-      | current
       | -infinity
       | Sat May 10 23:59:12 1947 PDT
! (6 rows)
  
  SELECT '' AS six, ABSTIME_TBL.*
     WHERE ABSTIME_TBL.f1 > abstime '-infinity';
--- 47,55 ----
       | Sun Jan 14 03:14:21 1973 PST
       | Mon May 01 00:30:30 1995 PDT
       | epoch
       | -infinity
       | Sat May 10 23:59:12 1947 PDT
! (5 rows)
  
  SELECT '' AS six, ABSTIME_TBL.*
     WHERE ABSTIME_TBL.f1 > abstime '-infinity';
*** postgresql-7.1.2/src/test/regress/expected/abstime.out.orig	Fri May  4 04:00:37 2001
--- postgresql-7.1.2/src/test/regress/expected/abstime.out	Fri Jul  6 11:30:48 2001
***************
*** 47,56 ****
       | Sun Jan 14 03:14:21 1973 PST
       | Mon May 01 00:30:30 1995 PDT
       | epoch
-      | current
       | -infinity
       | Sat May 10 23:59:12 1947 PST
! (6 rows)
  
  SELECT '' AS six, ABSTIME_TBL.*
     WHERE ABSTIME_TBL.f1 > abstime '-infinity';
--- 47,55 ----
       | Sun Jan 14 03:14:21 1973 PST
       | Mon May 01 00:30:30 1995 PDT
       | epoch
       | -infinity
       | Sat May 10 23:59:12 1947 PST
! (5 rows)
  
  SELECT '' AS six, ABSTIME_TBL.*
     WHERE ABSTIME_TBL.f1 > abstime '-infinity';