From 1864133544814da3142edca0967ce1d26ad47c9a Mon Sep 17 00:00:00 2001
From: Andrey Borodin <x4m@flight.local>
Date: Thu, 16 Dec 2021 12:59:32 +0500
Subject: [PATCH v4 2/4] Remove DEBUG1 verification of the fact that index was
 built with sorting

---
 contrib/btree_gist/expected/bit.out         | 5 -----
 contrib/btree_gist/expected/bool.out        | 5 -----
 contrib/btree_gist/expected/bytea.out       | 5 -----
 contrib/btree_gist/expected/cash.out        | 5 -----
 contrib/btree_gist/expected/char.out        | 5 -----
 contrib/btree_gist/expected/cidr.out        | 5 -----
 contrib/btree_gist/expected/date.out        | 5 -----
 contrib/btree_gist/expected/enum.out        | 5 -----
 contrib/btree_gist/expected/float4.out      | 5 -----
 contrib/btree_gist/expected/float8.out      | 5 -----
 contrib/btree_gist/expected/inet.out        | 5 -----
 contrib/btree_gist/expected/int2.out        | 5 -----
 contrib/btree_gist/expected/int4.out        | 5 -----
 contrib/btree_gist/expected/int8.out        | 5 -----
 contrib/btree_gist/expected/interval.out    | 5 -----
 contrib/btree_gist/expected/macaddr.out     | 5 -----
 contrib/btree_gist/expected/macaddr8.out    | 5 -----
 contrib/btree_gist/expected/numeric.out     | 5 -----
 contrib/btree_gist/expected/oid.out         | 5 -----
 contrib/btree_gist/expected/text.out        | 5 -----
 contrib/btree_gist/expected/time.out        | 5 -----
 contrib/btree_gist/expected/timestamp.out   | 5 -----
 contrib/btree_gist/expected/timestamptz.out | 5 -----
 contrib/btree_gist/expected/timetz.out      | 5 -----
 contrib/btree_gist/expected/uuid.out        | 5 -----
 contrib/btree_gist/expected/varbit.out      | 5 -----
 contrib/btree_gist/expected/varchar.out     | 5 -----
 contrib/btree_gist/sql/bit.sql              | 2 --
 contrib/btree_gist/sql/bool.sql             | 2 --
 contrib/btree_gist/sql/bytea.sql            | 2 --
 contrib/btree_gist/sql/cash.sql             | 2 --
 contrib/btree_gist/sql/char.sql             | 2 --
 contrib/btree_gist/sql/cidr.sql             | 2 --
 contrib/btree_gist/sql/date.sql             | 2 --
 contrib/btree_gist/sql/enum.sql             | 2 --
 contrib/btree_gist/sql/float4.sql           | 2 --
 contrib/btree_gist/sql/float8.sql           | 2 --
 contrib/btree_gist/sql/inet.sql             | 2 --
 contrib/btree_gist/sql/int2.sql             | 2 --
 contrib/btree_gist/sql/int4.sql             | 2 --
 contrib/btree_gist/sql/int8.sql             | 2 --
 contrib/btree_gist/sql/interval.sql         | 2 --
 contrib/btree_gist/sql/macaddr.sql          | 2 --
 contrib/btree_gist/sql/macaddr8.sql         | 2 --
 contrib/btree_gist/sql/numeric.sql          | 2 --
 contrib/btree_gist/sql/oid.sql              | 2 --
 contrib/btree_gist/sql/text.sql             | 2 --
 contrib/btree_gist/sql/time.sql             | 2 --
 contrib/btree_gist/sql/timestamp.sql        | 2 --
 contrib/btree_gist/sql/timestamptz.sql      | 2 --
 contrib/btree_gist/sql/timetz.sql           | 3 ---
 contrib/btree_gist/sql/uuid.sql             | 2 --
 contrib/btree_gist/sql/varbit.sql           | 2 --
 contrib/btree_gist/sql/varchar.sql          | 2 --
 54 files changed, 190 deletions(-)

diff --git a/contrib/btree_gist/expected/bit.out b/contrib/btree_gist/expected/bit.out
index cb2297ce806..a635ce47e7a 100644
--- a/contrib/btree_gist/expected/bit.out
+++ b/contrib/btree_gist/expected/bit.out
@@ -32,14 +32,9 @@ SELECT count(*) FROM bittmp WHERE a >   '011011000100010111011000110000100';
    350
 (1 row)
 
-SET client_min_messages = DEBUG1;
 CREATE INDEX bitidx ON bittmp USING GIST ( a );
-DEBUG:  building index "bitidx" on table "bittmp" serially
-DEBUG:  using sorted GiST build
 CREATE INDEX bitidx_b ON bittmp USING GIST ( a ) WITH (buffering=on);
-DEBUG:  building index "bitidx_b" on table "bittmp" serially
 DROP INDEX bitidx_b;
-RESET client_min_messages;
 SET enable_seqscan=off;
 SELECT count(*) FROM bittmp WHERE a <   '011011000100010111011000110000100';
  count 
diff --git a/contrib/btree_gist/expected/bool.out b/contrib/btree_gist/expected/bool.out
index f015cbf0623..37b37b5d874 100644
--- a/contrib/btree_gist/expected/bool.out
+++ b/contrib/btree_gist/expected/bool.out
@@ -32,14 +32,9 @@ SELECT count(*) FROM booltmp WHERE a >  true;
      0
 (1 row)
 
-SET client_min_messages = DEBUG1;
 CREATE INDEX boolidx ON booltmp USING gist ( a );
-DEBUG:  building index "boolidx" on table "booltmp" serially
-DEBUG:  using sorted GiST build
 CREATE INDEX boolidx_b ON booltmp USING gist ( a ) WITH (buffering=on);
-DEBUG:  building index "boolidx_b" on table "booltmp" serially
 DROP INDEX boolidx_b;
-RESET client_min_messages;
 SET enable_seqscan=off;
 SELECT count(*) FROM booltmp WHERE a <  true;
  count 
diff --git a/contrib/btree_gist/expected/bytea.out b/contrib/btree_gist/expected/bytea.out
index 170b48e1db9..76327fc02d6 100644
--- a/contrib/btree_gist/expected/bytea.out
+++ b/contrib/btree_gist/expected/bytea.out
@@ -33,14 +33,9 @@ SELECT count(*) FROM byteatmp WHERE a >   '31b0';
    400
 (1 row)
 
-SET client_min_messages = DEBUG1;
 CREATE INDEX byteaidx ON byteatmp USING GIST ( a );
-DEBUG:  building index "byteaidx" on table "byteatmp" serially
-DEBUG:  using sorted GiST build
 CREATE INDEX byteaidx_b ON byteatmp USING GIST ( a ) WITH (buffering=on);
-DEBUG:  building index "byteaidx_b" on table "byteatmp" serially
 DROP INDEX byteaidx_b;
-RESET client_min_messages;
 SET enable_seqscan=off;
 SELECT count(*) FROM byteatmp WHERE a <   '31b0'::bytea;
  count 
