aboutsummaryrefslogtreecommitdiff
path: root/src/backend
diff options
context:
space:
mode:
Diffstat (limited to 'src/backend')
-rw-r--r--src/backend/optimizer/util/clauses.c9
1 files changed, 8 insertions, 1 deletions
diff --git a/src/backend/optimizer/util/clauses.c b/src/backend/optimizer/util/clauses.c
index ae0c387e69a..75c1e947792 100644
--- a/src/backend/optimizer/util/clauses.c
+++ b/src/backend/optimizer/util/clauses.c
@@ -8,7 +8,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/optimizer/util/clauses.c,v 1.154.2.3 2005/04/10 20:58:03 tgl Exp $
+ * $Header: /cvsroot/pgsql/src/backend/optimizer/util/clauses.c,v 1.154.2.4 2005/04/14 21:44:35 tgl Exp $
*
* HISTORY
* AUTHOR DATE MAJOR EVENT
@@ -1668,6 +1668,13 @@ evaluate_function(Oid funcid, Oid result_type, List *args,
return NULL;
/*
+ * Can't simplify if it returns RECORD, since it will be needing an
+ * expected tupdesc which we can't supply here.
+ */
+ if (funcform->prorettype == RECORDOID)
+ return NULL;
+
+ /*
* Check for constant inputs and especially constant-NULL inputs.
*/
foreach(arg, args)