aboutsummaryrefslogtreecommitdiff
path: root/doc/src/sgml/ref/set_transaction.sgml
diff options
context:
space:
mode:
Diffstat (limited to 'doc/src/sgml/ref/set_transaction.sgml')
-rw-r--r--doc/src/sgml/ref/set_transaction.sgml11
1 files changed, 7 insertions, 4 deletions
diff --git a/doc/src/sgml/ref/set_transaction.sgml b/doc/src/sgml/ref/set_transaction.sgml
index d394e622f8a..727a92757e8 100644
--- a/doc/src/sgml/ref/set_transaction.sgml
+++ b/doc/src/sgml/ref/set_transaction.sgml
@@ -121,7 +121,8 @@ SET SESSION CHARACTERISTICS AS TRANSACTION <replaceable class="parameter">transa
The transaction isolation level cannot be changed after the first query or
data-modification statement (<command>SELECT</command>,
<command>INSERT</command>, <command>DELETE</command>,
- <command>UPDATE</command>, <command>FETCH</command>, or
+ <command>UPDATE</command>, <command>MERGE</command>,
+ <command>FETCH</command>, or
<command>COPY</command>) of a transaction has been executed. See
<xref linkend="mvcc"/> for more information about transaction
isolation and concurrency control.
@@ -131,8 +132,9 @@ SET SESSION CHARACTERISTICS AS TRANSACTION <replaceable class="parameter">transa
The transaction access mode determines whether the transaction is
read/write or read-only. Read/write is the default. When a
transaction is read-only, the following SQL commands are
- disallowed: <literal>INSERT</literal>, <literal>UPDATE</literal>,
- <literal>DELETE</literal>, and <literal>COPY FROM</literal> if the
+ disallowed: <command>INSERT</command>, <command>UPDATE</command>,
+ <command>DELETE</command>, <command>MERGE</command>, and
+ <command>COPY FROM</command> if the
table they would write to is not a temporary table; all
<literal>CREATE</literal>, <literal>ALTER</literal>, and
<literal>DROP</literal> commands; <literal>COMMENT</literal>,
@@ -169,7 +171,8 @@ SET SESSION CHARACTERISTICS AS TRANSACTION <replaceable class="parameter">transa
start of a transaction, before the first query or
data-modification statement (<command>SELECT</command>,
<command>INSERT</command>, <command>DELETE</command>,
- <command>UPDATE</command>, <command>FETCH</command>, or
+ <command>UPDATE</command>, <command>MERGE</command>,
+ <command>FETCH</command>, or
<command>COPY</command>) of the transaction. Furthermore, the transaction
must already be set to <literal>SERIALIZABLE</literal> or
<literal>REPEATABLE READ</literal> isolation level (otherwise, the snapshot