diff --git a/contrib/btree_gist/expected/cash.out b/contrib/btree_gist/expected/cash.out
index 868af70b22c..ad730d4560b 100644
--- a/contrib/btree_gist/expected/cash.out
+++ b/contrib/btree_gist/expected/cash.out
@@ -40,14 +40,9 @@ SELECT a, a <-> '21472.79' FROM moneytmp ORDER BY a <-> '21472.79' LIMIT 3;
  $21,915.01 |  $442.22
 (3 rows)
 
-SET client_min_messages = DEBUG1;
 CREATE INDEX moneyidx ON moneytmp USING gist ( a );
-DEBUG:  building index "moneyidx" on table "moneytmp" serially
-DEBUG:  using sorted GiST build
 CREATE INDEX moneyidx_b ON moneytmp USING gist ( a ) WITH (buffering=on);
-DEBUG:  building index "moneyidx_b" on table "moneytmp" serially
 DROP INDEX moneyidx_b;
-RESET client_min_messages;
 SET enable_seqscan=off;
 SELECT count(*) FROM moneytmp WHERE a <  '22649.64'::money;
  count 
diff --git a/contrib/btree_gist/expected/char.out b/contrib/btree_gist/expected/char.out
index 97316cbb06b..e17b1ae8153 100644
--- a/contrib/btree_gist/expected/char.out
+++ b/contrib/btree_gist/expected/char.out
@@ -32,14 +32,9 @@ SELECT count(*) FROM chartmp WHERE a >   '31b0'::char(32);
    400
 (1 row)
 
-SET client_min_messages = DEBUG1;
 CREATE INDEX charidx ON chartmp USING GIST ( a );
-DEBUG:  building index "charidx" on table "chartmp" serially
-DEBUG:  using sorted GiST build
 CREATE INDEX charidx_b ON chartmp USING GIST ( a ) WITH (buffering=on);
-DEBUG:  building index "charidx_b" on table "chartmp" serially
 DROP INDEX charidx_b;
-RESET client_min_messages;
 SET enable_seqscan=off;
 SELECT count(*) FROM chartmp WHERE a <   '31b0'::char(32);
  count 
diff --git a/contrib/btree_gist/expected/cidr.out b/contrib/btree_gist/expected/cidr.out
index f15597c06a0..424444fd8e9 100644
--- a/contrib/btree_gist/expected/cidr.out
+++ b/contrib/btree_gist/expected/cidr.out
@@ -32,14 +32,9 @@ SELECT count(*) FROM cidrtmp WHERE a >  '121.111.63.82';
    309
 (1 row)
 
-SET client_min_messages = DEBUG1;
 CREATE INDEX cidridx ON cidrtmp USING gist ( a );
-DEBUG:  building index "cidridx" on table "cidrtmp" serially
-DEBUG:  using sorted GiST build
 CREATE INDEX cidridx_b ON cidrtmp USING gist ( a ) WITH (buffering=on);
-DEBUG:  building index "cidridx_b" on table "cidrtmp" serially
 DROP INDEX cidridx_b;
-RESET client_min_messages;
 SET enable_seqscan=off;
 SELECT count(*) FROM cidrtmp WHERE a <  '121.111.63.82'::cidr;
  count 
diff --git a/contrib/btree_gist/expected/date.out b/contrib/btree_gist/expected/date.out
index 5c93d02209c..19037267a8b 100644
--- a/contrib/btree_gist/expected/date.out
+++ b/contrib/btree_gist/expected/date.out
@@ -40,14 +40,9 @@ SELECT a, a <-> '2001-02-13' FROM datetmp ORDER BY a <-> '2001-02-13' LIMIT 3;
  03-24-2001 |       39
 (3 rows)
 
-SET client_min_messages = DEBUG1;
 CREATE INDEX dateidx ON datetmp USING gist ( a );
-DEBUG:  building index "dateidx" on table "datetmp" serially
-DEBUG:  using sorted GiST build
 CREATE INDEX dateidx_b ON datetmp USING gist ( a ) WITH (buffering=on);
-DEBUG:  building index "dateidx_b" on table "datetmp" serially
 DROP INDEX dateidx_b;
-RESET client_min_messages;
 SET enable_seqscan=off;
 SELECT count(*) FROM datetmp WHERE a <  '2001-02-13'::date;
  count 
diff --git a/contrib/btree_gist/expected/enum.out b/contrib/btree_gist/expected/enum.out
index d73ad33974d..2698341500a 100644
--- a/contrib/btree_gist/expected/enum.out
+++ b/contrib/btree_gist/expected/enum.out
@@ -46,14 +46,9 @@ SELECT count(*) FROM enumtmp WHERE a >  'g'::rainbow;
    230
 (1 row)
 
-SET client_min_messages = DEBUG1;
 CREATE INDEX enumidx ON enumtmp USING gist ( a );
-DEBUG:  building index "enumidx" on table "enumtmp" serially
-DEBUG:  using sorted GiST build
 CREATE INDEX enumidx_b ON enumtmp USING gist ( a ) WITH (buffering=on);
-DEBUG:  building index "enumidx_b" on table "enumtmp" serially
 DROP INDEX enumidx_b;
-RESET client_min_messages;
 SET enable_seqscan=off;
 SELECT count(*) FROM enumtmp WHERE a <  'g'::rainbow;
  count 
diff --git a/contrib/btree_gist/expected/float4.out b/contrib/btree_gist/expected/float4.out
index 5f4f1aa4ec5..e453e9dd062 100644
--- a/contrib/btree_gist/expected/float4.out
+++ b/contrib/btree_gist/expected/float4.out
@@ -40,14 +40,9 @@ SELECT a, a <-> '-179.0' FROM float4tmp ORDER BY a <-> '-179.0' LIMIT 3;
  -158.17741 | 20.822586
 (3 rows)
 
-SET client_min_messages = DEBUG1;
 CREATE INDEX float4idx ON float4tmp USING gist ( a );
-DEBUG:  building index "float4idx" on table "float4tmp" serially
-DEBUG:  using sorted GiST build
 CREATE INDEX float4idx_b ON float4tmp USING gist ( a ) WITH (buffering=on);
-DEBUG:  building index "float4idx_b" on table "float4tmp" serially
 DROP INDEX float4idx_b;
-RESET client_min_messages;
 SET enable_seqscan=off;
 SELECT count(*) FROM float4tmp WHERE a <  -179.0::float4;
  count 
diff --git a/contrib/btree_gist/expected/float8.out b/contrib/btree_gist/expected/float8.out
index 4db0f7b8282..a039e90d0b5 100644
--- a/contrib/btree_gist/expected/float8.out
+++ b/contrib/btree_gist/expected/float8.out
@@ -40,14 +40,9 @@ SELECT a, a <-> '-1890.0' FROM float8tmp ORDER BY a <-> '-1890.0' LIMIT 3;
   -1769.73634 | 120.26366000000007
 (3 rows)
 
-SET client_min_messages = DEBUG1;
 CREATE INDEX float8idx ON float8tmp USING gist ( a );
-DEBUG:  building index "float8idx" on table "float8tmp" serially
-DEBUG:  using sorted GiST build
 CREATE INDEX float8idx_b ON float8tmp USING gist ( a ) WITH (buffering=on);
-DEBUG:  building index "float8idx_b" on table "float8tmp" serially
 DROP INDEX float8idx_b;
