summaryrefslogtreecommitdiff
path: root/src/backend/storage/ipc/standby.c
diff options
context:
space:
mode:
authorPeter Eisentraut2011-04-11 19:28:45 +0000
committerPeter Eisentraut2011-04-11 19:28:45 +0000
commit5caa3479c2efd31fca1b271db687e5e57c7de2d4 (patch)
treead862f1b6620a5a376a67b4a320f23c212b45ef4 /src/backend/storage/ipc/standby.c
parent3c381a55b0fa1c4ca328211e39df8e1a715129cb (diff)
Clean up most -Wunused-but-set-variable warnings from gcc 4.6
This warning is new in gcc 4.6 and part of -Wall. This patch cleans up most of the noise, but there are some still warnings that are trickier to remove.
Diffstat (limited to 'src/backend/storage/ipc/standby.c')
-rw-r--r--src/backend/storage/ipc/standby.c4
1 files changed, 0 insertions, 4 deletions
diff --git a/src/backend/storage/ipc/standby.c b/src/backend/storage/ipc/standby.c
index 3fdb5184a94..75b5ab458a8 100644
--- a/src/backend/storage/ipc/standby.c
+++ b/src/backend/storage/ipc/standby.c
@@ -334,7 +334,6 @@ static void
ResolveRecoveryConflictWithLock(Oid dbOid, Oid relOid)
{
VirtualTransactionId *backends;
- bool report_memory_error = false;
bool lock_acquired = false;
int num_attempts = 0;
LOCKTAG locktag;
@@ -354,11 +353,8 @@ ResolveRecoveryConflictWithLock(Oid dbOid, Oid relOid)
if (++num_attempts < 3)
backends = GetLockConflicts(&locktag, AccessExclusiveLock);
else
- {
backends = GetConflictingVirtualXIDs(InvalidTransactionId,
InvalidOid);
- report_memory_error = true;
- }
ResolveRecoveryConflictWithVirtualXIDs(backends,
PROCSIG_RECOVERY_CONFLICT_LOCK);