2 files changed, 3 insertions, 56 deletions
diff --git a/src/backend/storage/lmgr/multi.c b/src/backend/storage/lmgr/multi.c
index 6807e9d7cc..38e2d194d6 100644
--- a/src/backend/storage/lmgr/multi.c
+++ b/src/backend/storage/lmgr/multi.c
@@ -12,7 +12,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/storage/lmgr/Attic/multi.c,v 1.27 1999/02/13 23:18:27 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/storage/lmgr/Attic/multi.c,v 1.28 1999/03/28 20:32:25 vadim Exp $
  *
  * NOTES:
  *	 (1) The lock.c module assumes that the caller here is doing
@@ -34,55 +34,6 @@ static bool MultiAcquire(LOCKMETHOD lockmethod, LOCKTAG *tag,
 static bool MultiRelease(LOCKMETHOD lockmethod, LOCKTAG *tag,
 			 LOCKMODE lockmode, PG_LOCK_LEVEL level);
 
-#ifdef LowLevelLocking
-
-static MASK MultiConflicts[] = {
-	(int) NULL,
-
-/* RowShareLock */
-	(1 << ExclusiveLock),
-
-/* RowExclusiveLock */
-	(1 << ExclusiveLock) | (1 << ShareRowExclusiveLock) | (1 << ShareLock),
-
-/* ShareLock */
-	(1 << ExclusiveLock) | (1 << ShareRowExclusiveLock) |
-	(1 << RowExclusiveLock),
-
-/* ShareRowExclusiveLock */
-	(1 << ExclusiveLock) | (1 << ShareRowExclusiveLock) |
-	(1 << ShareLock) | (1 << RowExclusiveLock),
-
-/* ExclusiveLock */
-	(1 << ExclusiveLock) | (1 << ShareRowExclusiveLock) | (1 << ShareLock) |
-	(1 << RowExclusiveLock) | (1 << RowShareLock),
-
-/* ObjShareLock */
-	(1 << ObjExclusiveLock),
-
-/* ObjExclusiveLock */
-	(1 << ObjExclusiveLock) | (1 << ObjShareLock),
-
-/* ExtendLock */
-	(1 << ExtendLock)
-
-};
-
-/*
- * write locks have higher priority than read locks and extend locks.  May
- * want to treat INTENT locks differently.
- */
-static int	MultiPrios[] = {
-	(int) NULL,
-	2,
-	1,
-	2,
-	1,
-	1
-};
-
-#else
-
 /*
  * INTENT indicates to higher level that a lower level lock has been
  * set.  For example, a write lock on a tuple conflicts with a write
@@ -121,8 +72,6 @@ static int	MultiPrios[] = {
 	1
 };
 
-#endif	 /* !LowLevelLocking */
-
 /*
  * Lock table identifier for this lock table.  The multi-level
  * lock table is ONE lock table, not three.
diff --git a/src/backend/storage/lmgr/proc.c b/src/backend/storage/lmgr/proc.c
index 2bb66c09d6..cc5233b076 100644
--- a/src/backend/storage/lmgr/proc.c
+++ b/src/backend/storage/lmgr/proc.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/storage/lmgr/proc.c,v 1.51 1999/02/21 01:41:45 tgl Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/storage/lmgr/proc.c,v 1.52 1999/03/28 20:32:26 vadim Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -46,7 +46,7 @@
  *		This is so that we can support more backends. (system-wide semaphore
  *		sets run out pretty fast.)				  -ay 4/95
  *
- * $Header: /cvsroot/pgsql/src/backend/storage/lmgr/proc.c,v 1.51 1999/02/21 01:41:45 tgl Exp $
+ * $Header: /cvsroot/pgsql/src/backend/storage/lmgr/proc.c,v 1.52 1999/03/28 20:32:26 vadim Exp $
  */
 #include <sys/time.h>
 #include <unistd.h>
@@ -300,9 +300,7 @@ InitProcess(IPCKey key)
 
 	MyProc->pid = MyProcPid;
 	MyProc->xid = InvalidTransactionId;
-#ifdef LowLevelLocking
 	MyProc->xmin = InvalidTransactionId;
-#endif
 
 	/* ----------------
 	 * Start keeping spin lock stats from here on.	Any botch before