-RESET client_min_messages;
 SET enable_seqscan=off;
 SELECT count(*) FROM float8tmp WHERE a <  -1890.0::float8;
  count 
diff --git a/contrib/btree_gist/expected/inet.out b/contrib/btree_gist/expected/inet.out
index 0847d3b7d12..5428631d779 100644
--- a/contrib/btree_gist/expected/inet.out
+++ b/contrib/btree_gist/expected/inet.out
@@ -32,14 +32,9 @@ SELECT count(*) FROM inettmp WHERE a >  '89.225.196.191';
    386
 (1 row)
 
-SET client_min_messages = DEBUG1;
 CREATE INDEX inetidx ON inettmp USING gist ( a );
-DEBUG:  building index "inetidx" on table "inettmp" serially
-DEBUG:  using sorted GiST build
 CREATE INDEX inetidx_b ON inettmp USING gist ( a ) WITH (buffering=on);
-DEBUG:  building index "inetidx_b" on table "inettmp" serially
 DROP INDEX inetidx_b;
-RESET client_min_messages;
 SET enable_seqscan=off;
 SELECT count(*) FROM inettmp WHERE a <  '89.225.196.191'::inet;
  count 
diff --git a/contrib/btree_gist/expected/int2.out b/contrib/btree_gist/expected/int2.out
index 9ad06a8dce0..bef4c500752 100644
--- a/contrib/btree_gist/expected/int2.out
+++ b/contrib/btree_gist/expected/int2.out
@@ -40,14 +40,9 @@ SELECT a, a <-> '237' FROM int2tmp ORDER BY a <-> '237' LIMIT 3;
  228 |        9
 (3 rows)
 
-SET client_min_messages = DEBUG1;
 CREATE INDEX int2idx ON int2tmp USING gist ( a );
-DEBUG:  building index "int2idx" on table "int2tmp" serially
-DEBUG:  using sorted GiST build
 CREATE INDEX int2idx_b ON int2tmp USING gist ( a ) WITH (buffering=on);
-DEBUG:  building index "int2idx_b" on table "int2tmp" serially
 DROP INDEX int2idx_b;
-RESET client_min_messages;
 SET enable_seqscan=off;
 SELECT count(*) FROM int2tmp WHERE a <  237::int2;
  count 
diff --git a/contrib/btree_gist/expected/int4.out b/contrib/btree_gist/expected/int4.out
index fdf143f32c3..b930d3ed319 100644
--- a/contrib/btree_gist/expected/int4.out
+++ b/contrib/btree_gist/expected/int4.out
@@ -40,14 +40,9 @@ SELECT a, a <-> '237' FROM int4tmp ORDER BY a <-> '237' LIMIT 3;
  228 |        9
 (3 rows)
 
-SET client_min_messages = DEBUG1;
 CREATE INDEX int4idx ON int4tmp USING gist ( a );
-DEBUG:  building index "int4idx" on table "int4tmp" serially
-DEBUG:  using sorted GiST build
 CREATE INDEX int4idx_b ON int4tmp USING gist ( a ) WITH (buffering=on);
-DEBUG:  building index "int4idx_b" on table "int4tmp" serially
 DROP INDEX int4idx_b;
-RESET client_min_messages;
 SET enable_seqscan=off;
 SELECT count(*) FROM int4tmp WHERE a <  237::int4;
  count 
diff --git a/contrib/btree_gist/expected/int8.out b/contrib/btree_gist/expected/int8.out
index 532c4e5e704..0c4961e702c 100644
--- a/contrib/btree_gist/expected/int8.out
+++ b/contrib/btree_gist/expected/int8.out
@@ -40,14 +40,9 @@ SELECT a, a <-> '464571291354841' FROM int8tmp ORDER BY a <-> '464571291354841'
  478227196042750 | 13655904687909
 (3 rows)
 
-SET client_min_messages = DEBUG1;
 CREATE INDEX int8idx ON int8tmp USING gist ( a );
-DEBUG:  building index "int8idx" on table "int8tmp" serially
-DEBUG:  using sorted GiST build
 CREATE INDEX int8idx_b ON int8tmp USING gist ( a ) WITH (buffering=on);
-DEBUG:  building index "int8idx_b" on table "int8tmp" serially
 DROP INDEX int8idx_b;
-RESET client_min_messages;
 SET enable_seqscan=off;
 SELECT count(*) FROM int8tmp WHERE a <  464571291354841::int8;
  count 
diff --git a/contrib/btree_gist/expected/interval.out b/contrib/btree_gist/expected/interval.out
index 12d50fdf581..7f5bd694eb7 100644
--- a/contrib/btree_gist/expected/interval.out
+++ b/contrib/btree_gist/expected/interval.out
@@ -40,14 +40,9 @@ SELECT a, a <-> '199 days 21:21:23' FROM intervaltmp ORDER BY a <-> '199 days 21
  @ 220 days 19 hours 5 mins 42 secs  | @ 21 days -2 hours -15 mins -41 secs
 (3 rows)
 
-SET client_min_messages = DEBUG1;
 CREATE INDEX intervalidx ON intervaltmp USING gist ( a );
-DEBUG:  building index "intervalidx" on table "intervaltmp" serially
-DEBUG:  using sorted GiST build
 CREATE INDEX intervalidx_b ON intervaltmp USING gist ( a ) WITH (buffering=on);
-DEBUG:  building index "intervalidx_b" on table "intervaltmp" serially
 DROP INDEX intervalidx_b;
-RESET client_min_messages;
 SET enable_seqscan=off;
 SELECT count(*) FROM intervaltmp WHERE a <  '199 days 21:21:23'::interval;
  count 
diff --git a/contrib/btree_gist/expected/macaddr.out b/contrib/btree_gist/expected/macaddr.out
index 9634000618f..0ea068fd4c0 100644
--- a/contrib/btree_gist/expected/macaddr.out
+++ b/contrib/btree_gist/expected/macaddr.out
@@ -32,14 +32,9 @@ SELECT count(*) FROM macaddrtmp WHERE a >  '22:00:5c:e5:9b:0d';
    540
 (1 row)
 
-SET client_min_messages = DEBUG1;
 CREATE INDEX macaddridx ON macaddrtmp USING gist ( a );
-DEBUG:  building index "macaddridx" on table "macaddrtmp" serially
-DEBUG:  using sorted GiST build
 CREATE INDEX macaddridx_b ON macaddrtmp USING gist ( a ) WITH (buffering=on);
-DEBUG:  building index "macaddridx_b" on table "macaddrtmp" serially
 DROP INDEX macaddridx_b;
-RESET client_min_messages;
 SET enable_seqscan=off;
 SELECT count(*) FROM macaddrtmp WHERE a <  '22:00:5c:e5:9b:0d'::macaddr;
  count 
diff --git a/contrib/btree_gist/expected/macaddr8.out b/contrib/btree_gist/expected/macaddr8.out
index 910223cd3b2..c81858df3a1 100644
--- a/contrib/btree_gist/expected/macaddr8.out
+++ b/contrib/btree_gist/expected/macaddr8.out
@@ -32,14 +32,9 @@ SELECT count(*) FROM macaddr8tmp WHERE a >  '22:00:5c:e5:9b:0d';
    540
 (1 row)
 
