Ooops, missed that a couple of contrib modules have calls to byteacmp.

Add bytea.h inclusions as needed.  Some of the contrib regression tests
need to be de-hexified, too.  Per buildfarm.

contrib/btree_gin/btree_gin.c

@@ -1,5 +1,5 @@
 /*
- * $PostgreSQL: pgsql/contrib/btree_gin/btree_gin.c,v 1.2 2009/06/11 14:48:50 momjian Exp $
+ * $PostgreSQL: pgsql/contrib/btree_gin/btree_gin.c,v 1.3 2009/08/04 18:49:50 tgl Exp $
  */
 #include "postgres.h"
 
@@ -8,6 +8,7 @@
 #include "fmgr.h"
 #include "access/skey.h"
 #include "utils/builtins.h"
+#include "utils/bytea.h"
 #include "utils/cash.h"
 #include "utils/date.h"
 #include "utils/inet.h"

contrib/btree_gin/expected/bytea.out

@@ -1,4 +1,6 @@
 set enable_seqscan=off;
+-- ensure consistent test output regardless of the default bytea format
+SET bytea_output TO escape;
 CREATE TABLE test_bytea (
 	i bytea
 );

contrib/btree_gin/sql/bytea.sql

@@ -1,4 +1,6 @@
 set enable_seqscan=off;
