*** pgsql/src/include/storage/lock.h	2009/04/04 17:40:36	1.116
--- pgsql/src/include/storage/lock.h	2009/12/19 01:32:44	1.117
***************
*** 7,13 ****
   * Portions Copyright (c) 1996-2009, PostgreSQL Global Development Group
   * Portions Copyright (c) 1994, Regents of the University of California
   *
!  * $PostgreSQL: pgsql/src/include/storage/lock.h,v 1.115 2009/01/01 17:24:01 momjian Exp $
   *
   *-------------------------------------------------------------------------
   */
--- 7,13 ----
   * Portions Copyright (c) 1996-2009, PostgreSQL Global Development Group
   * Portions Copyright (c) 1994, Regents of the University of California
   *
!  * $PostgreSQL: pgsql/src/include/storage/lock.h,v 1.116 2009/04/04 17:40:36 tgl Exp $
   *
   *-------------------------------------------------------------------------
   */
*************** extern LockAcquireResult LockAcquire(con
*** 477,482 ****
--- 477,487 ----
  			LOCKMODE lockmode,
  			bool sessionLock,
  			bool dontWait);
+ extern LockAcquireResult LockAcquireExtended(const LOCKTAG *locktag,
+ 			LOCKMODE lockmode,
+ 			bool sessionLock,
+ 			bool dontWait,
+ 			bool report_memory_error);
  extern bool LockRelease(const LOCKTAG *locktag,
  			LOCKMODE lockmode, bool sessionLock);
  extern void LockReleaseAll(LOCKMETHODID lockmethodid, bool allLocks);
*************** extern void GrantAwaitedLock(void);
*** 494,499 ****
--- 499,515 ----
  extern void RemoveFromWaitQueue(PGPROC *proc, uint32 hashcode);
  extern Size LockShmemSize(void);
  extern LockData *GetLockStatusData(void);
+ 
+ extern void ReportLockTableError(bool report);
+ 
+ typedef struct xl_standby_lock
+ {
+ 	TransactionId	xid;	/* xid of holder of AccessExclusiveLock */
+ 	Oid		dbOid;
+ 	Oid		relOid;
+ } xl_standby_lock;
+ 
+ extern xl_standby_lock *GetRunningTransactionLocks(int *nlocks);
  extern const char *GetLockmodeName(LOCKMETHODID lockmethodid, LOCKMODE mode);
  
  extern void lock_twophase_recover(TransactionId xid, uint16 info,
*************** extern void lock_twophase_postcommit(Tra
*** 502,507 ****
--- 518,525 ----
  						 void *recdata, uint32 len);
  extern void lock_twophase_postabort(TransactionId xid, uint16 info,
  						void *recdata, uint32 len);
+ extern void lock_twophase_standby_recover(TransactionId xid, uint16 info,
+ 					  void *recdata, uint32 len);
  
  extern DeadLockState DeadLockCheck(PGPROC *proc);
  extern PGPROC *GetBlockingAutoVacuumPgproc(void);