Skip to content

Commit c2da793

Browse files
committed
Revert erroroneous commit 834b804; my apologies
Backpatch-through: master
1 parent 834b804 commit c2da793

File tree

1 file changed

+3
-6
lines changed

1 file changed

+3
-6
lines changed

doc/src/sgml/mvcc.sgml

+3-6
Original file line numberDiff line numberDiff line change
@@ -1039,9 +1039,9 @@ ERROR: could not serialize access due to read/write dependencies among transact
10391039
</tip>
10401040

10411041
<para>
1042-
Once acquired, a lock is normally held until the end of the transaction. But if a
1042+
Once acquired, a lock is normally held till end of transaction. But if a
10431043
lock is acquired after establishing a savepoint, the lock is released
1044-
immediately if the savepoint is rolled back. This is consistent with
1044+
immediately if the savepoint is rolled back to. This is consistent with
10451045
the principle that <command>ROLLBACK</command> cancels all effects of the
10461046
commands since the savepoint. The same holds for locks acquired within a
10471047
<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
11781178
conflicting locks on the same row, even in different subtransactions;
11791179
but other than that, two transactions can never hold conflicting locks
11801180
on the same row. Row-level locks do not affect data querying; they
1181-
block only <emphasis>writers and lockers</emphasis> to the same
1182-
row. Row-level locks are released at transaction end or during
1183-
savepoint rollback, just like table-level locks.
1184-
1181+
block only <emphasis>writers and lockers</emphasis> to the same row.
11851182
</para>
11861183

11871184
<variablelist>

0 commit comments

Comments
 (0)