*** pgsql/src/backend/access/transam/xlog.c	2008/06/08 22:00:47	1.313
--- pgsql/src/backend/access/transam/xlog.c	2008/06/12 09:12:30	1.314
***************
*** 7,13 ****
   * Portions Copyright (c) 1996-2008, PostgreSQL Global Development Group
   * Portions Copyright (c) 1994, Regents of the University of California
   *
!  * $PostgreSQL: pgsql/src/backend/access/transam/xlog.c,v 1.312 2008/05/28 15:22:05 mha Exp $
   *
   *-------------------------------------------------------------------------
   */
--- 7,13 ----
   * Portions Copyright (c) 1996-2008, PostgreSQL Global Development Group
   * Portions Copyright (c) 1994, Regents of the University of California
   *
!  * $PostgreSQL: pgsql/src/backend/access/transam/xlog.c,v 1.313 2008/06/08 22:00:47 alvherre Exp $
   *
   *-------------------------------------------------------------------------
   */
*************** CleanupBackupHistory(void)
*** 2840,2846 ****
  static void
  RestoreBkpBlocks(XLogRecord *record, XLogRecPtr lsn)
  {
- 	Relation	reln;
  	Buffer		buffer;
  	Page		page;
  	BkpBlock	bkpb;
--- 2840,2845 ----
*************** RestoreBkpBlocks(XLogRecord *record, XLo
*** 2856,2863 ****
  		memcpy(&bkpb, blk, sizeof(BkpBlock));
  		blk += sizeof(BkpBlock);
  
! 		reln = XLogOpenRelation(bkpb.node);
! 		buffer = XLogReadBuffer(reln, bkpb.block, true);
  		Assert(BufferIsValid(buffer));
  		page = (Page) BufferGetPage(buffer);
  
--- 2855,2861 ----
  		memcpy(&bkpb, blk, sizeof(BkpBlock));
  		blk += sizeof(BkpBlock);
  
! 		buffer = XLogReadBuffer(bkpb.node, bkpb.block, true);
  		Assert(BufferIsValid(buffer));
  		page = (Page) BufferGetPage(buffer);
  
*************** StartupXLOG(void)
*** 5064,5072 ****
  								BACKUP_LABEL_FILE, BACKUP_LABEL_OLD)));
  		}
  
! 		/* Start up the recovery environment */
! 		XLogInitRelationCache();
! 
  		for (rmid = 0; rmid <= RM_MAX_ID; rmid++)
  		{
  			if (RmgrTable[rmid].rm_startup != NULL)
--- 5062,5068 ----
  								BACKUP_LABEL_FILE, BACKUP_LABEL_OLD)));
  		}
  
! 		/* Initialize resource managers */
  		for (rmid = 0; rmid <= RM_MAX_ID; rmid++)
  		{
  			if (RmgrTable[rmid].rm_startup != NULL)
*************** StartupXLOG(void)
*** 5330,5340 ****
  		 * allows some extra error checking in xlog_redo.
  		 */
  		CreateCheckPoint(CHECKPOINT_IS_SHUTDOWN | CHECKPOINT_IMMEDIATE);
- 
- 		/*
- 		 * Close down recovery environment
- 		 */
- 		XLogCloseRelationCache();
  	}
  
  	/*
--- 5326,5331 ----