SET autocommit no longer needed in /contrib because pg_regress.sh does

it automatically now on regression session startup.

33 files changed, 2 insertions, 46 deletions

diff --git a/contrib/btree_gist/expected/btree_gist.out b/contrib/btree_gist/expected/btree_gist.out
index eb67c2e7f73..06699383d71 100644
--- a/contrib/btree_gist/expected/btree_gist.out
+++ b/contrib/btree_gist/expected/btree_gist.out
@@ -5,8 +5,8 @@
 \set ECHO none
 psql:btree_gist.sql:10: WARNING:  ProcedureCreate: type int4key is not yet defined
 psql:btree_gist.sql:15: WARNING:  Argument type "int4key" is only a shell
-psql:btree_gist.sql:76: WARNING:  ProcedureCreate: type tskey is not yet defined
-psql:btree_gist.sql:81: WARNING:  Argument type "tskey" is only a shell
+psql:btree_gist.sql:98: WARNING:  ProcedureCreate: type tskey is not yet defined
+psql:btree_gist.sql:103: WARNING:  Argument type "tskey" is only a shell
 CREATE TABLE inttmp (b int4);
 \copy inttmp from 'data/test_btree.data'
 CREATE TABLE tstmp ( t timestamp without time zone );
diff --git a/contrib/btree_gist/sql/btree_gist.sql b/contrib/btree_gist/sql/btree_gist.sql
index d6e564dda36..6c369b2aa0f 100644
--- a/contrib/btree_gist/sql/btree_gist.sql
+++ b/contrib/btree_gist/sql/btree_gist.sql
@@ -3,7 +3,6 @@
 -- does not depend on contents of seg.sql.
 --
 \set ECHO none
-SET autocommit TO 'on';
 \i btree_gist.sql
 \set ECHO all
 
diff --git a/contrib/cube/sql/cube.sql b/contrib/cube/sql/cube.sql
index 416833bd48b..a0712c55579 100644
--- a/contrib/cube/sql/cube.sql
+++ b/contrib/cube/sql/cube.sql
@@ -7,7 +7,6 @@
 -- does not depend on contents of cube.sql.
 --
 \set ECHO none
-SET autocommit TO 'on';
 \i cube.sql
 \set ECHO all
 
diff --git a/contrib/dblink/expected/dblink.out b/contrib/dblink/expected/dblink.out
index 6b2d442972a..1f69ab1656b 100644
--- a/contrib/dblink/expected/dblink.out
+++ b/contrib/dblink/expected/dblink.out
@@ -6,7 +6,6 @@
 --
 -- Adjust this setting to control where the objects get created.
 SET search_path = public;
-SET autocommit TO 'on';
 CREATE OR REPLACE FUNCTION conditional_drop()
 RETURNS text AS '
 DECLARE
diff --git a/contrib/dblink/sql/dblink.sql b/contrib/dblink/sql/dblink.sql
index e2e9a817861..3e66467ed47 100644
--- a/contrib/dblink/sql/dblink.sql
+++ b/contrib/dblink/sql/dblink.sql
@@ -8,8 +8,6 @@
 -- Adjust this setting to control where the objects get created.
 SET search_path = public;
 
-SET autocommit TO 'on';
-
 CREATE OR REPLACE FUNCTION conditional_drop()
 RETURNS text AS '
 DECLARE
diff --git a/contrib/earthdistance/sql/earthdistance.sql b/contrib/earthdistance/sql/earthdistance.sql
index d8c481beccb..f912110a885 100644
--- a/contrib/earthdistance/sql/earthdistance.sql
+++ b/contrib/earthdistance/sql/earthdistance.sql
@@ -7,7 +7,6 @@
 -- does not depend on contents of earthdistance.sql or cube.sql.
 --
 \set ECHO none
-SET autocommit TO 'on';
 \i earthdistance.sql
 \set ECHO all
 
diff --git a/contrib/intarray/sql/_int.sql b/contrib/intarray/sql/_int.sql
index 91db6d83447..cd05e4a785e 100644
--- a/contrib/intarray/sql/_int.sql
+++ b/contrib/intarray/sql/_int.sql
@@ -3,7 +3,6 @@
 -- does not depend on contents of seg.sql.
 --
 \set ECHO none
-SET autocommit TO 'on';
 \i _int.sql
 \set ECHO all
 
diff --git a/contrib/ltree/sql/ltree.sql b/contrib/ltree/sql/ltree.sql
index 0d9defcca49..141bd434360 100644
--- a/contrib/ltree/sql/ltree.sql
+++ b/contrib/ltree/sql/ltree.sql
@@ -1,6 +1,4 @@
 \set ECHO none
