From fb2a83b2b750a32ddfd107a75a3bc173f4f0a81f Mon Sep 17 00:00:00 2001 From: Alvaro Herrera Date: Mon, 24 Oct 2022 12:52:43 +0200 Subject: Update some comments that should've covered MERGE Oversight in 7103ebb7aae8. Backpatch to 15. Author: Richard Guo Discussion: https://postgr.es/m/CAMbWs48gnDjZXq3-b56dVpQCNUJ5hD9kdtWN4QFwKCEapspNsA@mail.gmail.com --- src/include/nodes/parsenodes.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/include/nodes/parsenodes.h') diff --git a/src/include/nodes/parsenodes.h b/src/include/nodes/parsenodes.h index 3e835b8c465..1e7280340b4 100644 --- a/src/include/nodes/parsenodes.h +++ b/src/include/nodes/parsenodes.h @@ -1031,8 +1031,8 @@ typedef struct RangeTblEntry * * rellockmode is really LOCKMODE, but it's declared int to avoid having * to include lock-related headers here. It must be RowExclusiveLock if - * the RTE is an INSERT/UPDATE/DELETE target, else RowShareLock if the RTE - * is a SELECT FOR UPDATE/FOR SHARE target, else AccessShareLock. + * the RTE is an INSERT/UPDATE/DELETE/MERGE target, else RowShareLock if + * the RTE is a SELECT FOR UPDATE/FOR SHARE target, else AccessShareLock. * * Note: in some cases, rule expansion may result in RTEs that are marked * with RowExclusiveLock even though they are not the target of the -- cgit v1.2.3