Index: src/backend/access/transam/twophase.c
===================================================================
RCS file: /home/hlinnaka/pgcvsrepository/pgsql/src/backend/access/transam/twophase.c,v
retrieving revision 1.25.2.1
diff -c -r1.25.2.1 twophase.c
*** src/backend/access/transam/twophase.c	13 Feb 2007 19:39:48 -0000	1.25.2.1
--- src/backend/access/transam/twophase.c	23 Apr 2007 21:58:29 -0000
***************
*** 1258,1263 ****
--- 1258,1276 ----
  	char		path[MAXPGPATH];
  
  	TwoPhaseFilePath(path, xid);
+ 
+ 	if (InRecovery)
+ 	{
+ 		char newpath[MAXPGPATH+10];
+ 		sprintf(newpath, "%s.removed", path);
+ 		if(rename(path, newpath))
+ 			if (errno != ENOENT || giveWarning)
+ 				ereport(WARNING,
+ 						(errcode_for_file_access(),
+ 						 errmsg("could not remove two-phase state file \"%s\": %m",
+ 								path)));
+ 	}
+ 	else
  	if (unlink(path))
  		if (errno != ENOENT || giveWarning)
  			ereport(WARNING,
Index: src/backend/storage/lmgr/lock.c
===================================================================
RCS file: /home/hlinnaka/pgcvsrepository/pgsql/src/backend/storage/lmgr/lock.c,v
retrieving revision 1.174
diff -c -r1.174 lock.c
*** src/backend/storage/lmgr/lock.c	4 Oct 2006 00:29:57 -0000	1.174
--- src/backend/storage/lmgr/lock.c	23 Apr 2007 21:52:23 -0000
***************
*** 1796,1801 ****
--- 1796,1817 ----
  	HASH_SEQ_STATUS status;
  	LOCALLOCK  *locallock;
  
+ #ifdef LOCK_DEBUG
+  {
+ 	int i;
+ 	/*
+ 	 * Must grab LWLocks in partition-number order to avoid LWLock deadlock.
+ 	 */
+ 	for (i = 0; i < NUM_LOCK_PARTITIONS; i++)
+ 		LWLockAcquire(FirstLockMgrLock + i, LW_SHARED);
+ 
+ 	DumpLocks(MyProc);
+ 
+ 	for (i = 0; i < NUM_LOCK_PARTITIONS; i++)
+ 		LWLockRelease(FirstLockMgrLock + i);
+  }
+ #endif
+ 
  	/*
  	 * We don't need to touch shared memory for this --- all the necessary
  	 * state information is in the locallock table.
***************
*** 1830,1835 ****
--- 1846,1854 ----
  					(errcode(ERRCODE_FEATURE_NOT_SUPPORTED),
  					 errmsg("cannot PREPARE a transaction that has operated on temporary tables")));
  
+ 		PROCLOCK_PRINT("AtPrepare_Locks", locallock->proclock);
+ 		LOCK_PRINT("AtPrepare_Locks", locallock->lock, locallock->tag.mode);
+ 
  		/*
  		 * Create a 2PC record.
  		 */
***************
*** 2430,2436 ****
  												HASH_FIND,
  												NULL);
  	if (!lock)
! 		elog(PANIC, "failed to re-find shared lock object");
  
  	/*
  	 * Re-find the proclock object (ditto).
--- 2449,2462 ----
  												HASH_FIND,
  												NULL);
  	if (!lock)
!  		elog(PANIC, "failed to re-find shared lock object: %u %u %u %u %u %u, mode %s",
! 			 locktag->locktag_field1,
! 			 locktag->locktag_field2,
! 			 locktag->locktag_field3,
! 			 locktag->locktag_field4,
! 			 locktag->locktag_type,
! 			 locktag->locktag_lockmethodid,
! 			 LockMethods[lockmethodid]->lockModeNames[lockmode]);
  
  	/*
  	 * Re-find the proclock object (ditto).