Index: src/backend/utils/adt/ri_triggers.c
===================================================================
RCS file: /projects/cvsroot/pgsql/src/backend/utils/adt/ri_triggers.c,v
retrieving revision 1.29
diff -r1.29 ri_triggers.c
53c53
< #define RI_MAX_ARGUMENTS		(RI_FIRST_ATTNAME_ARGNO + (RI_MAX_NUMKEYS * 2))
---
> #define RI_MAX_ARGUMENTS		(RI_FK_ATTNAME_ARGNO + (RI_MAX_NUMKEYS * 2))
2903c2903
< 	key->nkeypairs = (argc - RI_FIRST_ATTNAME_ARGNO) / 2;
---
> 	key->nkeypairs = (argc - RI_FK_ATTNAME_ARGNO) / 2;
2909c2909
< 	for (i = 0, j = RI_FIRST_ATTNAME_ARGNO; j < argc; i++, j += 2)
---
> 	for (i = 0, j = RI_FK_ATTNAME_ARGNO; j < argc; i++, j += 2)
Index: src/include/commands/trigger.h
===================================================================
RCS file: /projects/cvsroot/pgsql/src/include/commands/trigger.h,v
retrieving revision 1.30
diff -r1.30 trigger.h
80a81,96
> /* --------------------------------------------------
>  * RI function arguments from pg_trigger.tgargs bytea
>  * 
>  *   name\000fkrel\000pkrel\000type\000fkatt\000pkatt\000
>  *
>  * moved from backend/utils/adt/ri_triggers.c since
>  * these defines are useful outside of that file.
>  * -- dbv 20011110
>  * -------------------------------------------------*/
> #define RI_CONSTRAINT_NAME_ARGNO		0
> #define RI_FK_RELNAME_ARGNO				1
> #define RI_PK_RELNAME_ARGNO				2
> #define RI_MATCH_TYPE_ARGNO				3
> #define RI_FK_ATTNAME_ARGNO				4
> #define RI_PK_ATTNAME_ARGNO				5
>