diff options
Diffstat (limited to 'src/backend/storage/lmgr/proc.c')
| -rw-r--r-- | src/backend/storage/lmgr/proc.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/backend/storage/lmgr/proc.c b/src/backend/storage/lmgr/proc.c index 4c1b63920c1..cc02c75f13f 100644 --- a/src/backend/storage/lmgr/proc.c +++ b/src/backend/storage/lmgr/proc.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/storage/lmgr/proc.c,v 1.128 2003/01/16 21:01:44 tgl Exp $ + * $Header: /cvsroot/pgsql/src/backend/storage/lmgr/proc.c,v 1.129 2003/02/18 02:13:24 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -521,7 +521,7 @@ int ProcSleep(LOCKMETHODTABLE *lockMethodTable, LOCKMODE lockmode, LOCK *lock, - PROCLOCK *holder) + PROCLOCK *proclock) { LWLockId masterLock = lockMethodTable->masterLock; PROC_QUEUE *waitQueue = &(lock->waitProcs); @@ -577,12 +577,12 @@ ProcSleep(LOCKMETHODTABLE *lockMethodTable, LockCheckConflicts(lockMethodTable, lockmode, lock, - holder, + proclock, MyProc, NULL) == STATUS_OK) { /* Skip the wait and just grant myself the lock. */ - GrantLock(lock, holder, lockmode); + GrantLock(lock, proclock, lockmode); return STATUS_OK; } /* Break out of loop to put myself before him */ @@ -615,7 +615,7 @@ ProcSleep(LOCKMETHODTABLE *lockMethodTable, /* Set up wait information in PGPROC object, too */ MyProc->waitLock = lock; - MyProc->waitHolder = holder; + MyProc->waitHolder = proclock; MyProc->waitLockMode = lockmode; MyProc->errType = STATUS_OK; /* initialize result for success */ |