Skip to content
Snippets Groups Projects
Commit 898b3e6f authored by Bruce Momjian's avatar Bruce Momjian
Browse files

Back out some changes I made just for testing.

parent 9dde6b3d
No related branches found
No related tags found
No related merge requests found
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
* *
* *
* IDENTIFICATION * 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) ...@@ -92,6 +92,7 @@ CreateSharedMemoryAndSemaphores(IPCKey key)
* ---------------- * ----------------
*/ */
InitLocks(); InitLocks();
InitMultiLevelLockm();
if (InitMultiLevelLockm() == INVALID_TABLEID) if (InitMultiLevelLockm() == INVALID_TABLEID)
elog(FATAL, "Couldn't create the lock table"); elog(FATAL, "Couldn't create the lock table");
...@@ -145,7 +146,7 @@ AttachSharedMemoryAndSemaphores(IPCKey key) ...@@ -145,7 +146,7 @@ AttachSharedMemoryAndSemaphores(IPCKey key)
* ---------------- * ----------------
*/ */
InitLocks(); InitLocks();
if (!MultiTableId && InitMultiLevelLockm() == INVALID_TABLEID) if (InitMultiLevelLockm() == INVALID_TABLEID)
elog(FATAL, "Couldn't attach to the lock table"); elog(FATAL, "Couldn't attach to the lock table");
AttachSharedInvalidationState(key); AttachSharedInvalidationState(key);
......
...@@ -12,7 +12,7 @@ ...@@ -12,7 +12,7 @@
* *
* *
* IDENTIFICATION * 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: * NOTES:
* (1) The lock.c module assumes that the caller here is doing * (1) The lock.c module assumes that the caller here is doing
...@@ -89,6 +89,13 @@ InitMultiLevelLockm() ...@@ -89,6 +89,13 @@ InitMultiLevelLockm()
{ {
int tableId; int tableId;
/* -----------------------
* If we're already initialized just return the table id.
* -----------------------
*/
if (MultiTableId)
return MultiTableId;
tableId = LockTabInit("LockTable", MultiConflicts, MultiPrios, 5); tableId = LockTabInit("LockTable", MultiConflicts, MultiPrios, 5);
MultiTableId = tableId; MultiTableId = tableId;
if (!(MultiTableId)) if (!(MultiTableId))
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment