aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/backend/optimizer/util/clauses.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/src/backend/optimizer/util/clauses.c b/src/backend/optimizer/util/clauses.c
index e948bccc1a2..de2e66b0f16 100644
--- a/src/backend/optimizer/util/clauses.c
+++ b/src/backend/optimizer/util/clauses.c
@@ -2746,7 +2746,9 @@ eval_const_expressions_mutator(Node *node,
/*
* We can remove null constants from the list. For a non-null
* constant, if it has not been preceded by any other
- * non-null-constant expressions then that is the result.
+ * non-null-constant expressions then it is the result. Otherwise,
+ * it's the next argument, but we can drop following arguments
+ * since they will never be reached.
*/
if (IsA(e, Const))
{
@@ -2754,6 +2756,8 @@ eval_const_expressions_mutator(Node *node,
continue; /* drop null constant */
if (newargs == NIL)
return e; /* first expr */
+ newargs = lappend(newargs, e);
+ break;
}
newargs = lappend(newargs, e);
}