-SET client_min_messages = DEBUG1;
 CREATE INDEX macaddr8idx ON macaddr8tmp USING gist ( a );
-DEBUG:  building index "macaddr8idx" on table "macaddr8tmp" serially
-DEBUG:  using sorted GiST build
 CREATE INDEX macaddr8idx_b ON macaddr8tmp USING gist ( a ) WITH (buffering=on);
-DEBUG:  building index "macaddr8idx_b" on table "macaddr8tmp" serially
 DROP INDEX macaddr8idx_b;
-RESET client_min_messages;
 SET enable_seqscan=off;
 SELECT count(*) FROM macaddr8tmp WHERE a <  '22:00:5c:e5:9b:0d'::macaddr8;
  count 
diff --git a/contrib/btree_gist/expected/numeric.out b/contrib/btree_gist/expected/numeric.out
index 8dce480c303..36fecadb4f9 100644
--- a/contrib/btree_gist/expected/numeric.out
+++ b/contrib/btree_gist/expected/numeric.out
@@ -94,14 +94,9 @@ SELECT count(*) FROM numerictmp WHERE a >  0 ;
    576
 (1 row)
 
-SET client_min_messages = DEBUG1;
 CREATE INDEX numericidx ON numerictmp USING gist ( a );
-DEBUG:  building index "numericidx" on table "numerictmp" serially
-DEBUG:  using sorted GiST build
 CREATE INDEX numericidx_b ON numerictmp USING gist ( a ) WITH (buffering=on);
-DEBUG:  building index "numericidx_b" on table "numerictmp" serially
 DROP INDEX numericidx_b;
-RESET client_min_messages;
 SET enable_seqscan=off;
 SELECT count(*) FROM numerictmp WHERE a <  -1890.0;
  count 
diff --git a/contrib/btree_gist/expected/oid.out b/contrib/btree_gist/expected/oid.out
index da27172609b..5cd54aba7f8 100644
--- a/contrib/btree_gist/expected/oid.out
+++ b/contrib/btree_gist/expected/oid.out
@@ -32,14 +32,9 @@ SELECT count(*) FROM oidtmp WHERE oid >  17;
    983
 (1 row)
 
-SET client_min_messages = DEBUG1;
 CREATE INDEX oididx ON oidtmp USING gist ( oid );
-DEBUG:  building index "oididx" on table "oidtmp" serially
-DEBUG:  using sorted GiST build
 CREATE INDEX oididx_b ON oidtmp USING gist ( oid ) WITH (buffering=on);
-DEBUG:  building index "oididx_b" on table "oidtmp" serially
 DROP INDEX oididx_b;
-RESET client_min_messages;
 SET enable_seqscan=off;
 SELECT count(*) FROM oidtmp WHERE oid <  17;
  count 
diff --git a/contrib/btree_gist/expected/text.out b/contrib/btree_gist/expected/text.out
index 2e760d14871..be9553c0360 100644
--- a/contrib/btree_gist/expected/text.out
+++ b/contrib/btree_gist/expected/text.out
@@ -33,14 +33,9 @@ SELECT count(*) FROM texttmp WHERE a >   '31b0';
    400
 (1 row)
 
-SET client_min_messages = DEBUG1;
 CREATE INDEX textidx ON texttmp USING GIST ( a );
-DEBUG:  building index "textidx" on table "texttmp" serially
-DEBUG:  using sorted GiST build
 CREATE INDEX textidx_b ON texttmp USING GIST ( a ) WITH (buffering=on);
-DEBUG:  building index "textidx_b" on table "texttmp" serially
 DROP INDEX textidx_b;
-RESET client_min_messages;
 SET enable_seqscan=off;
 SELECT count(*) FROM texttmp WHERE a <   '31b0'::text;
  count 
diff --git a/contrib/btree_gist/expected/time.out b/contrib/btree_gist/expected/time.out
index 9b81e58ed4d..68afe764f13 100644
--- a/contrib/btree_gist/expected/time.out
+++ b/contrib/btree_gist/expected/time.out
@@ -40,14 +40,9 @@ SELECT a, a <-> '10:57:11' FROM timetmp ORDER BY a <-> '10:57:11' LIMIT 3;
  10:55:32 | @ 1 min 39 secs
 (3 rows)
 
-SET client_min_messages = DEBUG1;
 CREATE INDEX timeidx ON timetmp USING gist ( a );
-DEBUG:  building index "timeidx" on table "timetmp" serially
-DEBUG:  using sorted GiST build
 CREATE INDEX timeidx_b ON timetmp USING gist ( a ) WITH (buffering=on);
-DEBUG:  building index "timeidx_b" on table "timetmp" serially
 DROP INDEX timeidx_b;
-RESET client_min_messages;
 SET enable_seqscan=off;
 SELECT count(*) FROM timetmp WHERE a <  '10:57:11'::time;
  count 
diff --git a/contrib/btree_gist/expected/timestamp.out b/contrib/btree_gist/expected/timestamp.out
index 8ea9897551c..a6bf88bede7 100644
--- a/contrib/btree_gist/expected/timestamp.out
+++ b/contrib/btree_gist/expected/timestamp.out
@@ -40,14 +40,9 @@ SELECT a, a <-> '2004-10-26 08:55:08' FROM timestamptmp ORDER BY a <-> '2004-10-
  Mon Nov 29 20:12:43 2004 | @ 34 days 11 hours 17 mins 35 secs
 (3 rows)
 
-SET client_min_messages = DEBUG1;
 CREATE INDEX timestampidx ON timestamptmp USING gist ( a );
-DEBUG:  building index "timestampidx" on table "timestamptmp" serially
-DEBUG:  using sorted GiST build
 CREATE INDEX timestampidx_b ON timestamptmp USING gist ( a ) WITH (buffering=on);
-DEBUG:  building index "timestampidx_b" on table "timestamptmp" serially
 DROP INDEX timestampidx_b;
-RESET client_min_messages;
 SET enable_seqscan=off;
 SELECT count(*) FROM timestamptmp WHERE a <  '2004-10-26 08:55:08'::timestamp;
  count 
diff --git a/contrib/btree_gist/expected/timestamptz.out b/contrib/btree_gist/expected/timestamptz.out
index 2ba0dcd7ede..ade4ddd885d 100644
--- a/contrib/btree_gist/expected/timestamptz.out
+++ b/contrib/btree_gist/expected/timestamptz.out
@@ -100,14 +100,9 @@ SELECT a, a <-> '2018-12-18 10:59:54 GMT+2' FROM timestamptztmp ORDER BY a <-> '
  Thu Jan 24 12:28:12 2019 PST | @ 37 days 7 hours 28 mins 18 secs
 (3 rows)
 
-SET client_min_messages = DEBUG1;
 CREATE INDEX timestamptzidx ON timestamptztmp USING gist ( a );
-DEBUG:  building index "timestamptzidx" on table "timestamptztmp" serially
-DEBUG:  using sorted GiST build
 CREATE INDEX timestamptzidx_b ON timestamptztmp USING gist ( a ) WITH (buffering=on);
-DEBUG:  building index "timestamptzidx_b" on table "timestamptztmp" serially
 DROP INDEX timestamptzidx_b;
-RESET client_min_messages;
 SET enable_seqscan=off;
 SELECT count(*) FROM timestamptztmp WHERE a <  '2018-12-18 10:59:54 GMT+3'::timestamptz;
  count 
