Commit898b3e6

committed

Back out some changes I made just for testing.

1 parent9dde6b3 commit898b3e6Copy full SHA for 898b3e6

File tree

+11

-3

lines changed

+11

-3

lines changed

Lines changed: 3 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@`
`7`	`7`	`*`
`8`	`8`	`*`
`9`	`9`	`* IDENTIFICATION`
`10`		`- * $Header: /cvsroot/pgsql/src/backend/storage/ipc/ipci.c,v 1.10 1998/06/23 17:52:28 momjian Exp $`
	`10`	`+ * $Header: /cvsroot/pgsql/src/backend/storage/ipc/ipci.c,v 1.11 1998/06/23 17:59:54 momjian Exp $`
`11`	`11`	`*`
`12`	`12`	`*-------------------------------------------------------------------------`
`13`	`13`	`*/`
`@@ -92,6 +92,7 @@ CreateSharedMemoryAndSemaphores(IPCKey key)`
`92`	`92`	`* ----------------`
`93`	`93`	`*/`
`94`	`94`	`InitLocks();`
	`95`	`+InitMultiLevelLockm();`
`95`	`96`	`if (InitMultiLevelLockm()==INVALID_TABLEID)`
`96`	`97`	`elog(FATAL,"Couldn't create the lock table");`
`97`	`98`
`@@ -145,7 +146,7 @@ AttachSharedMemoryAndSemaphores(IPCKey key)`
`145`	`146`	`* ----------------`
`146`	`147`	`*/`
`147`	`148`	`InitLocks();`
`148`		`-if (!MultiTableId&&InitMultiLevelLockm()==INVALID_TABLEID)`
	`149`	`+if (InitMultiLevelLockm()==INVALID_TABLEID)`
`149`	`150`	`elog(FATAL,"Couldn't attach to the lock table");`
`150`	`151`
`151`	`152`	`AttachSharedInvalidationState(key);`

Lines changed: 8 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,7 @@`
`12`	`12`	`*`
`13`	`13`	`*`
`14`	`14`	`* IDENTIFICATION`
`15`		`- * $Header: /cvsroot/pgsql/src/backend/storage/lmgr/Attic/multi.c,v 1.13 1998/06/23 17:52:28 momjian Exp $`
	`15`	`+ * $Header: /cvsroot/pgsql/src/backend/storage/lmgr/Attic/multi.c,v 1.14 1998/06/23 17:59:54 momjian Exp $`
`16`	`16`	`*`
`17`	`17`	`* NOTES:`
`18`	`18`	`* (1) The lock.c module assumes that the caller here is doing`
`@@ -89,6 +89,13 @@ InitMultiLevelLockm()`
`89`	`89`	`{`
`90`	`90`	`inttableId;`
`91`	`91`
	`92`	`+/* -----------------------`
	`93`	`+ * If we're already initialized just return the table id.`
	`94`	`+ * -----------------------`
	`95`	`+ */`
	`96`	`+if (MultiTableId)`
	`97`	`+returnMultiTableId;`
	`98`	`+`
`92`	`99`	`tableId=LockTabInit("LockTable",MultiConflicts,MultiPrios,5);`
`93`	`100`	`MultiTableId=tableId;`
`94`	`101`	`if (!(MultiTableId))`

Comments

(0)