diff options
Diffstat (limited to 'src/backend/utils/adt/lockfuncs.c')
| -rw-r--r-- | src/backend/utils/adt/lockfuncs.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/backend/utils/adt/lockfuncs.c b/src/backend/utils/adt/lockfuncs.c index ba851793a33..37788d8ff0d 100644 --- a/src/backend/utils/adt/lockfuncs.c +++ b/src/backend/utils/adt/lockfuncs.c @@ -6,7 +6,7 @@ * Copyright (c) 2002, PostgreSQL Global Development Group * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/utils/adt/lockfuncs.c,v 1.7 2002/09/04 20:31:28 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/utils/adt/lockfuncs.c,v 1.8 2003/02/18 02:13:24 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -88,7 +88,7 @@ pg_lock_status(PG_FUNCTION_ARGS) while (mystatus->currIdx < lockData->nelements) { - PROCLOCK *holder; + PROCLOCK *proclock; LOCK *lock; PGPROC *proc; bool granted; @@ -98,7 +98,7 @@ pg_lock_status(PG_FUNCTION_ARGS) HeapTuple tuple; Datum result; - holder = &(lockData->holders[mystatus->currIdx]); + proclock = &(lockData->proclocks[mystatus->currIdx]); lock = &(lockData->locks[mystatus->currIdx]); proc = &(lockData->procs[mystatus->currIdx]); @@ -110,10 +110,10 @@ pg_lock_status(PG_FUNCTION_ARGS) granted = false; for (mode = 0; mode < MAX_LOCKMODES; mode++) { - if (holder->holding[mode] > 0) + if (proclock->holding[mode] > 0) { granted = true; - holder->holding[mode] = 0; + proclock->holding[mode] = 0; break; } } @@ -124,7 +124,7 @@ pg_lock_status(PG_FUNCTION_ARGS) */ if (!granted) { - if (proc->waitLock == (LOCK *) MAKE_PTR(holder->tag.lock)) + if (proc->waitLock == (LOCK *) MAKE_PTR(proclock->tag.lock)) { /* Yes, so report it with proper mode */ mode = proc->waitLockMode; |