aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlvaro Herrera <alvherre@alvh.no-ip.org>2022-11-17 18:56:11 +0100
committerAlvaro Herrera <alvherre@alvh.no-ip.org>2022-11-17 18:56:11 +0100
commit3d45edcef0e141f2a17a21d0411efa889f843b00 (patch)
treefb6170d5eca67f7d6d78d205af0a67e09179fdd9
parent41afaa1ed4d40330a7f51f7b398064657b87831b (diff)
downloadpostgresql-3d45edcef0e141f2a17a21d0411efa889f843b00.tar.gz
postgresql-3d45edcef0e141f2a17a21d0411efa889f843b00.zip
Fix MERGE tuple count with DO NOTHING
Reporting tuples for which nothing is done is useless and goes against the documented behavior, so don't do it. Backpatch to 15. Reported by: Luca Ferrari Discussion: https://postgr.es/m/CAKoxK+42MmACUh6s8XzASQKizbzrtOGA6G1UjzCP75NcXHsiNw@mail.gmail.com
-rw-r--r--src/backend/executor/nodeModifyTable.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/backend/executor/nodeModifyTable.c b/src/backend/executor/nodeModifyTable.c
index ca95c1d433a..d4e063e926a 100644
--- a/src/backend/executor/nodeModifyTable.c
+++ b/src/backend/executor/nodeModifyTable.c
@@ -2799,7 +2799,7 @@ lmerge_matched:;
{
case TM_Ok:
/* all good; perform final actions */
- if (canSetTag)
+ if (canSetTag && commandType != CMD_NOTHING)
(estate->es_processed)++;
break;