diff --git a/contrib/btree_gist/expected/timetz.out b/contrib/btree_gist/expected/timetz.out
index 6c855bfcd64..259dc12b7f2 100644
--- a/contrib/btree_gist/expected/timetz.out
+++ b/contrib/btree_gist/expected/timetz.out
@@ -18,14 +18,9 @@ INSERT INTO timetzcmp (r_id,a) SELECT 22,count(*) FROM timetztmp WHERE a <= '07:
 INSERT INTO timetzcmp (r_id,a) SELECT 23,count(*) FROM timetztmp WHERE a  = '07:46:45 GMT+4';
 INSERT INTO timetzcmp (r_id,a) SELECT 24,count(*) FROM timetztmp WHERE a >= '07:46:45 GMT+4';
 INSERT INTO timetzcmp (r_id,a) SELECT 25,count(*) FROM timetztmp WHERE a >  '07:46:45 GMT+4';
-SET client_min_messages = DEBUG1;
 CREATE INDEX timetzidx ON timetztmp USING gist ( a );
-DEBUG:  building index "timetzidx" on table "timetztmp" serially
-DEBUG:  using sorted GiST build
 CREATE INDEX timetzidx_b ON timetztmp USING gist ( a ) WITH (buffering=on);
-DEBUG:  building index "timetzidx_b" on table "timetztmp" serially
 DROP INDEX timetzidx_b;
-RESET client_min_messages;
 SET enable_seqscan=off;
 UPDATE timetzcmp SET b=c FROM ( SELECT count(*) AS c FROM timetztmp WHERE a <  '07:46:45 GMT+3'::timetz ) q WHERE r_id=1 ;
 UPDATE timetzcmp SET b=c FROM ( SELECT count(*) AS c FROM timetztmp WHERE a <= '07:46:45 GMT+3'::timetz ) q WHERE r_id=2 ;
diff --git a/contrib/btree_gist/expected/uuid.out b/contrib/btree_gist/expected/uuid.out
index 0f0f2960392..3e78dca1e8a 100644
--- a/contrib/btree_gist/expected/uuid.out
+++ b/contrib/btree_gist/expected/uuid.out
@@ -32,14 +32,9 @@ SELECT count(*) FROM uuidtmp WHERE a >  '55e65ca2-4136-4a4b-ba78-cd3fe4678203';
    375
 (1 row)
 
-SET client_min_messages = DEBUG1;
 CREATE INDEX uuididx ON uuidtmp USING gist ( a );
-DEBUG:  building index "uuididx" on table "uuidtmp" serially
-DEBUG:  using sorted GiST build
 CREATE INDEX uuididx_b ON uuidtmp USING gist ( a ) WITH (buffering=on);
-DEBUG:  building index "uuididx_b" on table "uuidtmp" serially
 DROP INDEX uuididx_b;
-RESET client_min_messages;
 SET enable_seqscan=off;
 SELECT count(*) FROM uuidtmp WHERE a <  '55e65ca2-4136-4a4b-ba78-cd3fe4678203'::uuid;
  count 
diff --git a/contrib/btree_gist/expected/varbit.out b/contrib/btree_gist/expected/varbit.out
index 9cd41f4c9aa..867572df3d5 100644
--- a/contrib/btree_gist/expected/varbit.out
+++ b/contrib/btree_gist/expected/varbit.out
@@ -32,14 +32,9 @@ SELECT count(*) FROM varbittmp WHERE a >   '1110100111010';
     50
 (1 row)
 
-SET client_min_messages = DEBUG1;
 CREATE INDEX varbitidx ON varbittmp USING GIST ( a );
-DEBUG:  building index "varbitidx" on table "varbittmp" serially
-DEBUG:  using sorted GiST build
 CREATE INDEX varbitidx_b ON varbittmp USING GIST ( a ) WITH (buffering=on);
-DEBUG:  building index "varbitidx_b" on table "varbittmp" serially
 DROP INDEX varbitidx_b;
-RESET client_min_messages;
 SET enable_seqscan=off;
 SELECT count(*) FROM varbittmp WHERE a <   '1110100111010'::varbit;
  count 
diff --git a/contrib/btree_gist/expected/varchar.out b/contrib/btree_gist/expected/varchar.out
index 0520eb47315..ba8aa3f2bd7 100644
--- a/contrib/btree_gist/expected/varchar.out
+++ b/contrib/btree_gist/expected/varchar.out
@@ -32,14 +32,9 @@ SELECT count(*) FROM vchartmp WHERE a >   '31b0'::varchar(32);
    400
 (1 row)
 
-SET client_min_messages = DEBUG1;
 CREATE INDEX vcharidx ON vchartmp USING GIST ( text(a) );
-DEBUG:  building index "vcharidx" on table "vchartmp" serially
-DEBUG:  using sorted GiST build
 CREATE INDEX vcharidx_b ON vchartmp USING GIST ( text(a) ) WITH (buffering=on);
-DEBUG:  building index "vcharidx_b" on table "vchartmp" serially
 DROP INDEX vcharidx_b;
-RESET client_min_messages;
 SET enable_seqscan=off;
 SELECT count(*) FROM vchartmp WHERE a <   '31b0'::varchar(32);
  count 
diff --git a/contrib/btree_gist/sql/bit.sql b/contrib/btree_gist/sql/bit.sql
index 53c67cf77ac..e214efc36ec 100644
--- a/contrib/btree_gist/sql/bit.sql
+++ b/contrib/btree_gist/sql/bit.sql
@@ -16,11 +16,9 @@ SELECT count(*) FROM bittmp WHERE a >=  '011011000100010111011000110000100';
 
 SELECT count(*) FROM bittmp WHERE a >   '011011000100010111011000110000100';
 
-SET client_min_messages = DEBUG1;
 CREATE INDEX bitidx ON bittmp USING GIST ( a );
 CREATE INDEX bitidx_b ON bittmp USING GIST ( a ) WITH (buffering=on);
 DROP INDEX bitidx_b;
-RESET client_min_messages;
 
 SET enable_seqscan=off;
 
diff --git a/contrib/btree_gist/sql/bool.sql b/contrib/btree_gist/sql/bool.sql
index 1a215abee1f..0ea88edf7d4 100644
--- a/contrib/btree_gist/sql/bool.sql
+++ b/contrib/btree_gist/sql/bool.sql
@@ -16,11 +16,9 @@ SELECT count(*) FROM booltmp WHERE a >= true;
 
 SELECT count(*) FROM booltmp WHERE a >  true;
 
-SET client_min_messages = DEBUG1;
 CREATE INDEX boolidx ON booltmp USING gist ( a );
 CREATE INDEX boolidx_b ON booltmp USING gist ( a ) WITH (buffering=on);
 DROP INDEX boolidx_b;
-RESET client_min_messages;
 
 SET enable_seqscan=off;
 
diff --git a/contrib/btree_gist/sql/bytea.sql b/contrib/btree_gist/sql/bytea.sql
index fdfa0c345bd..233adccba93 100644
--- a/contrib/btree_gist/sql/bytea.sql
+++ b/contrib/btree_gist/sql/bytea.sql
@@ -17,11 +17,9 @@ SELECT count(*) FROM byteatmp WHERE a >=  '31b0';
 
 SELECT count(*) FROM byteatmp WHERE a >   '31b0';
 
