Remove some unnecessary code: since ExecMakeFunctionResultNoSets does not

want to handle set inputs, it should just pass NULL for isDone, not make
its own failure check.

diff --git a/src/backend/executor/execQual.c b/src/backend/executor/execQual.c
index b9492e12d16c60ce8b382a2c39d7d8c8ddf8c293..778fa96de1662a732f2a5c49b2a77811cf0efd1d 100644 (file)
--- a/src/backend/executor/execQual.c
+++ b/src/backend/executor/execQual.c
@@ -1060,17 +1060,11 @@ ExecMakeFunctionResultNoSets(FuncExprState *fcache,
        foreach(arg, fcache->args)
        {
                ExprState  *argstate = (ExprState *) lfirst(arg);
-               ExprDoneCond thisArgIsDone;
 
                fcinfo.arg[i] = ExecEvalExpr(argstate,
                                                                         econtext,
                                                                         &fcinfo.argnull[i],
-                                                                        &thisArgIsDone);
-
-               if (thisArgIsDone != ExprSingleResult)
-                       ereport(ERROR,
-                                       (errcode(ERRCODE_FEATURE_NOT_SUPPORTED),
-                                        errmsg("set-valued function called in context that cannot accept a set")));
+                                                                        NULL);
                i++;
        }