*** access/heap/heapam.c.orig	Mon Aug  2 14:56:36 1999
--- access/heap/heapam.c	Tue Nov  9 12:59:48 1999
***************
*** 775,782 ****
  		if (scan->rs_ptup.t_data == scan->rs_ctup.t_data &&
  			BufferIsInvalid(scan->rs_pbuf))
  		{
- 			if (BufferIsValid(scan->rs_nbuf))
- 				ReleaseBuffer(scan->rs_nbuf);
  			return NULL;
  		}

--- 775,780 ----
***************
*** 833,842 ****
  				ReleaseBuffer(scan->rs_pbuf);
  			scan->rs_ptup.t_data = NULL;
  			scan->rs_pbuf = InvalidBuffer;
- 			if (BufferIsValid(scan->rs_nbuf))
- 				ReleaseBuffer(scan->rs_nbuf);
- 			scan->rs_ntup.t_data = NULL;
- 			scan->rs_nbuf = InvalidBuffer;
  			return NULL;
  		}

--- 831,836 ----
***************
*** 855,862 ****
  		if (scan->rs_ctup.t_data == scan->rs_ntup.t_data &&
  			BufferIsInvalid(scan->rs_nbuf))
  		{
- 			if (BufferIsValid(scan->rs_pbuf))
- 				ReleaseBuffer(scan->rs_pbuf);
  			HEAPDEBUG_3;		/* heap_getnext returns NULL at end */
  			return NULL;
  		}
--- 849,854 ----
***************
*** 915,924 ****
  				ReleaseBuffer(scan->rs_nbuf);
  			scan->rs_ntup.t_data = NULL;
  			scan->rs_nbuf = InvalidBuffer;
- 			if (BufferIsValid(scan->rs_pbuf))
- 				ReleaseBuffer(scan->rs_pbuf);
- 			scan->rs_ptup.t_data = NULL;
- 			scan->rs_pbuf = InvalidBuffer;
  			HEAPDEBUG_6;		/* heap_getnext returning EOS */
  			return NULL;
  		}
--- 907,912 ----
