From 7eaec62fd8665ba761114e8238f95f0f47924a21 Mon Sep 17 00:00:00 2001 From: Will Mortensen Date: Sat, 27 Aug 2022 17:54:11 -0700 Subject: [PATCH 2/6] doc: add mention of MERGE in MVCC --- doc/src/sgml/mvcc.sgml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/doc/src/sgml/mvcc.sgml b/doc/src/sgml/mvcc.sgml index 69b01d01b9..512e8b710d 100644 --- a/doc/src/sgml/mvcc.sgml +++ b/doc/src/sgml/mvcc.sgml @@ -1750,9 +1750,9 @@ SELECT pg_advisory_lock(q.id) FROM changes in the table. A repeatable read transaction's snapshot is actually frozen at the start of its first query or data-modification command (SELECT, INSERT, - UPDATE, or DELETE), so - it is possible to obtain locks explicitly before the snapshot is - frozen. + UPDATE, DELETE, or + MERGE), so it is possible to obtain locks explicitly + before the snapshot is frozen. -- 2.25.1