-SET client_min_messages = DEBUG1;
 CREATE INDEX byteaidx ON byteatmp USING GIST ( a );
 CREATE INDEX byteaidx_b ON byteatmp USING GIST ( a ) WITH (buffering=on);
 DROP INDEX byteaidx_b;
-RESET client_min_messages;
 
 SET enable_seqscan=off;
 
diff --git a/contrib/btree_gist/sql/cash.sql b/contrib/btree_gist/sql/cash.sql
index 0581b3593ef..b1a66eba6c8 100644
--- a/contrib/btree_gist/sql/cash.sql
+++ b/contrib/btree_gist/sql/cash.sql
@@ -18,11 +18,9 @@ SELECT count(*) FROM moneytmp WHERE a >  '22649.64';
 
 SELECT a, a <-> '21472.79' FROM moneytmp ORDER BY a <-> '21472.79' LIMIT 3;
 
-SET client_min_messages = DEBUG1;
 CREATE INDEX moneyidx ON moneytmp USING gist ( a );
 CREATE INDEX moneyidx_b ON moneytmp USING gist ( a ) WITH (buffering=on);
 DROP INDEX moneyidx_b;
-RESET client_min_messages;
 
 SET enable_seqscan=off;
 
diff --git a/contrib/btree_gist/sql/char.sql b/contrib/btree_gist/sql/char.sql
index 234eabee3b8..3bf954bb53d 100644
--- a/contrib/btree_gist/sql/char.sql
+++ b/contrib/btree_gist/sql/char.sql
@@ -16,11 +16,9 @@ SELECT count(*) FROM chartmp WHERE a >=  '31b0'::char(32);
 
 SELECT count(*) FROM chartmp WHERE a >   '31b0'::char(32);
 
-SET client_min_messages = DEBUG1;
 CREATE INDEX charidx ON chartmp USING GIST ( a );
 CREATE INDEX charidx_b ON chartmp USING GIST ( a ) WITH (buffering=on);
 DROP INDEX charidx_b;
-RESET client_min_messages;
 
 SET enable_seqscan=off;
 
diff --git a/contrib/btree_gist/sql/cidr.sql b/contrib/btree_gist/sql/cidr.sql
index be2d22b079a..9d753cc3adb 100644
--- a/contrib/btree_gist/sql/cidr.sql
+++ b/contrib/btree_gist/sql/cidr.sql
@@ -15,11 +15,9 @@ SELECT count(*) FROM cidrtmp WHERE a >= '121.111.63.82';
 
 SELECT count(*) FROM cidrtmp WHERE a >  '121.111.63.82';
 
-SET client_min_messages = DEBUG1;
 CREATE INDEX cidridx ON cidrtmp USING gist ( a );
 CREATE INDEX cidridx_b ON cidrtmp USING gist ( a ) WITH (buffering=on);
 DROP INDEX cidridx_b;
-RESET client_min_messages;
 
 SET enable_seqscan=off;
 
diff --git a/contrib/btree_gist/sql/date.sql b/contrib/btree_gist/sql/date.sql
index f007402bacc..e988313f509 100644
--- a/contrib/btree_gist/sql/date.sql
+++ b/contrib/btree_gist/sql/date.sql
@@ -18,11 +18,9 @@ SELECT count(*) FROM datetmp WHERE a >  '2001-02-13';
 
 SELECT a, a <-> '2001-02-13' FROM datetmp ORDER BY a <-> '2001-02-13' LIMIT 3;
 
-SET client_min_messages = DEBUG1;
 CREATE INDEX dateidx ON datetmp USING gist ( a );
 CREATE INDEX dateidx_b ON datetmp USING gist ( a ) WITH (buffering=on);
 DROP INDEX dateidx_b;
-RESET client_min_messages;
 
 SET enable_seqscan=off;
 
diff --git a/contrib/btree_gist/sql/enum.sql b/contrib/btree_gist/sql/enum.sql
index d6dbcb42392..b4f23996017 100644
--- a/contrib/btree_gist/sql/enum.sql
+++ b/contrib/btree_gist/sql/enum.sql
@@ -20,11 +20,9 @@ SELECT count(*) FROM enumtmp WHERE a >= 'g'::rainbow;
 
 SELECT count(*) FROM enumtmp WHERE a >  'g'::rainbow;
 
-SET client_min_messages = DEBUG1;
 CREATE INDEX enumidx ON enumtmp USING gist ( a );
 CREATE INDEX enumidx_b ON enumtmp USING gist ( a ) WITH (buffering=on);
 DROP INDEX enumidx_b;
-RESET client_min_messages;
 
 SET enable_seqscan=off;
 
diff --git a/contrib/btree_gist/sql/float4.sql b/contrib/btree_gist/sql/float4.sql
index 0e3eb49343f..0b6b4b19ceb 100644
--- a/contrib/btree_gist/sql/float4.sql
+++ b/contrib/btree_gist/sql/float4.sql
@@ -18,11 +18,9 @@ SELECT count(*) FROM float4tmp WHERE a >  -179.0;
 
 SELECT a, a <-> '-179.0' FROM float4tmp ORDER BY a <-> '-179.0' LIMIT 3;
 
-SET client_min_messages = DEBUG1;
 CREATE INDEX float4idx ON float4tmp USING gist ( a );
 CREATE INDEX float4idx_b ON float4tmp USING gist ( a ) WITH (buffering=on);
 DROP INDEX float4idx_b;
-RESET client_min_messages;
 
 SET enable_seqscan=off;
 
diff --git a/contrib/btree_gist/sql/float8.sql b/contrib/btree_gist/sql/float8.sql
index 6a216dd6065..e8d173d7260 100644
--- a/contrib/btree_gist/sql/float8.sql
+++ b/contrib/btree_gist/sql/float8.sql
@@ -18,11 +18,9 @@ SELECT count(*) FROM float8tmp WHERE a >  -1890.0;
 
 SELECT a, a <-> '-1890.0' FROM float8tmp ORDER BY a <-> '-1890.0' LIMIT 3;
 
-SET client_min_messages = DEBUG1;
 CREATE INDEX float8idx ON float8tmp USING gist ( a );
 CREATE INDEX float8idx_b ON float8tmp USING gist ( a ) WITH (buffering=on);
 DROP INDEX float8idx_b;
-RESET client_min_messages;
 
 SET enable_seqscan=off;
 
diff --git a/contrib/btree_gist/sql/inet.sql b/contrib/btree_gist/sql/inet.sql
index 0339c853d38..a6f3f481787 100644
--- a/contrib/btree_gist/sql/inet.sql
+++ b/contrib/btree_gist/sql/inet.sql
@@ -16,11 +16,9 @@ SELECT count(*) FROM inettmp WHERE a >= '89.225.196.191';
 
 SELECT count(*) FROM inettmp WHERE a >  '89.225.196.191';
 
-SET client_min_messages = DEBUG1;
 CREATE INDEX inetidx ON inettmp USING gist ( a );
 CREATE INDEX inetidx_b ON inettmp USING gist ( a ) WITH (buffering=on);
 DROP INDEX inetidx_b;
