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
This commit is contained in:
Alvaro Herrera 2022-11-17 18:56:11 +01:00
parent 41afaa1ed4
commit 3d45edcef0
No known key found for this signature in database
GPG Key ID: 1C20ACB9D5C564AE

View File

@ -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;