Back out some changes I made just for testing.
This commit is contained in:
parent
9dde6b3de9
commit
898b3e6f6c
|
@ -7,7 +7,7 @@
|
|||
*
|
||||
*
|
||||
* IDENTIFICATION
|
||||
* $Header: /cvsroot/pgsql/src/backend/storage/ipc/ipci.c,v 1.10 1998/06/23 17:52:28 momjian Exp $
|
||||
* $Header: /cvsroot/pgsql/src/backend/storage/ipc/ipci.c,v 1.11 1998/06/23 17:59:54 momjian Exp $
|
||||
*
|
||||
*-------------------------------------------------------------------------
|
||||
*/
|
||||
|
@ -92,6 +92,7 @@ CreateSharedMemoryAndSemaphores(IPCKey key)
|
|||
* ----------------
|
||||
*/
|
||||
InitLocks();
|
||||
InitMultiLevelLockm();
|
||||
if (InitMultiLevelLockm() == INVALID_TABLEID)
|
||||
elog(FATAL, "Couldn't create the lock table");
|
||||
|
||||
|
@ -145,7 +146,7 @@ AttachSharedMemoryAndSemaphores(IPCKey key)
|
|||
* ----------------
|
||||
*/
|
||||
InitLocks();
|
||||
if (!MultiTableId && InitMultiLevelLockm() == INVALID_TABLEID)
|
||||
if (InitMultiLevelLockm() == INVALID_TABLEID)
|
||||
elog(FATAL, "Couldn't attach to the lock table");
|
||||
|
||||
AttachSharedInvalidationState(key);
|
||||
|
|
|
@ -12,7 +12,7 @@
|
|||
*
|
||||
*
|
||||
* IDENTIFICATION
|
||||
* $Header: /cvsroot/pgsql/src/backend/storage/lmgr/Attic/multi.c,v 1.13 1998/06/23 17:52:28 momjian Exp $
|
||||
* $Header: /cvsroot/pgsql/src/backend/storage/lmgr/Attic/multi.c,v 1.14 1998/06/23 17:59:54 momjian Exp $
|
||||
*
|
||||
* NOTES:
|
||||
* (1) The lock.c module assumes that the caller here is doing
|
||||
|
@ -89,6 +89,13 @@ InitMultiLevelLockm()
|
|||
{
|
||||
int tableId;
|
||||
|
||||
/* -----------------------
|
||||
* If we're already initialized just return the table id.
|
||||
* -----------------------
|
||||
*/
|
||||
if (MultiTableId)
|
||||
return MultiTableId;
|
||||
|
||||
tableId = LockTabInit("LockTable", MultiConflicts, MultiPrios, 5);
|
||||
MultiTableId = tableId;
|
||||
if (!(MultiTableId))
|
||||
|
|
Loading…
Reference in New Issue