aboutsummaryrefslogtreecommitdiff
path: root/src/backend/executor
diff options
context:
space:
mode:
Diffstat (limited to 'src/backend/executor')
-rw-r--r--src/backend/executor/execQual.c10
-rw-r--r--src/backend/executor/functions.c6
2 files changed, 8 insertions, 8 deletions
diff --git a/src/backend/executor/execQual.c b/src/backend/executor/execQual.c
index d05eedceecf..9c0ba76ecd9 100644
--- a/src/backend/executor/execQual.c
+++ b/src/backend/executor/execQual.c
@@ -8,7 +8,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/executor/execQual.c,v 1.142 2003/08/17 23:43:25 tgl Exp $
+ * $Header: /cvsroot/pgsql/src/backend/executor/execQual.c,v 1.143 2003/09/09 23:22:20 petere Exp $
*
*-------------------------------------------------------------------------
*/
@@ -713,7 +713,7 @@ ExecMakeFunctionResult(FuncExprState *fcache,
*isDone = ExprEndResult;
else
ereport(ERROR,
- (errcode(ERRCODE_FEATURE_NOT_SUPPORTED),
+ (errcode(ERRCODE_SYNTAX_ERROR),
errmsg("set-valued function called in context that cannot accept a set")));
return (Datum) 0;
}
@@ -757,7 +757,7 @@ ExecMakeFunctionResult(FuncExprState *fcache,
*/
if (isDone == NULL)
ereport(ERROR,
- (errcode(ERRCODE_FEATURE_NOT_SUPPORTED),
+ (errcode(ERRCODE_SYNTAX_ERROR),
errmsg("set-valued function called in context that cannot accept a set")));
/*
@@ -944,7 +944,7 @@ ExecMakeTableFunctionResult(ExprState *funcexpr,
/* We don't allow sets in the arguments of the table function */
if (argDone != ExprSingleResult)
ereport(ERROR,
- (errcode(ERRCODE_FEATURE_NOT_SUPPORTED),
+ (errcode(ERRCODE_SYNTAX_ERROR),
errmsg("set-valued function called in context that cannot accept a set")));
/*
@@ -2955,7 +2955,7 @@ ExecTargetList(List *targetlist,
/* We have a set-valued expression in the tlist */
if (isDone == NULL)
ereport(ERROR,
- (errcode(ERRCODE_FEATURE_NOT_SUPPORTED),
+ (errcode(ERRCODE_SYNTAX_ERROR),
errmsg("set-valued function called in context that cannot accept a set")));
if (itemIsDone[resind] == ExprMultipleResult)
{
diff --git a/src/backend/executor/functions.c b/src/backend/executor/functions.c
index a23eb9b1073..d816b5d64a0 100644
--- a/src/backend/executor/functions.c
+++ b/src/backend/executor/functions.c
@@ -8,7 +8,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/executor/functions.c,v 1.71 2003/08/04 02:39:58 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/executor/functions.c,v 1.72 2003/09/09 23:22:20 petere Exp $
*
*-------------------------------------------------------------------------
*/
@@ -574,7 +574,7 @@ fmgr_sql(PG_FUNCTION_ARGS)
rsi->isDone = ExprEndResult;
else
ereport(ERROR,
- (errcode(ERRCODE_FEATURE_NOT_SUPPORTED),
+ (errcode(ERRCODE_SYNTAX_ERROR),
errmsg("set-valued function called in context that cannot accept a set")));
fcinfo->isnull = true;
result = (Datum) 0;
@@ -613,7 +613,7 @@ fmgr_sql(PG_FUNCTION_ARGS)
rsi->isDone = ExprMultipleResult;
else
ereport(ERROR,
- (errcode(ERRCODE_FEATURE_NOT_SUPPORTED),
+ (errcode(ERRCODE_SYNTAX_ERROR),
errmsg("set-valued function called in context that cannot accept a set")));
/*