I am sorry, I misinterpreted the still failing trigger regression test.

The
offending code
has been removed, the action is now always dependent :-)

I suggest the following patch, to finally make trigger regression happy
again:

 <<refint1.patch>>
After that you can remove the following from TODO:
Remove ERROR:  check_primary_key: even number of arguments should be
specified
Trigger regression test fails

Andreas

diff --git a/contrib/spi/refint.c b/contrib/spi/refint.c
index de5065f539119bc67d6741f1ae8459501789eb41..a4b686fecb45a945a4f10cd5ca2634cac84fadae 100644 (file)
--- a/contrib/spi/refint.c
+++ b/contrib/spi/refint.c
@@ -3,8 +3,6 @@
  *             constraints using general triggers.
  */
 
-#define  DEBUG_QUERY 1
-
 #include "executor/spi.h"              /* this is what you need to work with SPI */
 #include "commands/trigger.h"  /* -"- and triggers */
 #include <ctype.h>                             /* tolower () */

diff --git a/src/backend/utils/adt/acl.c b/src/backend/utils/adt/acl.c
index 0fc4bd39504ce4f972e88c4a298c317e34d19e30..412571fd8b03477fee06c0cf893ab37c9b2cefd9 100644 (file)
--- a/src/backend/utils/adt/acl.c
+++ b/src/backend/utils/adt/acl.c
@@ -108,7 +108,7 @@ aclparse(char *s, AclItem *aip, unsigned *modechg)
 
 #ifdef ACLDEBUG_TRACE
        printf("aclparse: input = '%s'\n", s);
-#endif ACLDEBUG_TRACE
+#endif
        aip->ai_idtype = ACL_IDTYPE_UID;
        s = getid(s, name);
        if (*s != ACL_MODECHG_ADD_CHR &&