diff options
| author | Tom Lane <tgl@sss.pgh.pa.us> | 2006-09-22 23:20:14 +0000 |
|---|---|---|
| committer | Tom Lane <tgl@sss.pgh.pa.us> | 2006-09-22 23:20:14 +0000 |
| commit | d40d34863e23bbfce2fbdc05e85b92e7ae321ecd (patch) | |
| tree | ab2087db4b6334af3722fbc74227dacbc23c4197 /src/backend/storage | |
| parent | beca984e5f1c315d02064e69861be112f5a69b3d (diff) | |
| download | postgresql-d40d34863e23bbfce2fbdc05e85b92e7ae321ecd.tar.gz | |
Fix pg_locks view to call advisory locks advisory locks, while preserving
backward compatibility for anyone using the old userlock code that's now
on pgfoundry --- locks from that code still show as 'userlock'.
Diffstat (limited to 'src/backend/storage')
| -rw-r--r-- | src/backend/storage/lmgr/deadlock.c | 12 | ||||
| -rw-r--r-- | src/backend/storage/lmgr/lmgr.c | 3 |
2 files changed, 12 insertions, 3 deletions
diff --git a/src/backend/storage/lmgr/deadlock.c b/src/backend/storage/lmgr/deadlock.c index f75ca1da4c..de8f8fe99c 100644 --- a/src/backend/storage/lmgr/deadlock.c +++ b/src/backend/storage/lmgr/deadlock.c @@ -12,7 +12,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/storage/lmgr/deadlock.c,v 1.42 2006/09/18 22:40:36 tgl Exp $ + * $PostgreSQL: pgsql/src/backend/storage/lmgr/deadlock.c,v 1.43 2006/09/22 23:20:13 tgl Exp $ * * Interface: * @@ -872,8 +872,16 @@ DescribeLockTag(StringInfo buf, const LOCKTAG *lock) lock->locktag_field1); break; case LOCKTAG_USERLOCK: + /* reserved for old contrib code, now on pgfoundry */ appendStringInfo(buf, - _("user lock [%u,%u,%u,%u]"), + _("user lock [%u,%u,%u]"), + lock->locktag_field1, + lock->locktag_field2, + lock->locktag_field3); + break; + case LOCKTAG_ADVISORY: + appendStringInfo(buf, + _("advisory lock [%u,%u,%u,%u]"), lock->locktag_field1, lock->locktag_field2, lock->locktag_field3, diff --git a/src/backend/storage/lmgr/lmgr.c b/src/backend/storage/lmgr/lmgr.c index 4442d3909f..28e862533d 100644 --- a/src/backend/storage/lmgr/lmgr.c +++ b/src/backend/storage/lmgr/lmgr.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/storage/lmgr/lmgr.c,v 1.87 2006/08/18 16:09:09 tgl Exp $ + * $PostgreSQL: pgsql/src/backend/storage/lmgr/lmgr.c,v 1.88 2006/09/22 23:20:13 tgl Exp $ * *------------------------------------------------------------------------- */ @@ -629,6 +629,7 @@ LockTagIsTemp(const LOCKTAG *tag) /* there are currently no non-table temp objects */ break; case LOCKTAG_USERLOCK: + case LOCKTAG_ADVISORY: /* assume these aren't temp */ break; } |