From e5cf1a8a26933ccaab49b708b1d4a3a6a9580509 Mon Sep 17 00:00:00 2001
From: Bruce Momjian <bruce@momjian.us>
Date: Mon, 21 Oct 2002 01:42:14 +0000
Subject: [PATCH] SET autocommit no longer needed in /contrib because
pg_regress.sh does it automatically now on regression session startup.
---
contrib/btree_gist/expected/btree_gist.out | 4 ++--
contrib/btree_gist/sql/btree_gist.sql | 1 -
contrib/cube/sql/cube.sql | 1 -
contrib/dblink/expected/dblink.out | 1 -
contrib/dblink/sql/dblink.sql | 2 --
contrib/earthdistance/sql/earthdistance.sql | 1 -
contrib/intarray/sql/_int.sql | 1 -
contrib/ltree/sql/ltree.sql | 2 --
contrib/pgcrypto/expected/blowfish.out | 1 -
contrib/pgcrypto/expected/crypt-blowfish.out | 1 -
contrib/pgcrypto/expected/crypt-des.out | 1 -
contrib/pgcrypto/expected/crypt-md5.out | 1 -
contrib/pgcrypto/expected/crypt-xdes.out | 1 -
contrib/pgcrypto/expected/hmac-md5.out | 1 -
contrib/pgcrypto/expected/hmac-sha1.out | 1 -
contrib/pgcrypto/expected/md5.out | 1 -
contrib/pgcrypto/expected/rijndael.out | 1 -
contrib/pgcrypto/expected/sha1.out | 1 -
contrib/pgcrypto/sql/blowfish.sql | 2 --
contrib/pgcrypto/sql/crypt-blowfish.sql | 2 --
contrib/pgcrypto/sql/crypt-des.sql | 2 --
contrib/pgcrypto/sql/crypt-md5.sql | 2 --
contrib/pgcrypto/sql/crypt-xdes.sql | 2 --
contrib/pgcrypto/sql/hmac-md5.sql | 2 --
contrib/pgcrypto/sql/hmac-sha1.sql | 2 --
contrib/pgcrypto/sql/init.sql | 1 -
contrib/pgcrypto/sql/md5.sql | 2 --
contrib/pgcrypto/sql/rijndael.sql | 2 --
contrib/pgcrypto/sql/sha1.sql | 2 --
contrib/rtree_gist/sql/rtree_gist.sql | 1 -
contrib/seg/sql/seg.sql | 1 -
contrib/tablefunc/sql/tablefunc.sql | 1 -
contrib/tsearch/sql/tsearch.sql | 1 -
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 eb67c2e7f7..06699383d7 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 d6e564dda3..6c369b2aa0 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 416833bd48..a0712c5557 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 6b2d442972..1f69ab1656 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 e2e9a81786..3e66467ed4 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 d8c481becc..f912110a88 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 91db6d8344..cd05e4a785 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 0d9defcca4..141bd43436 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 1f2ccd82b4..5a13b7669c 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 9b92974931..329d78f625 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 574a45bae7..b8b605037d 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 545236d654..a1c8304adc 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 b2593fc16b..cdcdefb199 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 dedd5afe71..9eded3b933 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 4ccb0f101b..d5f1cf2597 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 70933c9a73..e3301af45c 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 18ade2025b..a5dc8ce620 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 af86171d88..9324d5d924 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 93187dcba3..e5f6ddccf3 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 5128675e0c..effc186620 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 ff43112dd8..b13d2f9de7 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 c570e4ab7a..0002f0d34d 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 c6205ab600..51271dba6d 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 ed2b65b7b8..70bef7cd50 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 fb70424dce..4adf6ed086 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 08ffeb4981..9d38cb5854 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 0c851217b2..d6e502779a 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 793b07f362..6f3dfc9622 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 1c0fcd9072..6a398b411e 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 161abae1ed..73435c0b3d 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 6614ead0c5..95394c95d0 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 4c1da06687..bafed1e5c3 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 5b0b50afca..70ab3a3b00 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