]> git.ipfire.org Git - thirdparty/postgresql.git/commitdiff
Fix use of uninitialized value in previous commit.
authorNoah Misch <noah@leadboat.com>
Wed, 25 Sep 2024 00:16:36 +0000 (17:16 -0700)
committerNoah Misch <noah@leadboat.com>
Wed, 25 Sep 2024 00:16:36 +0000 (17:16 -0700)
Per buildfarm member akepa and others.  Back-patch to v16 and v15.

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

src/backend/executor/nodeModifyTable.c

index 8c6369d3e7deeb45214d1e555938452de936d168..b4cd02786954e1263904f9fffc7f98a18854deba 100644 (file)
@@ -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