diff options
| author | Tom Lane <tgl@sss.pgh.pa.us> | 2004-10-01 16:40:05 +0000 |
|---|---|---|
| committer | Tom Lane <tgl@sss.pgh.pa.us> | 2004-10-01 16:40:05 +0000 |
| commit | 4c5e810fcda57940d1a7178389129591eb93d68e (patch) | |
| tree | 71677cf693a93449b45fc082fc7c571452ef4459 /doc/src | |
| parent | 392b187a214272937557af695692b6586375cc66 (diff) | |
| download | postgresql-4c5e810fcda57940d1a7178389129591eb93d68e.tar.gz postgresql-4c5e810fcda57940d1a7178389129591eb93d68e.zip | |
Code review for NOWAIT patch: downgrade NOWAIT from fully reserved keyword
to unreserved keyword, use ereport not elog, assign a separate error code
for 'could not obtain lock' so that applications will be able to detect
that case cleanly.
Diffstat (limited to 'doc/src')
| -rw-r--r-- | doc/src/sgml/errcodes.sgml | 7 | ||||
| -rw-r--r-- | doc/src/sgml/ref/lock.sgml | 4 |
2 files changed, 8 insertions, 3 deletions
diff --git a/doc/src/sgml/errcodes.sgml b/doc/src/sgml/errcodes.sgml index 950f97151bc..7bcff2c1d90 100644 --- a/doc/src/sgml/errcodes.sgml +++ b/doc/src/sgml/errcodes.sgml @@ -1,4 +1,4 @@ -<!-- $PostgreSQL: pgsql/doc/src/sgml/errcodes.sgml,v 1.8 2004/08/24 00:06:50 neilc Exp $ --> +<!-- $PostgreSQL: pgsql/doc/src/sgml/errcodes.sgml,v 1.9 2004/10/01 16:39:46 tgl Exp $ --> <appendix id="errcodes-appendix"> <title><productname>PostgreSQL</productname> Error Codes</title> @@ -1099,6 +1099,11 @@ <entry>CANT CHANGE RUNTIME PARAM</entry> </row> +<row> +<entry><literal>55P03</literal></entry> +<entry>LOCK NOT AVAILABLE</entry> +</row> + <row> <entry>Class 57</entry> diff --git a/doc/src/sgml/ref/lock.sgml b/doc/src/sgml/ref/lock.sgml index cab378ec95c..34e01c82a58 100644 --- a/doc/src/sgml/ref/lock.sgml +++ b/doc/src/sgml/ref/lock.sgml @@ -1,5 +1,5 @@ <!-- -$PostgreSQL: pgsql/doc/src/sgml/ref/lock.sgml,v 1.42 2004/03/12 00:52:23 neilc Exp $ +$PostgreSQL: pgsql/doc/src/sgml/ref/lock.sgml,v 1.43 2004/10/01 16:39:47 tgl Exp $ PostgreSQL documentation --> @@ -37,7 +37,7 @@ where <replaceable class="PARAMETER">lockmode</replaceable> is one of: if necessary for any conflicting locks to be released. If <literal>NOWAIT</literal> is specified, <command>LOCK TABLE</command> does not wait to acquire the desired lock: if it - cannot be immediately acquired, the transaction is aborted and an + cannot be acquired immediately, the command is aborted and an error is emitted. Once obtained, the lock is held for the remainder of the current transaction. (There is no <command>UNLOCK TABLE</command> command; locks are always released at transaction |