diff options
| author | Tom Lane | 2005-08-01 20:31:16 +0000 |
|---|---|---|
| committer | Tom Lane | 2005-08-01 20:31:16 +0000 |
| commit | 2a4fad1a0e43d6375ffa8eddb2d8dfa1ed36593f (patch) | |
| tree | bb2bc2208507b0ab2403850e8dd01003a4ed73e9 /src/include/access | |
| parent | ca7abcd89dbeecb82cde50fccf4f6c483244fdf7 (diff) | |
Add NOWAIT option to SELECT FOR UPDATE/SHARE.
Original patch by Hans-Juergen Schoenig, revisions by Karel Zak
and Tom Lane.
Diffstat (limited to 'src/include/access')
| -rw-r--r-- | src/include/access/heapam.h | 5 | ||||
| -rw-r--r-- | src/include/access/multixact.h | 3 |
2 files changed, 5 insertions, 3 deletions
diff --git a/src/include/access/heapam.h b/src/include/access/heapam.h index dde6fe8ecd8..9c040b0dfd4 100644 --- a/src/include/access/heapam.h +++ b/src/include/access/heapam.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2005, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/access/heapam.h,v 1.102 2005/06/20 18:37:01 tgl Exp $ + * $PostgreSQL: pgsql/src/include/access/heapam.h,v 1.103 2005/08/01 20:31:13 tgl Exp $ * *------------------------------------------------------------------------- */ @@ -163,7 +163,8 @@ extern HTSU_Result heap_delete(Relation relation, ItemPointer tid, ItemPointer c extern HTSU_Result heap_update(Relation relation, ItemPointer otid, HeapTuple tup, ItemPointer ctid, CommandId cid, Snapshot crosscheck, bool wait); extern HTSU_Result heap_lock_tuple(Relation relation, HeapTuple tup, - Buffer *userbuf, CommandId cid, LockTupleMode mode); + Buffer *userbuf, CommandId cid, + LockTupleMode mode, bool nowait); extern Oid simple_heap_insert(Relation relation, HeapTuple tup); extern void simple_heap_delete(Relation relation, ItemPointer tid); diff --git a/src/include/access/multixact.h b/src/include/access/multixact.h index 2199b05f2c5..8a4d2101e75 100644 --- a/src/include/access/multixact.h +++ b/src/include/access/multixact.h @@ -6,7 +6,7 @@ * Portions Copyright (c) 1996-2005, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/access/multixact.h,v 1.3 2005/06/08 15:50:28 tgl Exp $ + * $PostgreSQL: pgsql/src/include/access/multixact.h,v 1.4 2005/08/01 20:31:13 tgl Exp $ */ #ifndef MULTIXACT_H #define MULTIXACT_H @@ -42,6 +42,7 @@ extern MultiXactId MultiXactIdCreate(TransactionId xid1, TransactionId xid2); extern MultiXactId MultiXactIdExpand(MultiXactId multi, TransactionId xid); extern bool MultiXactIdIsRunning(MultiXactId multi); extern void MultiXactIdWait(MultiXactId multi); +extern bool ConditionalMultiXactIdWait(MultiXactId multi); extern void MultiXactIdSetOldestMember(void); extern void AtEOXact_MultiXact(void); |