aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBruce Momjian <bruce@momjian.us>2020-03-31 17:32:00 -0400
committerBruce Momjian <bruce@momjian.us>2020-03-31 17:32:00 -0400
commitc2da793fd28073603c39d7abfffbc203a9bd4ac0 (patch)
treea006a67f374362725574b52bb9b83af5f28b3669
parent834b80464d653c976787f5b5849fa0595678d0a0 (diff)
downloadpostgresql-c2da793fd28073603c39d7abfffbc203a9bd4ac0.tar.gz
postgresql-c2da793fd28073603c39d7abfffbc203a9bd4ac0.zip
Revert erroroneous commit 834b80464d; my apologies
Backpatch-through: master
-rw-r--r--doc/src/sgml/mvcc.sgml9
1 files changed, 3 insertions, 6 deletions
diff --git a/doc/src/sgml/mvcc.sgml b/doc/src/sgml/mvcc.sgml
index 95465d581b6..f8c96551119 100644
--- a/doc/src/sgml/mvcc.sgml
+++ b/doc/src/sgml/mvcc.sgml
@@ -1039,9 +1039,9 @@ ERROR: could not serialize access due to read/write dependencies among transact
</tip>
<para>
- Once acquired, a lock is normally held until the end of the transaction. But if a
+ Once acquired, a lock is normally held till end of transaction. But if a
lock is acquired after establishing a savepoint, the lock is released
- immediately if the savepoint is rolled back. This is consistent with
+ immediately if the savepoint is rolled back to. This is consistent with
the principle that <command>ROLLBACK</command> cancels all effects of the
commands since the savepoint. The same holds for locks acquired within a
<application>PL/pgSQL</application> exception block: an error escape from the block
@@ -1178,10 +1178,7 @@ ERROR: could not serialize access due to read/write dependencies among transact
conflicting locks on the same row, even in different subtransactions;
but other than that, two transactions can never hold conflicting locks
on the same row. Row-level locks do not affect data querying; they
- block only <emphasis>writers and lockers</emphasis> to the same
- row. Row-level locks are released at transaction end or during
- savepoint rollback, just like table-level locks.
-
+ block only <emphasis>writers and lockers</emphasis> to the same row.
</para>
<variablelist>