+-- ensure consistent test output regardless of the default bytea format
+SET bytea_output TO escape;
 
 CREATE TABLE test_bytea (
 	i bytea

contrib/btree_gist/btree_bit.c

@@ -1,9 +1,9 @@
 /*
- * $PostgreSQL: pgsql/contrib/btree_gist/btree_bit.c,v 1.10 2009/06/11 14:48:50 momjian Exp $
+ * $PostgreSQL: pgsql/contrib/btree_gist/btree_bit.c,v 1.11 2009/08/04 18:49:50 tgl Exp $
  */
 #include "btree_gist.h"
 #include "btree_utils_var.h"
-#include "utils/builtins.h"
+#include "utils/bytea.h"
 #include "utils/varbit.h"
 
 

contrib/btree_gist/btree_bytea.c

@@ -1,9 +1,9 @@
 /*
- * $PostgreSQL: pgsql/contrib/btree_gist/btree_bytea.c,v 1.9 2009/06/11 14:48:50 momjian Exp $
+ * $PostgreSQL: pgsql/contrib/btree_gist/btree_bytea.c,v 1.10 2009/08/04 18:49:50 tgl Exp $
  */
 #include "btree_gist.h"
 #include "btree_utils_var.h"
-#include "utils/builtins.h"
+#include "utils/bytea.h"
 
 
 /*

contrib/citext/expected/citext.out

@@ -737,18 +737,6 @@ SELECT 'f'::citext::"char" = 'f'::"char" AS t;
  t
 (1 row)
 
-SELECT 'foo'::bytea::citext = 'foo' AS t;
- t 
----
- t
-(1 row)
-
-SELECT 'foo'::citext::bytea = 'foo'::bytea AS t;
- t 
----
- t
-(1 row)
-
 SELECT '100'::money::citext = '$100.00' AS t;
  t 
 ---

contrib/citext/expected/citext_1.out

@@ -737,18 +737,6 @@ SELECT 'f'::citext::"char" = 'f'::"char" AS t;
  t
 (1 row)
 
-SELECT 'foo'::bytea::citext = 'foo' AS t;
- t 
----
- t
-(1 row)
-
-SELECT 'foo'::citext::bytea = 'foo'::bytea AS t;
- t 
----
- t
-(1 row)
-
 SELECT '100'::money::citext = '$100.00' AS t;
  t 
 ---

contrib/citext/sql/citext.sql

@@ -226,9 +226,6 @@ SELECT 'f'::citext::char = 'f'::char AS t;
 SELECT 'f'::"char"::citext = 'f' AS t;
 SELECT 'f'::citext::"char" = 'f'::"char" AS t;
 
-SELECT 'foo'::bytea::citext = 'foo' AS t;
-SELECT 'foo'::citext::bytea = 'foo'::bytea AS t;
-
 SELECT '100'::money::citext = '$100.00' AS t;
 SELECT '100'::citext::money = '100'::money AS t;
 

contrib/pgcrypto/expected/blowfish.out

@@ -1,6 +1,8 @@
 --
 -- Blowfish cipher
 --
+-- ensure consistent test output regardless of the default bytea format
+SET bytea_output TO escape;
 -- some standard Blowfish testvalues
 SELECT encode(encrypt(
 decode('0000000000000000', 'hex'),

contrib/pgcrypto/expected/init.out

@@ -8,6 +8,8 @@
 SET client_min_messages = warning;
 \set ECHO none
 RESET client_min_messages;
+-- ensure consistent test output regardless of the default bytea format
+SET bytea_output TO escape;
 -- check for encoding fn's
 SELECT encode('foo', 'hex');
  encode 

contrib/pgcrypto/expected/pgp-armor.out

@@ -1,50 +1,52 @@
 --
 -- PGP Armor
 --
+-- ensure consistent test output regardless of the default bytea format
+SET bytea_output TO escape;
 select armor('');
             armor            
 -----------------------------
  -----BEGIN PGP MESSAGE-----
-                            
- =twTO                      
- -----END PGP MESSAGE-----  
-                            
+ 
+ =twTO
+ -----END PGP MESSAGE-----
+ 
 (1 row)
 
 select armor('test');
             armor            
 -----------------------------
  -----BEGIN PGP MESSAGE-----
-                            
- dGVzdA==                   
- =+G7Q                      
- -----END PGP MESSAGE-----  
-                            
+ 
+ dGVzdA==
+ =+G7Q
+ -----END PGP MESSAGE-----
+ 
 (1 row)
 
 select dearmor(armor(''));
  dearmor 
 ---------
-        
+ 
 (1 row)
 
 select dearmor(armor('zooka'));
  dearmor 
 ---------
- zooka  
+ zooka
 (1 row)
 
 select armor('0123456789abcdef0123456789abcdef0123456789abcdef
 0123456789abcdef0123456789abcdef0123456789abcdef');
                                     armor                                     
 ------------------------------------------------------------------------------
- -----BEGIN PGP MESSAGE-----                                                 
-                                                                             
+ -----BEGIN PGP MESSAGE-----
+ 
  MDEyMzQ1Njc4OWFiY2RlZjAxMjM0NTY3ODlhYmNkZWYwMTIzNDU2Nzg5YWJjZGVmCjAxMjM0NTY3
- ODlhYmNkZWYwMTIzNDU2Nzg5YWJjZGVmMDEyMzQ1Njc4OWFiY2RlZg==                    
- =JFw5                                                                       
- -----END PGP MESSAGE-----                                                   
-                                                                             
+ ODlhYmNkZWYwMTIzNDU2Nzg5YWJjZGVmMDEyMzQ1Njc4OWFiY2RlZg==
+ =JFw5
+ -----END PGP MESSAGE-----
+ 
 (1 row)
 
 -- lots formatting
@@ -60,7 +62,7 @@ em9va2E=
 -----END PGP MESSAGE-----');
  dearmor 
 ---------
- zooka  
+ zooka
 (1 row)
 
 -- lots messages
@@ -88,7 +90,7 @@ d3Jvbmc=
 ');
  dearmor 
 ---------
- right  
+ right
 (1 row)
 
 -- bad crc

contrib/pgcrypto/expected/pgp-encrypt.out

@@ -1,6 +1,8 @@
 --
 -- PGP encrypt
 --
+-- ensure consistent test output regardless of the default bytea format
+SET bytea_output TO escape;
 select pgp_sym_decrypt(pgp_sym_encrypt('Secret.', 'key'), 'key');
  pgp_sym_decrypt 
 -----------------

contrib/pgcrypto/expected/pgp-pubkey-encrypt.out

@@ -1,6 +1,8 @@
 --
 -- PGP Public Key Encryption
 --
+-- ensure consistent test output regardless of the default bytea format
+SET bytea_output TO escape;
 -- successful encrypt/decrypt
 select pgp_pub_decrypt(
 	pgp_pub_encrypt('Secret msg', dearmor(pubkey)),

contrib/pgcrypto/expected/rijndael.out

@@ -1,6 +1,8 @@
 --
 -- AES / Rijndael-128 cipher
 --
+-- ensure consistent test output regardless of the default bytea format
+SET bytea_output TO escape;
 -- some standard Rijndael testvalues
 SELECT encode(encrypt(
 decode('00112233445566778899aabbccddeeff', 'hex'),

contrib/pgcrypto/sql/blowfish.sql

@@ -1,6 +1,8 @@
 --
 -- Blowfish cipher
 --
+-- ensure consistent test output regardless of the default bytea format
+SET bytea_output TO escape;
 
 -- some standard Blowfish testvalues
 SELECT encode(encrypt(

contrib/pgcrypto/sql/init.sql

@@ -12,6 +12,9 @@ SET client_min_messages = warning;
 \set ECHO all
 RESET client_min_messages;
 
+-- ensure consistent test output regardless of the default bytea format
+SET bytea_output TO escape;
+
 -- check for encoding fn's
 SELECT encode('foo', 'hex');
 SELECT decode('666f6f', 'hex');

contrib/pgcrypto/sql/pgp-armor.sql

@@ -1,6 +1,8 @@
 --
 -- PGP Armor
 --
+-- ensure consistent test output regardless of the default bytea format
+SET bytea_output TO escape;
 
 select armor('');
 select armor('test');

contrib/pgcrypto/sql/pgp-encrypt.sql

@@ -1,6 +1,8 @@
 --
 -- PGP encrypt
 --
+-- ensure consistent test output regardless of the default bytea format
+SET bytea_output TO escape;
 
 select pgp_sym_decrypt(pgp_sym_encrypt('Secret.', 'key'), 'key');
 

contrib/pgcrypto/sql/pgp-pubkey-encrypt.sql

@@ -1,6 +1,8 @@
 --
 -- PGP Public Key Encryption
 --
+-- ensure consistent test output regardless of the default bytea format
+SET bytea_output TO escape;
 
 -- successful encrypt/decrypt
 select pgp_pub_decrypt(

contrib/pgcrypto/sql/rijndael.sql

@@ -1,6 +1,8 @@
 --
 -- AES / Rijndael-128 cipher
 --
+-- ensure consistent test output regardless of the default bytea format
+SET bytea_output TO escape;
 
 -- some standard Rijndael testvalues
 SELECT encode(encrypt(