From 76be0c81cc0c799f5ddeb7a28ae2d92982a59189 Mon Sep 17 00:00:00 2001
From: Simon Riggs <simon@2ndQuadrant.com>
Date: Fri, 29 Jan 2010 17:10:05 +0000
Subject: Filter recovery conflicts based upon dboid from relfilenode of WAL
 records for heap and btree. Minor change, mostly API changes to pass through
 the required values. This is a simple change though also provides the
 refactoring required for further enhancements to conflict processing using
 the relOid. Changes only have effect during Hot Standby.

---
 src/backend/storage/ipc/standby.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'src/backend/storage/ipc')

diff --git a/src/backend/storage/ipc/standby.c b/src/backend/storage/ipc/standby.c
index f079dba8dcf..54d3520f852 100644
--- a/src/backend/storage/ipc/standby.c
+++ b/src/backend/storage/ipc/standby.c
@@ -11,7 +11,7 @@
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/backend/storage/ipc/standby.c,v 1.7 2010/01/23 16:37:12 sriggs Exp $
+ *	  $PostgreSQL: pgsql/src/backend/storage/ipc/standby.c,v 1.8 2010/01/29 17:10:05 sriggs Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -232,12 +232,12 @@ ResolveRecoveryConflictWithVirtualXIDs(VirtualTransactionId *waitlist,
 }
 
 void
-ResolveRecoveryConflictWithSnapshot(TransactionId latestRemovedXid)
+ResolveRecoveryConflictWithSnapshot(TransactionId latestRemovedXid, RelFileNode node)
 {
 	VirtualTransactionId *backends;
 
 	backends = GetConflictingVirtualXIDs(latestRemovedXid,
-										 InvalidOid);
+										 node.dbNode);
 
 	ResolveRecoveryConflictWithVirtualXIDs(backends,
 										   PROCSIG_RECOVERY_CONFLICT_SNAPSHOT);
-- 
cgit v1.2.3