aboutsummaryrefslogtreecommitdiff
path: root/src/backend/access/nbtree/nbtxlog.c
diff options
context:
space:
mode:
authorSimon Riggs <simon@2ndQuadrant.com>2010-01-29 17:10:05 +0000
committerSimon Riggs <simon@2ndQuadrant.com>2010-01-29 17:10:05 +0000
commit76be0c81cc0c799f5ddeb7a28ae2d92982a59189 (patch)
treeb8f0f4f184082e9079ed6c874d5c7c412fb59cd2 /src/backend/access/nbtree/nbtxlog.c
parent83fa037b731aa67e7626d143d30d75cae2018af5 (diff)
downloadpostgresql-76be0c81cc0c799f5ddeb7a28ae2d92982a59189.tar.gz
postgresql-76be0c81cc0c799f5ddeb7a28ae2d92982a59189.zip
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.
Diffstat (limited to 'src/backend/access/nbtree/nbtxlog.c')
-rw-r--r--src/backend/access/nbtree/nbtxlog.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/backend/access/nbtree/nbtxlog.c b/src/backend/access/nbtree/nbtxlog.c
index 9e2ebd9a9f5..f83b3188125 100644
--- a/src/backend/access/nbtree/nbtxlog.c
+++ b/src/backend/access/nbtree/nbtxlog.c
@@ -8,7 +8,7 @@
* Portions Copyright (c) 1994, Regents of the University of California
*
* IDENTIFICATION
- * $PostgreSQL: pgsql/src/backend/access/nbtree/nbtxlog.c,v 1.58 2010/01/14 11:08:00 sriggs Exp $
+ * $PostgreSQL: pgsql/src/backend/access/nbtree/nbtxlog.c,v 1.59 2010/01/29 17:10:05 sriggs Exp $
*
*-------------------------------------------------------------------------
*/
@@ -833,7 +833,7 @@ btree_redo(XLogRecPtr lsn, XLogRecord *record)
* here is worth some thought and possibly some effort to
* improve.
*/
- ResolveRecoveryConflictWithSnapshot(xlrec->latestRemovedXid);
+ ResolveRecoveryConflictWithSnapshot(xlrec->latestRemovedXid, xlrec->node);
}
/*