From: Noah Misch <noah@leadboat.com>
Date: Wed, 25 Sep 2024 00:16:36 +0000 (-0700)
Subject: Fix use of uninitialized value in previous commit.
X-Git-Tag: REL_16_5~69
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=90f5412a9a513f2d8e4fee1102946219482b8af1;p=thirdparty%2Fpostgresql.git

Fix use of uninitialized value in previous commit.

Per buildfarm member akepa and others.  Back-patch to v16 and v15.

Discussion: https://postgr.es/m/20240924224352.93.nmisch@google.com
---

diff --git a/src/backend/executor/nodeModifyTable.c b/src/backend/executor/nodeModifyTable.c
index 8c6369d3e7d..b4cd0278695 100644
--- a/src/backend/executor/nodeModifyTable.c
+++ b/src/backend/executor/nodeModifyTable.c
@@ -2846,7 +2846,7 @@ ExecMergeMatched(ModifyTableContext *context, ResultRelInfo *resultRelInfo,
 	 * If there are no WHEN MATCHED actions, we are done.
 	 */
 	if (resultRelInfo->ri_matchedMergeAction == NIL)
-		goto out;
+		return no_further_action;
 
 	/*
 	 * Make tuple and any needed join variables available to ExecQual and