-SET autocommit TO 'on';
-
 \i ltree.sql
 \set ECHO all
 
diff --git a/contrib/pgcrypto/expected/blowfish.out b/contrib/pgcrypto/expected/blowfish.out
index 1f2ccd82b4a..5a13b7669cc 100644
--- a/contrib/pgcrypto/expected/blowfish.out
+++ b/contrib/pgcrypto/expected/blowfish.out
@@ -1,7 +1,6 @@
 --
 -- Blowfish cipher
 --
-SET autocommit TO 'on';
 -- some standard Blowfish testvalues
 SELECT encode(encrypt(
 decode('0000000000000000', 'hex'),
diff --git a/contrib/pgcrypto/expected/crypt-blowfish.out b/contrib/pgcrypto/expected/crypt-blowfish.out
index 9b929749313..329d78f6254 100644
--- a/contrib/pgcrypto/expected/crypt-blowfish.out
+++ b/contrib/pgcrypto/expected/crypt-blowfish.out
@@ -1,7 +1,6 @@
 --
 -- crypt() and gen_salt(): bcrypt
 --
-SET autocommit TO 'on';
 SELECT crypt('', '$2a$06$RQiOJ.3ELirrXwxIZY8q0O');
                             crypt                             
 --------------------------------------------------------------
diff --git a/contrib/pgcrypto/expected/crypt-des.out b/contrib/pgcrypto/expected/crypt-des.out
index 574a45bae7a..b8b605037d4 100644
--- a/contrib/pgcrypto/expected/crypt-des.out
+++ b/contrib/pgcrypto/expected/crypt-des.out
@@ -1,7 +1,6 @@
 --
 -- crypt() and gen_salt(): crypt-des
 --
-SET autocommit TO 'on';
 SELECT crypt('', 'NB');
      crypt     
 ---------------
diff --git a/contrib/pgcrypto/expected/crypt-md5.out b/contrib/pgcrypto/expected/crypt-md5.out
index 545236d6542..a1c8304adcc 100644
--- a/contrib/pgcrypto/expected/crypt-md5.out
+++ b/contrib/pgcrypto/expected/crypt-md5.out
@@ -1,7 +1,6 @@
 --
 -- crypt() and gen_salt(): md5
 --
-SET autocommit TO 'on';
 SELECT crypt('', '$1$Szzz0yzz');
                crypt                
 ------------------------------------
diff --git a/contrib/pgcrypto/expected/crypt-xdes.out b/contrib/pgcrypto/expected/crypt-xdes.out
index b2593fc16be..cdcdefb1996 100644
--- a/contrib/pgcrypto/expected/crypt-xdes.out
+++ b/contrib/pgcrypto/expected/crypt-xdes.out
@@ -1,7 +1,6 @@
 --
 -- crypt() and gen_salt(): extended des
 --
-SET autocommit TO 'on';
 SELECT crypt('', '_J9..j2zz');
         crypt         
 ----------------------
diff --git a/contrib/pgcrypto/expected/hmac-md5.out b/contrib/pgcrypto/expected/hmac-md5.out
index dedd5afe711..9eded3b933b 100644
--- a/contrib/pgcrypto/expected/hmac-md5.out
+++ b/contrib/pgcrypto/expected/hmac-md5.out
@@ -1,7 +1,6 @@
 --
 -- HMAC-MD5
 --
-SET autocommit TO 'on';
 SELECT encode(hmac(
 'Hi There',
 decode('0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b', 'hex'),
diff --git a/contrib/pgcrypto/expected/hmac-sha1.out b/contrib/pgcrypto/expected/hmac-sha1.out
index 4ccb0f101b1..d5f1cf25972 100644
--- a/contrib/pgcrypto/expected/hmac-sha1.out
+++ b/contrib/pgcrypto/expected/hmac-sha1.out
@@ -1,7 +1,6 @@
 --
 -- HMAC-MD5
 --
-SET autocommit TO 'on';
 SELECT encode(hmac(
 'Hi There',
 decode('0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b', 'hex'),
diff --git a/contrib/pgcrypto/expected/md5.out b/contrib/pgcrypto/expected/md5.out
index 70933c9a736..e3301af45c5 100644
--- a/contrib/pgcrypto/expected/md5.out
+++ b/contrib/pgcrypto/expected/md5.out
@@ -1,7 +1,6 @@
 --
 -- MD5 message digest
 --
-SET autocommit TO 'on';
 SELECT encode(digest('', 'md5'), 'hex');
               encode              
 ----------------------------------
diff --git a/contrib/pgcrypto/expected/rijndael.out b/contrib/pgcrypto/expected/rijndael.out
index 18ade2025be..a5dc8ce6200 100644
--- a/contrib/pgcrypto/expected/rijndael.out
+++ b/contrib/pgcrypto/expected/rijndael.out
@@ -1,7 +1,6 @@
 --
 -- AES / Rijndael-128 cipher
 --
-SET autocommit TO 'on';
 -- some standard Rijndael testvalues
 SELECT encode(encrypt(
 decode('00112233445566778899aabbccddeeff', 'hex'),
diff --git a/contrib/pgcrypto/expected/sha1.out b/contrib/pgcrypto/expected/sha1.out
index af86171d88e..9324d5d924f 100644
--- a/contrib/pgcrypto/expected/sha1.out
+++ b/contrib/pgcrypto/expected/sha1.out
@@ -1,7 +1,6 @@
 --
 -- SHA1 message digest
 --
-SET autocommit TO 'on';
 SELECT encode(digest('', 'sha1'), 'hex');
                   encode                  
 ------------------------------------------
diff --git a/contrib/pgcrypto/sql/blowfish.sql b/contrib/pgcrypto/sql/blowfish.sql
index 93187dcba31..e5f6ddccf36 100644
--- a/contrib/pgcrypto/sql/blowfish.sql
+++ b/contrib/pgcrypto/sql/blowfish.sql
@@ -2,8 +2,6 @@
 -- Blowfish cipher
 --
 
-SET autocommit TO 'on';
-
 -- some standard Blowfish testvalues
 SELECT encode(encrypt(
 decode('0000000000000000', 'hex'),
diff --git a/contrib/pgcrypto/sql/crypt-blowfish.sql b/contrib/pgcrypto/sql/crypt-blowfish.sql
index 5128675e0c9..effc1866205 100644
--- a/contrib/pgcrypto/sql/crypt-blowfish.sql
+++ b/contrib/pgcrypto/sql/crypt-blowfish.sql
@@ -2,8 +2,6 @@
 -- crypt() and gen_salt(): bcrypt
 --
 
-SET autocommit TO 'on';
-
 SELECT crypt('', '$2a$06$RQiOJ.3ELirrXwxIZY8q0O');
 
 SELECT crypt('foox', '$2a$06$RQiOJ.3ELirrXwxIZY8q0O');
diff --git a/contrib/pgcrypto/sql/crypt-des.sql b/contrib/pgcrypto/sql/crypt-des.sql
index ff43112dd82..b13d2f9de71 100644
--- a/contrib/pgcrypto/sql/crypt-des.sql
+++ b/contrib/pgcrypto/sql/crypt-des.sql
@@ -2,8 +2,6 @@
 -- crypt() and gen_salt(): crypt-des
 --
 
-SET autocommit TO 'on';
-
 SELECT crypt('', 'NB');
 
 SELECT crypt('foox', 'NB');
diff --git a/contrib/pgcrypto/sql/crypt-md5.sql b/contrib/pgcrypto/sql/crypt-md5.sql
index c570e4ab7a7..0002f0d34d7 100644
--- a/contrib/pgcrypto/sql/crypt-md5.sql
+++ b/contrib/pgcrypto/sql/crypt-md5.sql
@@ -2,8 +2,6 @@
 -- crypt() and gen_salt(): md5
 --
 
-SET autocommit TO 'on';
-
 SELECT crypt('', '$1$Szzz0yzz');
 
 SELECT crypt('foox', '$1$Szzz0yzz');
diff --git a/contrib/pgcrypto/sql/crypt-xdes.sql b/contrib/pgcrypto/sql/crypt-xdes.sql
index c6205ab6008..51271dba6da 100644
--- a/contrib/pgcrypto/sql/crypt-xdes.sql
+++ b/contrib/pgcrypto/sql/crypt-xdes.sql
@@ -2,8 +2,6 @@
 -- crypt() and gen_salt(): extended des
 --
 
-SET autocommit TO 'on';
-
 SELECT crypt('', '_J9..j2zz');
 
 SELECT crypt('foox', '_J9..j2zz');
diff --git a/contrib/pgcrypto/sql/hmac-md5.sql b/contrib/pgcrypto/sql/hmac-md5.sql
index ed2b65b7b8d..70bef7cd505 100644
--- a/contrib/pgcrypto/sql/hmac-md5.sql
+++ b/contrib/pgcrypto/sql/hmac-md5.sql
@@ -2,8 +2,6 @@
 -- HMAC-MD5
 --
 
-SET autocommit TO 'on';
-
 SELECT encode(hmac(
 'Hi There',
 decode('0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b', 'hex'),
diff --git a/contrib/pgcrypto/sql/hmac-sha1.sql b/contrib/pgcrypto/sql/hmac-sha1.sql
index fb70424dceb..4adf6ed0863 100644
--- a/contrib/pgcrypto/sql/hmac-sha1.sql
+++ b/contrib/pgcrypto/sql/hmac-sha1.sql
@@ -2,8 +2,6 @@
 -- HMAC-MD5
 --
 
-SET autocommit TO 'on';
-
 SELECT encode(hmac(
 'Hi There',
 decode('0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b', 'hex'),
diff --git a/contrib/pgcrypto/sql/init.sql b/contrib/pgcrypto/sql/init.sql
index 08ffeb49814..9d38cb58540 100644
--- a/contrib/pgcrypto/sql/init.sql
+++ b/contrib/pgcrypto/sql/init.sql
@@ -3,7 +3,6 @@
 --
 
 \set ECHO none
-SET autocommit TO 'on';
 \i pgcrypto.sql
 \set ECHO all
 
diff --git a/contrib/pgcrypto/sql/md5.sql b/contrib/pgcrypto/sql/md5.sql
index 0c851217b20..d6e502779af 100644
--- a/contrib/pgcrypto/sql/md5.sql
+++ b/contrib/pgcrypto/sql/md5.sql
@@ -2,8 +2,6 @@
 -- MD5 message digest
 --
 
-SET autocommit TO 'on';
-
 SELECT encode(digest('', 'md5'), 'hex');
 SELECT encode(digest('a', 'md5'), 'hex');
 SELECT encode(digest('abc', 'md5'), 'hex');
diff --git a/contrib/pgcrypto/sql/rijndael.sql b/contrib/pgcrypto/sql/rijndael.sql
index 793b07f362e..6f3dfc96227 100644
--- a/contrib/pgcrypto/sql/rijndael.sql
+++ b/contrib/pgcrypto/sql/rijndael.sql
@@ -2,8 +2,6 @@
 -- AES / Rijndael-128 cipher
 --
 
-SET autocommit TO 'on';
-
 -- some standard Rijndael testvalues
 SELECT encode(encrypt(
 decode('00112233445566778899aabbccddeeff', 'hex'),
diff --git a/contrib/pgcrypto/sql/sha1.sql b/contrib/pgcrypto/sql/sha1.sql
index 1c0fcd90721..6a398b411eb 100644
--- a/contrib/pgcrypto/sql/sha1.sql
+++ b/contrib/pgcrypto/sql/sha1.sql
@@ -2,8 +2,6 @@
 -- SHA1 message digest
 --
 
-SET autocommit TO 'on';
-
 SELECT encode(digest('', 'sha1'), 'hex');
 SELECT encode(digest('a', 'sha1'), 'hex');
 SELECT encode(digest('abc', 'sha1'), 'hex');
diff --git a/contrib/rtree_gist/sql/rtree_gist.sql b/contrib/rtree_gist/sql/rtree_gist.sql
index 161abae1edd..73435c0b3de 100644
--- a/contrib/rtree_gist/sql/rtree_gist.sql
+++ b/contrib/rtree_gist/sql/rtree_gist.sql
@@ -3,7 +3,6 @@
 -- does not depend on contents of seg.sql.
 --
 \set ECHO none
-SET autocommit TO 'on';
 \i rtree_gist.sql
 \set ECHO all
 
diff --git a/contrib/seg/sql/seg.sql b/contrib/seg/sql/seg.sql
index 6614ead0c59..95394c95d04 100644
--- a/contrib/seg/sql/seg.sql
+++ b/contrib/seg/sql/seg.sql
@@ -7,7 +7,6 @@
 -- does not depend on contents of seg.sql.
 --
 \set ECHO none
-SET autocommit TO 'on';
 \i seg.sql
 \set ECHO all
 
diff --git a/contrib/tablefunc/sql/tablefunc.sql b/contrib/tablefunc/sql/tablefunc.sql
index 4c1da066878..bafed1e5c34 100644
--- a/contrib/tablefunc/sql/tablefunc.sql
+++ b/contrib/tablefunc/sql/tablefunc.sql
@@ -3,7 +3,6 @@
 -- does not depend on contents of tablefunc.sql.
 --
 \set ECHO none
-SET autocommit TO 'on';
 \i tablefunc.sql
 \set ECHO all
 
diff --git a/contrib/tsearch/sql/tsearch.sql b/contrib/tsearch/sql/tsearch.sql
index 5b0b50afcab..70ab3a3b007 100644
--- a/contrib/tsearch/sql/tsearch.sql
+++ b/contrib/tsearch/sql/tsearch.sql
@@ -3,7 +3,6 @@
 -- does not depend on contents of seg.sql.
 --
 \set ECHO none
-SET autocommit TO 'on';
 \i tsearch.sql
 \set ECHO all