Location via proxy:   [ UP ]  
[Report a bug]   [Manage cookies]                
Skip to content

Commit 0386ccf

Browse files
committed
Back out change. Too many place to change too close to beta:
* HOLDER/HOLDERTAB rename to PROCLOCKLINK/PROCLOCKLINKTAG (Bruce) Will return later.
1 parent 1663f33 commit 0386ccf

File tree

6 files changed

+94
-94
lines changed

6 files changed

+94
-94
lines changed

doc/TODO

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
TODO list for PostgreSQL
22
========================
3-
Last updated: Sat Sep 29 17:34:59 EDT 2001
3+
Last updated: Sat Sep 29 20:43:59 EDT 2001
44

55
Current maintainer: Bruce Momjian (pgman@candle.pha.pa.us)
66

@@ -336,7 +336,7 @@ SOURCE CODE
336336
* Make sure all block numbers are unsigned to increase maximum table size
337337
* Use BlockNumber rather than int where appropriate
338338
* Merge LockMethodCtl and LockMethodTable into one shared structure (Bruce)
339-
* -HOLDER/HOLDERTAB rename to PROCLOCKLINK/PROCLOCKLINKTAG (Bruce)
339+
* HOLDER/HOLDERTAB rename to PROCLOCKLINK/PROCLOCKLINKTAG (Bruce)
340340
* Add version file format stamp to heap and other table types
341341
* -Make elog(LOG) in WAL its own output type, distinct from DEBUG (Peter E)
342342
* Rename some /contrib modules from pg* to pg_*

src/backend/storage/lmgr/deadlock.c

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
*
1313
*
1414
* IDENTIFICATION
15-
* $Header: /cvsroot/pgsql/src/backend/storage/lmgr/deadlock.c,v 1.5 2001/09/29 21:35:14 momjian Exp $
15+
* $Header: /cvsroot/pgsql/src/backend/storage/lmgr/deadlock.c,v 1.6 2001/09/30 00:45:47 momjian Exp $
1616
*
1717
* Interface:
1818
*
@@ -382,7 +382,7 @@ FindLockCycleRecurse(PROC *checkProc,
382382
{
383383
PROC *proc;
384384
LOCK *lock;
385-
PROCLOCK *holder;
385+
HOLDER *holder;
386386
SHM_QUEUE *lockHolders;
387387
LOCKMETHODTABLE *lockMethodTable;
388388
LOCKMETHODCTL *lockctl;
@@ -434,8 +434,8 @@ FindLockCycleRecurse(PROC *checkProc,
434434
*/
435435
lockHolders = &(lock->lockHolders);
436436

437-
holder = (PROCLOCK *) SHMQueueNext(lockHolders, lockHolders,
438-
offsetof(PROCLOCK, lockLink));
437+
holder = (HOLDER *) SHMQueueNext(lockHolders, lockHolders,
438+
offsetof(HOLDER, lockLink));
439439

440440
while (holder)
441441
{
@@ -458,8 +458,8 @@ FindLockCycleRecurse(PROC *checkProc,
458458
}
459459
}
460460

461-
holder = (PROCLOCK *) SHMQueueNext(lockHolders, &holder->lockLink,
462-
offsetof(PROCLOCK, lockLink));
461+
holder = (HOLDER *) SHMQueueNext(lockHolders, &holder->lockLink,
462+
offsetof(HOLDER, lockLink));
463463
}
464464

465465
/*

0 commit comments

Comments
 (0)