From 57dfb64ecf436888cfc25a828ce6bddb7ad15a78 Mon Sep 17 00:00:00 2001 From: Dean Rasheed Date: Thu, 4 Sep 2025 16:01:18 +0100 Subject: [PATCH] Fix compiler error introduced by 5386bfb9c1f. Per buildfarm member wrasse, void function cannot return a value. This only affects v13-v17, where an ABI-compatible wrapper function was added. Backpatch-through: 13-17 --- src/backend/executor/execMain.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/backend/executor/execMain.c b/src/backend/executor/execMain.c index d6129f5baeb..23e1e778d39 100644 --- a/src/backend/executor/execMain.c +++ b/src/backend/executor/execMain.c @@ -1148,8 +1148,8 @@ void CheckValidResultRel(ResultRelInfo *resultRelInfo, CmdType operation, List *mergeActions) { - return CheckValidResultRelNew(resultRelInfo, operation, ONCONFLICT_NONE, - mergeActions); + CheckValidResultRelNew(resultRelInfo, operation, ONCONFLICT_NONE, + mergeActions); } /*