Skip to content

Commit 8a300fc

Browse files
committed
docs: adjust tag indenting and add MERGE mention
Discussion: https://postgr.es/m/CAMpnoC4_WsY3gsY+ud-Z0GDbafR=K7t7cXn2gatEqFnsRNY3yQ@mail.gmail.com Author: Will Mortensen
1 parent 3af8773 commit 8a300fc

File tree

1 file changed

+11
-11
lines changed

1 file changed

+11
-11
lines changed

doc/src/sgml/mvcc.sgml

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -109,8 +109,8 @@
109109
dirty read
110110
<indexterm><primary>dirty read</primary></indexterm>
111111
</term>
112-
<listitem>
113-
<para>
112+
<listitem>
113+
<para>
114114
A transaction reads data written by a concurrent uncommitted transaction.
115115
</para>
116116
</listitem>
@@ -121,8 +121,8 @@
121121
nonrepeatable read
122122
<indexterm><primary>nonrepeatable read</primary></indexterm>
123123
</term>
124-
<listitem>
125-
<para>
124+
<listitem>
125+
<para>
126126
A transaction re-reads data it has previously read and finds that data
127127
has been modified by another transaction (that committed since the
128128
initial read).
@@ -135,8 +135,8 @@
135135
phantom read
136136
<indexterm><primary>phantom read</primary></indexterm>
137137
</term>
138-
<listitem>
139-
<para>
138+
<listitem>
139+
<para>
140140
A transaction re-executes a query returning a set of rows that satisfy a
141141
search condition and finds that the set of rows satisfying the condition
142142
has changed due to another recently-committed transaction.
@@ -149,8 +149,8 @@
149149
serialization anomaly
150150
<indexterm><primary>serialization anomaly</primary></indexterm>
151151
</term>
152-
<listitem>
153-
<para>
152+
<listitem>
153+
<para>
154154
The result of successfully committing a group of transactions
155155
is inconsistent with all possible orderings of running those
156156
transactions one at a time.
@@ -1752,9 +1752,9 @@ SELECT pg_advisory_lock(q.id) FROM
17521752
changes in the table. A repeatable read transaction's snapshot is actually
17531753
frozen at the start of its first query or data-modification command
17541754
(<literal>SELECT</literal>, <literal>INSERT</literal>,
1755-
<literal>UPDATE</literal>, or <literal>DELETE</literal>), so
1756-
it is possible to obtain locks explicitly before the snapshot is
1757-
frozen.
1755+
<literal>UPDATE</literal>, <literal>DELETE</literal>, or
1756+
<literal>MERGE</literal>), so it is possible to obtain locks explicitly
1757+
before the snapshot is frozen.
17581758
</para>
17591759
</sect2>
17601760
</sect1>

0 commit comments

Comments
 (0)