mirror of
https://github.com/postgres/postgres.git
synced 2025-07-30 11:03:19 +03:00
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.
This commit is contained in:
@ -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);
|
||||
|
Reference in New Issue
Block a user