-RESET client_min_messages;
 
 SET enable_seqscan=off;
 
diff --git a/contrib/btree_gist/sql/int2.sql b/contrib/btree_gist/sql/int2.sql
index bf98ac65f83..8492d4ab63a 100644
--- a/contrib/btree_gist/sql/int2.sql
+++ b/contrib/btree_gist/sql/int2.sql
@@ -18,11 +18,9 @@ SELECT count(*) FROM int2tmp WHERE a >  237;
 
 SELECT a, a <-> '237' FROM int2tmp ORDER BY a <-> '237' LIMIT 3;
 
-SET client_min_messages = DEBUG1;
 CREATE INDEX int2idx ON int2tmp USING gist ( a );
 CREATE INDEX int2idx_b ON int2tmp USING gist ( a ) WITH (buffering=on);
 DROP INDEX int2idx_b;
-RESET client_min_messages;
 
 SET enable_seqscan=off;
 
diff --git a/contrib/btree_gist/sql/int4.sql b/contrib/btree_gist/sql/int4.sql
index 214993314af..575369e52bf 100644
--- a/contrib/btree_gist/sql/int4.sql
+++ b/contrib/btree_gist/sql/int4.sql
@@ -18,11 +18,9 @@ SELECT count(*) FROM int4tmp WHERE a >  237;
 
 SELECT a, a <-> '237' FROM int4tmp ORDER BY a <-> '237' LIMIT 3;
 
-SET client_min_messages = DEBUG1;
 CREATE INDEX int4idx ON int4tmp USING gist ( a );
 CREATE INDEX int4idx_b ON int4tmp USING gist ( a ) WITH (buffering=on);
 DROP INDEX int4idx_b;
-RESET client_min_messages;
 
 SET enable_seqscan=off;
 
diff --git a/contrib/btree_gist/sql/int8.sql b/contrib/btree_gist/sql/int8.sql
index 8a6c2a4bfd1..574e5fe6dd0 100644
--- a/contrib/btree_gist/sql/int8.sql
+++ b/contrib/btree_gist/sql/int8.sql
@@ -18,11 +18,9 @@ SELECT count(*) FROM int8tmp WHERE a >  464571291354841;
 
 SELECT a, a <-> '464571291354841' FROM int8tmp ORDER BY a <-> '464571291354841' LIMIT 3;
 
-SET client_min_messages = DEBUG1;
 CREATE INDEX int8idx ON int8tmp USING gist ( a );
 CREATE INDEX int8idx_b ON int8tmp USING gist ( a ) WITH (buffering=on);
 DROP INDEX int8idx_b;
-RESET client_min_messages;
 
 SET enable_seqscan=off;
 
diff --git a/contrib/btree_gist/sql/interval.sql b/contrib/btree_gist/sql/interval.sql
index 6f9b1d4a39a..33bd95c4a58 100644
--- a/contrib/btree_gist/sql/interval.sql
+++ b/contrib/btree_gist/sql/interval.sql
@@ -18,11 +18,9 @@ SELECT count(*) FROM intervaltmp WHERE a >  '199 days 21:21:23';
 
 SELECT a, a <-> '199 days 21:21:23' FROM intervaltmp ORDER BY a <-> '199 days 21:21:23' LIMIT 3;
 
-SET client_min_messages = DEBUG1;
 CREATE INDEX intervalidx ON intervaltmp USING gist ( a );
 CREATE INDEX intervalidx_b ON intervaltmp USING gist ( a ) WITH (buffering=on);
 DROP INDEX intervalidx_b;
-RESET client_min_messages;
 
 SET enable_seqscan=off;
 
diff --git a/contrib/btree_gist/sql/macaddr.sql b/contrib/btree_gist/sql/macaddr.sql
index bccfc820ca4..57c24093ece 100644
--- a/contrib/btree_gist/sql/macaddr.sql
+++ b/contrib/btree_gist/sql/macaddr.sql
@@ -16,11 +16,9 @@ SELECT count(*) FROM macaddrtmp WHERE a >= '22:00:5c:e5:9b:0d';
 
 SELECT count(*) FROM macaddrtmp WHERE a >  '22:00:5c:e5:9b:0d';
 
-SET client_min_messages = DEBUG1;
 CREATE INDEX macaddridx ON macaddrtmp USING gist ( a );
 CREATE INDEX macaddridx_b ON macaddrtmp USING gist ( a ) WITH (buffering=on);
 DROP INDEX macaddridx_b;
-RESET client_min_messages;
 
 SET enable_seqscan=off;
 
diff --git a/contrib/btree_gist/sql/macaddr8.sql b/contrib/btree_gist/sql/macaddr8.sql
index 2d0447a777b..0d3c93d4fc2 100644
--- a/contrib/btree_gist/sql/macaddr8.sql
+++ b/contrib/btree_gist/sql/macaddr8.sql
@@ -16,11 +16,9 @@ SELECT count(*) FROM macaddr8tmp WHERE a >= '22:00:5c:e5:9b:0d';
 
 SELECT count(*) FROM macaddr8tmp WHERE a >  '22:00:5c:e5:9b:0d';
 
-SET client_min_messages = DEBUG1;
 CREATE INDEX macaddr8idx ON macaddr8tmp USING gist ( a );
 CREATE INDEX macaddr8idx_b ON macaddr8tmp USING gist ( a ) WITH (buffering=on);
 DROP INDEX macaddr8idx_b;
-RESET client_min_messages;
 
 SET enable_seqscan=off;
 
diff --git a/contrib/btree_gist/sql/numeric.sql b/contrib/btree_gist/sql/numeric.sql
index 55ecbcdadc5..12f7425f679 100644
--- a/contrib/btree_gist/sql/numeric.sql
+++ b/contrib/btree_gist/sql/numeric.sql
@@ -40,11 +40,9 @@ SELECT count(*) FROM numerictmp WHERE a >= 0 ;
 SELECT count(*) FROM numerictmp WHERE a >  0 ;
 
 
-SET client_min_messages = DEBUG1;
 CREATE INDEX numericidx ON numerictmp USING gist ( a );
 CREATE INDEX numericidx_b ON numerictmp USING gist ( a ) WITH (buffering=on);
 DROP INDEX numericidx_b;
-RESET client_min_messages;
 
 SET enable_seqscan=off;
 
diff --git a/contrib/btree_gist/sql/oid.sql b/contrib/btree_gist/sql/oid.sql
index bc9ee0cba34..69f7bd74635 100644
--- a/contrib/btree_gist/sql/oid.sql
+++ b/contrib/btree_gist/sql/oid.sql
@@ -15,11 +15,9 @@ SELECT count(*) FROM oidtmp WHERE oid >= 17;
 
 SELECT count(*) FROM oidtmp WHERE oid >  17;
 
-SET client_min_messages = DEBUG1;
 CREATE INDEX oididx ON oidtmp USING gist ( oid );
 CREATE INDEX oididx_b ON oidtmp USING gist ( oid ) WITH (buffering=on);
 DROP INDEX oididx_b;
-RESET client_min_messages;
 
 SET enable_seqscan=off;
 
