From 689eb53e478debe0232e4fb928a0d6aae33fa34c Mon Sep 17 00:00:00 2001 From: Tom Lane Date: Fri, 25 Jul 2003 20:18:01 +0000 Subject: Error message editing in backend/utils (except /adt). --- src/backend/utils/fmgr/funcapi.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'src/backend/utils/fmgr/funcapi.c') diff --git a/src/backend/utils/fmgr/funcapi.c b/src/backend/utils/fmgr/funcapi.c index 95975653a64..d39791d39a1 100644 --- a/src/backend/utils/fmgr/funcapi.c +++ b/src/backend/utils/fmgr/funcapi.c @@ -7,7 +7,7 @@ * Copyright (c) 2002, PostgreSQL Global Development Group * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/utils/fmgr/funcapi.c,v 1.6 2002/09/04 20:31:30 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/utils/fmgr/funcapi.c,v 1.7 2003/07/25 20:17:52 tgl Exp $ * *------------------------------------------------------------------------- */ @@ -33,7 +33,9 @@ init_MultiFuncCall(PG_FUNCTION_ARGS) * Bail if we're called in the wrong context */ if (fcinfo->resultinfo == NULL || !IsA(fcinfo->resultinfo, ReturnSetInfo)) - elog(ERROR, "function called in context that does not accept a set result"); + ereport(ERROR, + (errcode(ERRCODE_FEATURE_NOT_SUPPORTED), + errmsg("set function called in context that does not accept a set result"))); if (fcinfo->flinfo->fn_extra == NULL) { @@ -63,8 +65,8 @@ init_MultiFuncCall(PG_FUNCTION_ARGS) fcinfo->flinfo->fn_extra = retval; } else -/* second and subsequent calls */ { + /* second and subsequent calls */ elog(ERROR, "init_MultiFuncCall may not be called more than once"); /* never reached, but keep compiler happy */ -- cgit v1.2.3