More fixes, but still need +1 for FUNC_MAX_ARGS

This commit is contained in:
Bruce Momjian 2000-01-11 02:30:06 +00:00
parent bf49f0849d
commit 401e6de7ee
3 changed files with 6 additions and 4 deletions

View File

@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/catalog/pg_proc.c,v 1.37 2000/01/10 17:14:31 momjian Exp $
* $Header: /cvsroot/pgsql/src/backend/catalog/pg_proc.c,v 1.38 2000/01/11 02:30:05 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@ -80,7 +80,7 @@ ProcedureCreate(char *procedureName,
{
Value *t = lfirst(x);
if (parameterCount == FUNC_MAX_ARGS)
if (parameterCount > FUNC_MAX_ARGS)
elog(ERROR, "Procedures cannot take more than %d arguments",FUNC_MAX_ARGS);
if (strcmp(strVal(t), "opaque") == 0)

View File

@ -8,7 +8,7 @@
*
*
* IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/libpq/Attic/be-pqexec.c,v 1.26 2000/01/10 17:14:35 momjian Exp $
* $Header: /cvsroot/pgsql/src/backend/libpq/Attic/be-pqexec.c,v 1.27 2000/01/11 02:30:06 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@ -81,6 +81,8 @@ PQfn(int fnid,
retval = (char *)
fmgr(fnid, arg[0], arg[1], arg[2], arg[3],
arg[4], arg[5], arg[6], arg[7]);
arg[8], arg[9], arg[10], arg[11]);
arg[12], arg[13], arg[14], arg[15]);
/* ----------------
* put the result in the buffer the user specified and

View File

@ -101,7 +101,7 @@
* pgsql/src/backend/utils/fmgr/fmgr.c and add additional entries
* to the 'case' statement for the additional arguments.
*/
#define INDEX_MAX_KEYS 8
#define INDEX_MAX_KEYS 16
#define FUNC_MAX_ARGS (INDEX_MAX_KEYS+1)
/*