diff --git a/contrib/btree_gist/sql/text.sql b/contrib/btree_gist/sql/text.sql
index 52705a216d1..2527735509d 100644
--- a/contrib/btree_gist/sql/text.sql
+++ b/contrib/btree_gist/sql/text.sql
@@ -17,11 +17,9 @@ SELECT count(*) FROM texttmp WHERE a >=  '31b0';
 
 SELECT count(*) FROM texttmp WHERE a >   '31b0';
 
-SET client_min_messages = DEBUG1;
 CREATE INDEX textidx ON texttmp USING GIST ( a );
 CREATE INDEX textidx_b ON texttmp USING GIST ( a ) WITH (buffering=on);
 DROP INDEX textidx_b;
-RESET client_min_messages;
 
 SET enable_seqscan=off;
 
diff --git a/contrib/btree_gist/sql/time.sql b/contrib/btree_gist/sql/time.sql
index 61239452131..6300a977b15 100644
--- a/contrib/btree_gist/sql/time.sql
+++ b/contrib/btree_gist/sql/time.sql
@@ -18,11 +18,9 @@ SELECT count(*) FROM timetmp WHERE a >  '10:57:11';
 
 SELECT a, a <-> '10:57:11' FROM timetmp ORDER BY a <-> '10:57:11' LIMIT 3;
 
-SET client_min_messages = DEBUG1;
 CREATE INDEX timeidx ON timetmp USING gist ( a );
 CREATE INDEX timeidx_b ON timetmp USING gist ( a ) WITH (buffering=on);
 DROP INDEX timeidx_b;
-RESET client_min_messages;
 
 SET enable_seqscan=off;
 
diff --git a/contrib/btree_gist/sql/timestamp.sql b/contrib/btree_gist/sql/timestamp.sql
index 66a14f5ae51..6ca72a007a9 100644
--- a/contrib/btree_gist/sql/timestamp.sql
+++ b/contrib/btree_gist/sql/timestamp.sql
@@ -18,11 +18,9 @@ SELECT count(*) FROM timestamptmp WHERE a >  '2004-10-26 08:55:08';
 
 SELECT a, a <-> '2004-10-26 08:55:08' FROM timestamptmp ORDER BY a <-> '2004-10-26 08:55:08' LIMIT 3;
 
-SET client_min_messages = DEBUG1;
 CREATE INDEX timestampidx ON timestamptmp USING gist ( a );
 CREATE INDEX timestampidx_b ON timestamptmp USING gist ( a ) WITH (buffering=on);
 DROP INDEX timestampidx_b;
-RESET client_min_messages;
 
 SET enable_seqscan=off;
 
diff --git a/contrib/btree_gist/sql/timestamptz.sql b/contrib/btree_gist/sql/timestamptz.sql
index 2a92f63fc4a..c154f3d815e 100644
--- a/contrib/btree_gist/sql/timestamptz.sql
+++ b/contrib/btree_gist/sql/timestamptz.sql
@@ -39,11 +39,9 @@ SELECT count(*) FROM timestamptztmp WHERE a >  '2018-12-18 10:59:54 GMT+4';
 
 SELECT a, a <-> '2018-12-18 10:59:54 GMT+2' FROM timestamptztmp ORDER BY a <-> '2018-12-18 10:59:54 GMT+2' LIMIT 3;
 
-SET client_min_messages = DEBUG1;
 CREATE INDEX timestamptzidx ON timestamptztmp USING gist ( a );
 CREATE INDEX timestamptzidx_b ON timestamptztmp USING gist ( a ) WITH (buffering=on);
 DROP INDEX timestamptzidx_b;
-RESET client_min_messages;
 
 SET enable_seqscan=off;
 
diff --git a/contrib/btree_gist/sql/timetz.sql b/contrib/btree_gist/sql/timetz.sql
index bc79d134b8f..6262a133d0e 100644
--- a/contrib/btree_gist/sql/timetz.sql
+++ b/contrib/btree_gist/sql/timetz.sql
@@ -41,12 +41,9 @@ INSERT INTO timetzcmp (r_id,a) SELECT 24,count(*) FROM timetztmp WHERE a >= '07:
 INSERT INTO timetzcmp (r_id,a) SELECT 25,count(*) FROM timetztmp WHERE a >  '07:46:45 GMT+4';
 
 
-
-SET client_min_messages = DEBUG1;
 CREATE INDEX timetzidx ON timetztmp USING gist ( a );
 CREATE INDEX timetzidx_b ON timetztmp USING gist ( a ) WITH (buffering=on);
 DROP INDEX timetzidx_b;
-RESET client_min_messages;
 
 SET enable_seqscan=off;
 
diff --git a/contrib/btree_gist/sql/uuid.sql b/contrib/btree_gist/sql/uuid.sql
index 7771bc0d828..c140a3a0cc6 100644
--- a/contrib/btree_gist/sql/uuid.sql
+++ b/contrib/btree_gist/sql/uuid.sql
@@ -16,11 +16,9 @@ SELECT count(*) FROM uuidtmp WHERE a >= '55e65ca2-4136-4a4b-ba78-cd3fe4678203';
 
 SELECT count(*) FROM uuidtmp WHERE a >  '55e65ca2-4136-4a4b-ba78-cd3fe4678203';
 
-SET client_min_messages = DEBUG1;
 CREATE INDEX uuididx ON uuidtmp USING gist ( a );
 CREATE INDEX uuididx_b ON uuidtmp USING gist ( a ) WITH (buffering=on);
 DROP INDEX uuididx_b;
-RESET client_min_messages;
 
 SET enable_seqscan=off;
 
diff --git a/contrib/btree_gist/sql/varbit.sql b/contrib/btree_gist/sql/varbit.sql
index 6d8243572bf..6f001d37621 100644
--- a/contrib/btree_gist/sql/varbit.sql
+++ b/contrib/btree_gist/sql/varbit.sql
@@ -16,11 +16,9 @@ SELECT count(*) FROM varbittmp WHERE a >=  '1110100111010';
 
 SELECT count(*) FROM varbittmp WHERE a >   '1110100111010';
 
-SET client_min_messages = DEBUG1;
 CREATE INDEX varbitidx ON varbittmp USING GIST ( a );
 CREATE INDEX varbitidx_b ON varbittmp USING GIST ( a ) WITH (buffering=on);
 DROP INDEX varbitidx_b;
-RESET client_min_messages;
 
 SET enable_seqscan=off;
 
diff --git a/contrib/btree_gist/sql/varchar.sql b/contrib/btree_gist/sql/varchar.sql
index 59b77e0983c..608581ace5a 100644
--- a/contrib/btree_gist/sql/varchar.sql
+++ b/contrib/btree_gist/sql/varchar.sql
@@ -16,11 +16,9 @@ SELECT count(*) FROM vchartmp WHERE a >=  '31b0'::varchar(32);
 
 SELECT count(*) FROM vchartmp WHERE a >   '31b0'::varchar(32);
 
-SET client_min_messages = DEBUG1;
 CREATE INDEX vcharidx ON vchartmp USING GIST ( text(a) );
 CREATE INDEX vcharidx_b ON vchartmp USING GIST ( text(a) ) WITH (buffering=on);
 DROP INDEX vcharidx_b;
-RESET client_min_messages;
 
 SET enable_seqscan=off;
 
-- 
2.33.1