PostgreSQL Patch Tester

diff -U3 /tmp/cirrus-ci-build/src/test/isolation/expected/inherit-temp.out /tmp/cirrus-ci-build/build/testrun/isolation/...
--- /tmp/cirrus-ci-build/src/test/isolation/expected/inherit-temp.out	2024-11-23 23:59:10.205453000 +0000
+++ /tmp/cirrus-ci-build/build/testrun/isolation/isolation/results/inherit-temp.out	2024-11-24 00:00:24.941900000 +0000
@@ -5,14 +5,7 @@
 step s1_insert_c: INSERT INTO inh_temp_child_s1 VALUES (3), (4);
 step s2_insert_c: INSERT INTO inh_temp_child_s2 VALUES (5), (6);
 step s1_select_p: SELECT a FROM inh_parent;
-a
--
-1
-2
-3
-4
-(4 rows)
-
+ERROR:  cannot access temporary tables of other sessions
 step s1_select_c: SELECT a FROM inh_temp_child_s1;
 a
 -
@@ -21,14 +14,7 @@
...

diff -U3 /tmp/cirrus-ci-build/src/test/isolation/expected/inherit-temp.out /tmp/cirrus-ci-build/src/test/isolation/outpu...
--- /tmp/cirrus-ci-build/src/test/isolation/expected/inherit-temp.out	2024-11-23 23:59:05.755920613 +0000
+++ /tmp/cirrus-ci-build/src/test/isolation/output_iso/results/inherit-temp.out	2024-11-24 00:01:21.883045405 +0000
@@ -5,14 +5,7 @@
 step s1_insert_c: INSERT INTO inh_temp_child_s1 VALUES (3), (4);
 step s2_insert_c: INSERT INTO inh_temp_child_s2 VALUES (5), (6);
 step s1_select_p: SELECT a FROM inh_parent;
-a
--
-1
-2
-3
-4
-(4 rows)
-
+ERROR:  cannot access temporary tables of other sessions
 step s1_select_c: SELECT a FROM inh_temp_child_s1;
 a
 -
@@ -21,14 +14,7 @@
...

diff -U3 /tmp/cirrus-ci-build/src/test/isolation/expected/inherit-temp.out /tmp/cirrus-ci-build/build/testrun/isolation/...
--- /tmp/cirrus-ci-build/src/test/isolation/expected/inherit-temp.out	2024-11-23 23:59:06.793780442 +0000
+++ /tmp/cirrus-ci-build/build/testrun/isolation/isolation/results/inherit-temp.out	2024-11-24 00:00:49.656959211 +0000
@@ -5,14 +5,7 @@
 step s1_insert_c: INSERT INTO inh_temp_child_s1 VALUES (3), (4);
 step s2_insert_c: INSERT INTO inh_temp_child_s2 VALUES (5), (6);
 step s1_select_p: SELECT a FROM inh_parent;
-a
--
-1
-2
-3
-4
-(4 rows)
-
+ERROR:  cannot access temporary tables of other sessions
 step s1_select_c: SELECT a FROM inh_temp_child_s1;
 a
 -
@@ -21,14 +14,7 @@
...

diff -U3 /Users/admin/pgsql/src/test/isolation/expected/inherit-temp.out /Users/admin/pgsql/build/testrun/isolation/isol...
--- /Users/admin/pgsql/src/test/isolation/expected/inherit-temp.out	2024-11-23 23:58:11
+++ /Users/admin/pgsql/build/testrun/isolation/isolation/results/inherit-temp.out	2024-11-23 23:59:51
@@ -5,14 +5,7 @@
 step s1_insert_c: INSERT INTO inh_temp_child_s1 VALUES (3), (4);
 step s2_insert_c: INSERT INTO inh_temp_child_s2 VALUES (5), (6);
 step s1_select_p: SELECT a FROM inh_parent;
-a
--
-1
-2
-3
-4
-(4 rows)
-
+ERROR:  cannot access temporary tables of other sessions
 step s1_select_c: SELECT a FROM inh_temp_child_s1;
 a
 -
@@ -21,14 +14,7 @@
...

diff --strip-trailing-cr -U3 C:/cirrus/src/test/isolation/expected/inherit-temp.out C:/cirrus/build/testrun/isolation/is...
--- C:/cirrus/src/test/isolation/expected/inherit-temp.out	2024-11-23 23:59:18.841260700 +0000
+++ C:/cirrus/build/testrun/isolation/isolation/results/inherit-temp.out	2024-11-24 00:02:10.866734400 +0000
@@ -5,14 +5,7 @@
 step s1_insert_c: INSERT INTO inh_temp_child_s1 VALUES (3), (4);
 step s2_insert_c: INSERT INTO inh_temp_child_s2 VALUES (5), (6);
 step s1_select_p: SELECT a FROM inh_parent;
-a
--
-1
-2
-3
-4
-(4 rows)
-
+ERROR:  cannot access temporary tables of other sessions
 step s1_select_c: SELECT a FROM inh_temp_child_s1;
 a
 -
@@ -21,14 +14,7 @@
...

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/join.out /tmp/cirrus-ci-build/build/testrun/recovery/027_stream_...
--- /tmp/cirrus-ci-build/src/test/regress/expected/join.out	2024-11-23 21:11:10.082160000 +0000
+++ /tmp/cirrus-ci-build/build/testrun/recovery/027_stream_regress/data/results/join.out	2024-11-23 21:14:00.671270000 +...
@@ -2225,11 +2225,10 @@
 select count(*) from tenk1 a where unique1 in
   (select unique1 from tenk1 b join tenk1 c using (unique1)
    where b.unique2 = 42);
- count 
--------
-     1
-(1 row)
-
+ERROR:  deadlock detected
+DETAIL:  Process 17307 waits for AccessShareLock on relation 25142 of database 16384; blocked by process 17315.
+Process 17315 waits for AccessExclusiveLock on relation 16418 of database 16384; blocked by process 17307.
+HINT:  See server log for query details.
 --
 -- regression test: check for failure to generate a plan with multiple
 -- degenerate IN clauses

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/arrays.out /tmp/cirrus-ci-build/src/bin/pg_upgrade/tmp_check/res...
--- /tmp/cirrus-ci-build/src/test/regress/expected/arrays.out	2024-11-23 21:11:02.846240593 +0000
+++ /tmp/cirrus-ci-build/src/bin/pg_upgrade/tmp_check/results/arrays.out	2024-11-23 21:18:05.141664267 +0000
@@ -2239,11 +2239,10 @@
 (1 row)
 
 select array_agg(nullif(ten, 4)) from (select ten from tenk1 where unique1 < 15 order by unique1) ss;
-               array_agg               
----------------------------------------
- {0,1,2,3,NULL,5,6,7,8,9,0,1,2,3,NULL}
-(1 row)
-
+ERROR:  deadlock detected
+DETAIL:  Process 44443 waits for AccessShareLock on relation 25169 of database 16387; blocked by process 44438.
+Process 44438 waits for AccessExclusiveLock on relation 16421 of database 16387; blocked by process 44443.
+HINT:  See server log for query details.
 select array_agg(unique1) from tenk1 where unique1 < -15;
  array_agg 
 -----------

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/brin.out /tmp/cirrus-ci-build/build/testrun/pg_upgrade/002_pg_up...
--- /tmp/cirrus-ci-build/src/test/regress/expected/brin.out	2024-11-23 20:50:02.935408000 +0000
+++ /tmp/cirrus-ci-build/build/testrun/pg_upgrade/002_pg_upgrade/data/results/brin.out	2024-11-23 20:52:07.249503000 +00...
@@ -588,4 +588,10 @@
 CREATE INDEX brin_insert_optimization_idx ON brin_insert_optimization USING brin (a);
 UPDATE brin_insert_optimization SET a = a;
 REINDEX INDEX CONCURRENTLY brin_insert_optimization_idx;
-DROP TABLE brin_insert_optimization;
+WARNING:  terminating connection because of crash of another server process
+DETAIL:  The postmaster has commanded this server process to roll back the current transaction and exit, because anothe...
+HINT:  In a moment you should be able to reconnect to the database and repeat your command.
+server closed the connection unexpectedly
+	This probably means the server terminated abnormally
+	before or while processing the request.
+connection to server was lost
diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/privileges.out /tmp/cirrus-ci-build/build/testrun/pg_upgrade/002...
--- /tmp/cirrus-ci-build/src/test/regress/expected/privileges.out	2024-11-23 20:50:02.991511000 +0000
+++ /tmp/cirrus-ci-build/build/testrun/pg_upgrade/002_pg_upgrade/data/results/privileges.out	2024-11-23 20:52:07.2492300...
@@ -1846,1413 +1846,10 @@
 REINDEX TABLE sro_tab;
...

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/brin.out /tmp/cirrus-ci-build/build/testrun/recovery/027_stream_...
--- /tmp/cirrus-ci-build/src/test/regress/expected/brin.out	2024-11-23 20:50:02.935408000 +0000
+++ /tmp/cirrus-ci-build/build/testrun/recovery/027_stream_regress/data/results/brin.out	2024-11-23 20:52:45.510139000 +...
@@ -539,53 +539,10 @@
 -- vacuum actually removes the TOAST rows. Creating an index concurrently
 -- is a one way to achieve that, because it does exactly such wait.
 CREATE INDEX CONCURRENTLY brin_test_temp_idx ON brintest_3(a);
-DROP INDEX brin_test_temp_idx;
--- vacuum the table, to discard TOAST data
-VACUUM brintest_3;
--- retry insert with a different random-looking (but deterministic) value
--- the value is different, and so should replace either min or max in the
--- brin summary
-WITH rand_value AS (SELECT string_agg(fipshash((-i)::text),'') AS val FROM generate_series(1,60) s(i))
-INSERT INTO brintest_3
-SELECT val, val, val, val FROM rand_value;
--- now try some queries, accessing the brin index
-SET enable_seqscan = off;
-EXPLAIN (COSTS OFF)
-SELECT * FROM brintest_3 WHERE b < '0';
...

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/brin.out /tmp/cirrus-ci-build/build/testrun/regress/regress/resu...
--- /tmp/cirrus-ci-build/src/test/regress/expected/brin.out	2024-11-23 20:50:02.935408000 +0000
+++ /tmp/cirrus-ci-build/build/testrun/regress/regress/results/brin.out	2024-11-23 20:52:06.023455000 +0000
@@ -588,4 +588,10 @@
 CREATE INDEX brin_insert_optimization_idx ON brin_insert_optimization USING brin (a);
 UPDATE brin_insert_optimization SET a = a;
 REINDEX INDEX CONCURRENTLY brin_insert_optimization_idx;
-DROP TABLE brin_insert_optimization;
+WARNING:  terminating connection because of crash of another server process
+DETAIL:  The postmaster has commanded this server process to roll back the current transaction and exit, because anothe...
+HINT:  In a moment you should be able to reconnect to the database and repeat your command.
+server closed the connection unexpectedly
+	This probably means the server terminated abnormally
+	before or while processing the request.
+connection to server was lost
diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/privileges.out /tmp/cirrus-ci-build/build/testrun/regress/regres...
--- /tmp/cirrus-ci-build/src/test/regress/expected/privileges.out	2024-11-23 20:50:02.991511000 +0000
+++ /tmp/cirrus-ci-build/build/testrun/regress/regress/results/privileges.out	2024-11-23 20:52:06.023912000 +0000
@@ -1842,1417 +1842,10 @@
 -- Do the same concurrently
...

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/brin.out /tmp/cirrus-ci-build/src/bin/pg_upgrade/tmp_check/resul...
--- /tmp/cirrus-ci-build/src/test/regress/expected/brin.out	2024-11-23 20:50:05.074490527 +0000
+++ /tmp/cirrus-ci-build/src/bin/pg_upgrade/tmp_check/results/brin.out	2024-11-23 20:56:33.318201844 +0000
@@ -539,53 +539,10 @@
 -- vacuum actually removes the TOAST rows. Creating an index concurrently
 -- is a one way to achieve that, because it does exactly such wait.
 CREATE INDEX CONCURRENTLY brin_test_temp_idx ON brintest_3(a);
-DROP INDEX brin_test_temp_idx;
--- vacuum the table, to discard TOAST data
-VACUUM brintest_3;
--- retry insert with a different random-looking (but deterministic) value
--- the value is different, and so should replace either min or max in the
--- brin summary
-WITH rand_value AS (SELECT string_agg(fipshash((-i)::text),'') AS val FROM generate_series(1,60) s(i))
-INSERT INTO brintest_3
-SELECT val, val, val, val FROM rand_value;
--- now try some queries, accessing the brin index
-SET enable_seqscan = off;
-EXPLAIN (COSTS OFF)
-SELECT * FROM brintest_3 WHERE b < '0';
...

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/brin.out /tmp/cirrus-ci-build/src/test/regress/results/brin.out
--- /tmp/cirrus-ci-build/src/test/regress/expected/brin.out	2024-11-23 20:50:05.074490527 +0000
+++ /tmp/cirrus-ci-build/src/test/regress/results/brin.out	2024-11-23 20:54:33.858289851 +0000
@@ -539,53 +539,10 @@
 -- vacuum actually removes the TOAST rows. Creating an index concurrently
 -- is a one way to achieve that, because it does exactly such wait.
 CREATE INDEX CONCURRENTLY brin_test_temp_idx ON brintest_3(a);
-DROP INDEX brin_test_temp_idx;
--- vacuum the table, to discard TOAST data
-VACUUM brintest_3;
--- retry insert with a different random-looking (but deterministic) value
--- the value is different, and so should replace either min or max in the
--- brin summary
-WITH rand_value AS (SELECT string_agg(fipshash((-i)::text),'') AS val FROM generate_series(1,60) s(i))
-INSERT INTO brintest_3
-SELECT val, val, val, val FROM rand_value;
--- now try some queries, accessing the brin index
-SET enable_seqscan = off;
-EXPLAIN (COSTS OFF)
-SELECT * FROM brintest_3 WHERE b < '0';
...

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/brin.out /tmp/cirrus-ci-build/build/testrun/pg_upgrade/002_pg_up...
--- /tmp/cirrus-ci-build/src/test/regress/expected/brin.out	2024-11-23 20:50:02.582136041 +0000
+++ /tmp/cirrus-ci-build/build/testrun/pg_upgrade/002_pg_upgrade/data/results/brin.out	2024-11-23 20:54:50.144136583 +00...
@@ -539,53 +539,10 @@
 -- vacuum actually removes the TOAST rows. Creating an index concurrently
 -- is a one way to achieve that, because it does exactly such wait.
 CREATE INDEX CONCURRENTLY brin_test_temp_idx ON brintest_3(a);
-DROP INDEX brin_test_temp_idx;
--- vacuum the table, to discard TOAST data
-VACUUM brintest_3;
--- retry insert with a different random-looking (but deterministic) value
--- the value is different, and so should replace either min or max in the
--- brin summary
-WITH rand_value AS (SELECT string_agg(fipshash((-i)::text),'') AS val FROM generate_series(1,60) s(i))
-INSERT INTO brintest_3
-SELECT val, val, val, val FROM rand_value;
--- now try some queries, accessing the brin index
-SET enable_seqscan = off;
-EXPLAIN (COSTS OFF)
-SELECT * FROM brintest_3 WHERE b < '0';
...

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/brin.out /tmp/cirrus-ci-build/build/testrun/recovery/027_stream_...
--- /tmp/cirrus-ci-build/src/test/regress/expected/brin.out	2024-11-23 20:50:02.582136041 +0000
+++ /tmp/cirrus-ci-build/build/testrun/recovery/027_stream_regress/data/results/brin.out	2024-11-23 20:55:22.532310998 +...
@@ -363,229 +363,10 @@
 	END LOOP;
 END;
 $x$;
-RESET enable_seqscan;
-RESET enable_bitmapscan;
-INSERT INTO brintest SELECT
-	repeat(stringu1, 42)::bytea,
-	substr(stringu1, 1, 1)::"char",
-	stringu1::name, 142857 * tenthous,
-	thousand,
-	twothousand,
-	repeat(stringu1, 42),
-	unique1::oid,
-	format('(%s,%s)', tenthous, twenty)::tid,
-	(four + 1.0)/(hundred+1),
-	odd::float8 / (tenthous + 1),
...

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/brin.out /tmp/cirrus-ci-build/build/testrun/regress/regress/resu...
--- /tmp/cirrus-ci-build/src/test/regress/expected/brin.out	2024-11-23 20:50:02.582136041 +0000
+++ /tmp/cirrus-ci-build/build/testrun/regress/regress/results/brin.out	2024-11-23 20:54:46.260128197 +0000
@@ -539,53 +539,10 @@
 -- vacuum actually removes the TOAST rows. Creating an index concurrently
 -- is a one way to achieve that, because it does exactly such wait.
 CREATE INDEX CONCURRENTLY brin_test_temp_idx ON brintest_3(a);
-DROP INDEX brin_test_temp_idx;
--- vacuum the table, to discard TOAST data
-VACUUM brintest_3;
--- retry insert with a different random-looking (but deterministic) value
--- the value is different, and so should replace either min or max in the
--- brin summary
-WITH rand_value AS (SELECT string_agg(fipshash((-i)::text),'') AS val FROM generate_series(1,60) s(i))
-INSERT INTO brintest_3
-SELECT val, val, val, val FROM rand_value;
--- now try some queries, accessing the brin index
-SET enable_seqscan = off;
-EXPLAIN (COSTS OFF)
-SELECT * FROM brintest_3 WHERE b < '0';
...

diff -U3 /Users/admin/pgsql/src/test/regress/expected/brin.out /Users/admin/pgsql/build/testrun/pg_upgrade/002_pg_upgrad...
--- /Users/admin/pgsql/src/test/regress/expected/brin.out	2024-11-23 20:49:11
+++ /Users/admin/pgsql/build/testrun/pg_upgrade/002_pg_upgrade/data/results/brin.out	2024-11-23 20:51:59
@@ -539,53 +539,10 @@
 -- vacuum actually removes the TOAST rows. Creating an index concurrently
 -- is a one way to achieve that, because it does exactly such wait.
 CREATE INDEX CONCURRENTLY brin_test_temp_idx ON brintest_3(a);
-DROP INDEX brin_test_temp_idx;
--- vacuum the table, to discard TOAST data
-VACUUM brintest_3;
--- retry insert with a different random-looking (but deterministic) value
--- the value is different, and so should replace either min or max in the
--- brin summary
-WITH rand_value AS (SELECT string_agg(fipshash((-i)::text),'') AS val FROM generate_series(1,60) s(i))
-INSERT INTO brintest_3
-SELECT val, val, val, val FROM rand_value;
--- now try some queries, accessing the brin index
-SET enable_seqscan = off;
-EXPLAIN (COSTS OFF)
-SELECT * FROM brintest_3 WHERE b < '0';
...

diff -U3 /Users/admin/pgsql/src/test/regress/expected/brin.out /Users/admin/pgsql/build/testrun/recovery/027_stream_regr...
--- /Users/admin/pgsql/src/test/regress/expected/brin.out	2024-11-23 20:49:11
+++ /Users/admin/pgsql/build/testrun/recovery/027_stream_regress/data/results/brin.out	2024-11-23 20:52:40
@@ -539,53 +539,10 @@
 -- vacuum actually removes the TOAST rows. Creating an index concurrently
 -- is a one way to achieve that, because it does exactly such wait.
 CREATE INDEX CONCURRENTLY brin_test_temp_idx ON brintest_3(a);
-DROP INDEX brin_test_temp_idx;
--- vacuum the table, to discard TOAST data
-VACUUM brintest_3;
--- retry insert with a different random-looking (but deterministic) value
--- the value is different, and so should replace either min or max in the
--- brin summary
-WITH rand_value AS (SELECT string_agg(fipshash((-i)::text),'') AS val FROM generate_series(1,60) s(i))
-INSERT INTO brintest_3
-SELECT val, val, val, val FROM rand_value;
--- now try some queries, accessing the brin index
-SET enable_seqscan = off;
-EXPLAIN (COSTS OFF)
-SELECT * FROM brintest_3 WHERE b < '0';
...

diff -U3 /Users/admin/pgsql/src/test/regress/expected/privileges.out /Users/admin/pgsql/build/testrun/regress/regress/re...
--- /Users/admin/pgsql/src/test/regress/expected/privileges.out	2024-11-23 20:49:12
+++ /Users/admin/pgsql/build/testrun/regress/regress/results/privileges.out	2024-11-23 20:51:59
@@ -1846,1413 +1846,10 @@
 REINDEX TABLE sro_tab;
 REINDEX INDEX sro_idx;
 REINDEX TABLE CONCURRENTLY sro_tab;
-DROP INDEX sro_idx;
--- CLUSTER
-CREATE INDEX sro_cluster_idx ON sro_tab ((sro_ifun(a) + sro_ifun(0)));
-CLUSTER sro_tab USING sro_cluster_idx;
-DROP INDEX sro_cluster_idx;
--- BRIN index
-CREATE INDEX sro_brin ON sro_tab USING brin ((sro_ifun(a) + sro_ifun(0)));
-SELECT brin_desummarize_range('sro_brin', 0);
- brin_desummarize_range 
-------------------------
- 
-(1 row)
-
...

diff --strip-trailing-cr -U3 C:/cirrus/src/test/regress/expected/brin.out C:/cirrus/build/testrun/pg_upgrade/002_pg_upgr...
--- C:/cirrus/src/test/regress/expected/brin.out	2024-11-23 20:50:13.811024900 +0000
+++ C:/cirrus/build/testrun/pg_upgrade/002_pg_upgrade/data/results/brin.out	2024-11-23 20:53:00.854459600 +0000
@@ -539,53 +539,10 @@
 -- vacuum actually removes the TOAST rows. Creating an index concurrently
 -- is a one way to achieve that, because it does exactly such wait.
 CREATE INDEX CONCURRENTLY brin_test_temp_idx ON brintest_3(a);
-DROP INDEX brin_test_temp_idx;
--- vacuum the table, to discard TOAST data
-VACUUM brintest_3;
--- retry insert with a different random-looking (but deterministic) value
--- the value is different, and so should replace either min or max in the
--- brin summary
-WITH rand_value AS (SELECT string_agg(fipshash((-i)::text),'') AS val FROM generate_series(1,60) s(i))
-INSERT INTO brintest_3
-SELECT val, val, val, val FROM rand_value;
--- now try some queries, accessing the brin index
-SET enable_seqscan = off;
-EXPLAIN (COSTS OFF)
-SELECT * FROM brintest_3 WHERE b < '0';
...

diff --strip-trailing-cr -U3 C:/cirrus/src/test/regress/expected/brin.out C:/cirrus/build/testrun/recovery/027_stream_re...
--- C:/cirrus/src/test/regress/expected/brin.out	2024-11-23 20:50:13.811024900 +0000
+++ C:/cirrus/build/testrun/recovery/027_stream_regress/data/results/brin.out	2024-11-23 20:55:03.253414600 +0000
@@ -539,53 +539,10 @@
 -- vacuum actually removes the TOAST rows. Creating an index concurrently
 -- is a one way to achieve that, because it does exactly such wait.
 CREATE INDEX CONCURRENTLY brin_test_temp_idx ON brintest_3(a);
-DROP INDEX brin_test_temp_idx;
--- vacuum the table, to discard TOAST data
-VACUUM brintest_3;
--- retry insert with a different random-looking (but deterministic) value
--- the value is different, and so should replace either min or max in the
--- brin summary
-WITH rand_value AS (SELECT string_agg(fipshash((-i)::text),'') AS val FROM generate_series(1,60) s(i))
-INSERT INTO brintest_3
-SELECT val, val, val, val FROM rand_value;
--- now try some queries, accessing the brin index
-SET enable_seqscan = off;
-EXPLAIN (COSTS OFF)
-SELECT * FROM brintest_3 WHERE b < '0';
...

diff --strip-trailing-cr -U3 C:/cirrus/src/test/regress/expected/brin.out C:/cirrus/build/testrun/regress/regress/result...
--- C:/cirrus/src/test/regress/expected/brin.out	2024-11-23 20:50:13.811024900 +0000
+++ C:/cirrus/build/testrun/regress/regress/results/brin.out	2024-11-23 20:52:52.026827700 +0000
@@ -539,53 +539,10 @@
 -- vacuum actually removes the TOAST rows. Creating an index concurrently
 -- is a one way to achieve that, because it does exactly such wait.
 CREATE INDEX CONCURRENTLY brin_test_temp_idx ON brintest_3(a);
-DROP INDEX brin_test_temp_idx;
--- vacuum the table, to discard TOAST data
-VACUUM brintest_3;
--- retry insert with a different random-looking (but deterministic) value
--- the value is different, and so should replace either min or max in the
--- brin summary
-WITH rand_value AS (SELECT string_agg(fipshash((-i)::text),'') AS val FROM generate_series(1,60) s(i))
-INSERT INTO brintest_3
-SELECT val, val, val, val FROM rand_value;
--- now try some queries, accessing the brin index
-SET enable_seqscan = off;
-EXPLAIN (COSTS OFF)
-SELECT * FROM brintest_3 WHERE b < '0';
...

diff --strip-trailing-cr -U3 C:/cirrus/src/test/regress/expected/subselect.out C:/cirrus/build/testrun/recovery/027_stre...
--- C:/cirrus/src/test/regress/expected/subselect.out	2024-11-23 13:02:26.355615300 +0000
+++ C:/cirrus/build/testrun/recovery/027_stream_regress/data/results/subselect.out	2024-11-23 13:07:26.768994800 +0000
@@ -2313,15 +2313,16 @@
 EXPLAIN (COSTS OFF)
 SELECT c.oid,c.relname FROM pg_class c JOIN pg_am a USING (oid)
 WHERE c.oid IN (VALUES (1), (2));
-                          QUERY PLAN                           
----------------------------------------------------------------
- Hash Join
-   Hash Cond: (a.oid = c.oid)
-   ->  Seq Scan on pg_am a
-   ->  Hash
-         ->  Index Scan using pg_class_oid_index on pg_class c
-               Index Cond: (oid = ANY ('{1,2}'::integer[]))
-(6 rows)
+                       QUERY PLAN                        
+---------------------------------------------------------
+ Merge Join
+   Merge Cond: (c.oid = a.oid)
...

diff --strip-trailing-cr -U3 C:/cirrus/src/test/regress/expected/subselect.out C:/cirrus/build/testrun/regress/regress/r...
--- C:/cirrus/src/test/regress/expected/subselect.out	2024-11-23 13:02:26.355615300 +0000
+++ C:/cirrus/build/testrun/regress/regress/results/subselect.out	2024-11-23 13:04:52.127665400 +0000
@@ -2313,15 +2313,16 @@
 EXPLAIN (COSTS OFF)
 SELECT c.oid,c.relname FROM pg_class c JOIN pg_am a USING (oid)
 WHERE c.oid IN (VALUES (1), (2));
-                          QUERY PLAN                           
----------------------------------------------------------------
- Hash Join
-   Hash Cond: (a.oid = c.oid)
-   ->  Seq Scan on pg_am a
-   ->  Hash
-         ->  Index Scan using pg_class_oid_index on pg_class c
-               Index Cond: (oid = ANY ('{1,2}'::integer[]))
-(6 rows)
+                       QUERY PLAN                        
+---------------------------------------------------------
+ Merge Join
+   Merge Cond: (c.oid = a.oid)
...

diff -U3 /tmp/cirrus-ci-build/contrib/postgres_fdw/expected/query_cancel.out /tmp/cirrus-ci-build/build/testrun/postgres...
--- /tmp/cirrus-ci-build/contrib/postgres_fdw/expected/query_cancel.out	2024-11-23 10:19:52.020491370 +0000
+++ /tmp/cirrus-ci-build/build/testrun/postgres_fdw/regress/results/query_cancel.out	2024-11-23 10:26:24.774619725 +0000
@@ -29,4 +29,5 @@
 -- This would take very long if not canceled:
 SELECT count(*) FROM ft1 a CROSS JOIN ft1 b CROSS JOIN ft1 c CROSS JOIN ft1 d;
 ERROR:  canceling statement due to statement timeout
+WARNING:  could not get result of cancel request due to timeout
 COMMIT;

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/xml.out /tmp/cirrus-ci-build/build/testrun/pg_upgrade/002_pg_upg...
--- /tmp/cirrus-ci-build/src/test/regress/expected/xml.out	2024-11-23 04:57:12.942262000 +0000
+++ /tmp/cirrus-ci-build/build/testrun/pg_upgrade/002_pg_upgrade/data/results/xml.out	2024-11-23 04:58:47.435372000 +000...
@@ -855,7 +855,7 @@
 
 SELECT xpath('', '<!-- error -->');
 ERROR:  empty XPath expression
-CONTEXT:  SQL function "xpath" statement 1
+CONTEXT:  SQL function "xpath" during startup
 SELECT xpath('//text()', '<local:data xmlns:local="http://127.0.0.1"><local:piece id="1">number one</local:piece><local...
      xpath      
 ----------------
@@ -1221,7 +1221,7 @@
 DETAIL:  line 1: Namespace prefix nosuchprefix on tag is not defined
 <nosuchprefix:tag/>
                  ^
-CONTEXT:  SQL function "xpath" statement 1
+CONTEXT:  SQL function "xpath" during startup
 -- XPath deprecates relative namespaces, but they're not supposed to
 -- throw an error, only a warning.
...

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/xml.out /tmp/cirrus-ci-build/build/testrun/recovery/027_stream_r...
--- /tmp/cirrus-ci-build/src/test/regress/expected/xml.out	2024-11-23 04:57:12.942262000 +0000
+++ /tmp/cirrus-ci-build/build/testrun/recovery/027_stream_regress/data/results/xml.out	2024-11-23 04:59:36.829717000 +0...
@@ -855,7 +855,7 @@
 
 SELECT xpath('', '<!-- error -->');
 ERROR:  empty XPath expression
-CONTEXT:  SQL function "xpath" statement 1
+CONTEXT:  SQL function "xpath" during startup
 SELECT xpath('//text()', '<local:data xmlns:local="http://127.0.0.1"><local:piece id="1">number one</local:piece><local...
      xpath      
 ----------------
@@ -1221,7 +1221,7 @@
 DETAIL:  line 1: Namespace prefix nosuchprefix on tag is not defined
 <nosuchprefix:tag/>
                  ^
-CONTEXT:  SQL function "xpath" statement 1
+CONTEXT:  SQL function "xpath" during startup
 -- XPath deprecates relative namespaces, but they're not supposed to
 -- throw an error, only a warning.
...

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/xml.out /tmp/cirrus-ci-build/build/testrun/regress/regress/resul...
--- /tmp/cirrus-ci-build/src/test/regress/expected/xml.out	2024-11-23 04:57:12.942262000 +0000
+++ /tmp/cirrus-ci-build/build/testrun/regress/regress/results/xml.out	2024-11-23 04:58:44.678898000 +0000
@@ -855,7 +855,7 @@
 
 SELECT xpath('', '<!-- error -->');
 ERROR:  empty XPath expression
-CONTEXT:  SQL function "xpath" statement 1
+CONTEXT:  SQL function "xpath" during startup
 SELECT xpath('//text()', '<local:data xmlns:local="http://127.0.0.1"><local:piece id="1">number one</local:piece><local...
      xpath      
 ----------------
@@ -1221,7 +1221,7 @@
 DETAIL:  line 1: Namespace prefix nosuchprefix on tag is not defined
 <nosuchprefix:tag/>
                  ^
-CONTEXT:  SQL function "xpath" statement 1
+CONTEXT:  SQL function "xpath" during startup
 -- XPath deprecates relative namespaces, but they're not supposed to
 -- throw an error, only a warning.
...

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/xml.out /tmp/cirrus-ci-build/src/bin/pg_upgrade/tmp_check/result...
--- /tmp/cirrus-ci-build/src/test/regress/expected/xml.out	2024-11-23 04:57:11.221321176 +0000
+++ /tmp/cirrus-ci-build/src/bin/pg_upgrade/tmp_check/results/xml.out	2024-11-23 05:02:03.374309155 +0000
@@ -855,7 +855,7 @@
 
 SELECT xpath('', '<!-- error -->');
 ERROR:  empty XPath expression
-CONTEXT:  SQL function "xpath" statement 1
+CONTEXT:  SQL function "xpath" during startup
 SELECT xpath('//text()', '<local:data xmlns:local="http://127.0.0.1"><local:piece id="1">number one</local:piece><local...
      xpath      
 ----------------
@@ -1221,7 +1221,7 @@
 DETAIL:  line 1: Namespace prefix nosuchprefix on tag is not defined
 <nosuchprefix:tag/>
                  ^
-CONTEXT:  SQL function "xpath" statement 1
+CONTEXT:  SQL function "xpath" during startup
 -- XPath deprecates relative namespaces, but they're not supposed to
 -- throw an error, only a warning.
...

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/xml.out /tmp/cirrus-ci-build/src/test/regress/results/xml.out
--- /tmp/cirrus-ci-build/src/test/regress/expected/xml.out	2024-11-23 04:57:11.221321176 +0000
+++ /tmp/cirrus-ci-build/src/test/regress/results/xml.out	2024-11-23 05:00:16.054504202 +0000
@@ -855,7 +855,7 @@
 
 SELECT xpath('', '<!-- error -->');
 ERROR:  empty XPath expression
-CONTEXT:  SQL function "xpath" statement 1
+CONTEXT:  SQL function "xpath" during startup
 SELECT xpath('//text()', '<local:data xmlns:local="http://127.0.0.1"><local:piece id="1">number one</local:piece><local...
      xpath      
 ----------------
@@ -1221,7 +1221,7 @@
 DETAIL:  line 1: Namespace prefix nosuchprefix on tag is not defined
 <nosuchprefix:tag/>
                  ^
-CONTEXT:  SQL function "xpath" statement 1
+CONTEXT:  SQL function "xpath" during startup
 -- XPath deprecates relative namespaces, but they're not supposed to
 -- throw an error, only a warning.
...

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/xml.out /tmp/cirrus-ci-build/build/testrun/pg_upgrade/002_pg_upg...
--- /tmp/cirrus-ci-build/src/test/regress/expected/xml.out	2024-11-23 04:57:13.128322101 +0000
+++ /tmp/cirrus-ci-build/build/testrun/pg_upgrade/002_pg_upgrade/data/results/xml.out	2024-11-23 04:59:26.955524411 +000...
@@ -855,7 +855,7 @@
 
 SELECT xpath('', '<!-- error -->');
 ERROR:  empty XPath expression
-CONTEXT:  SQL function "xpath" statement 1
+CONTEXT:  SQL function "xpath" during startup
 SELECT xpath('//text()', '<local:data xmlns:local="http://127.0.0.1"><local:piece id="1">number one</local:piece><local...
      xpath      
 ----------------
@@ -1221,7 +1221,7 @@
 DETAIL:  line 1: Namespace prefix nosuchprefix on tag is not defined
 <nosuchprefix:tag/>
                  ^
-CONTEXT:  SQL function "xpath" statement 1
+CONTEXT:  SQL function "xpath" during startup
 -- XPath deprecates relative namespaces, but they're not supposed to
 -- throw an error, only a warning.
...

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/xml.out /tmp/cirrus-ci-build/build/testrun/recovery/027_stream_r...
--- /tmp/cirrus-ci-build/src/test/regress/expected/xml.out	2024-11-23 04:57:13.128322101 +0000
+++ /tmp/cirrus-ci-build/build/testrun/recovery/027_stream_regress/data/results/xml.out	2024-11-23 05:00:03.688970930 +0...
@@ -855,7 +855,7 @@
 
 SELECT xpath('', '<!-- error -->');
 ERROR:  empty XPath expression
-CONTEXT:  SQL function "xpath" statement 1
+CONTEXT:  SQL function "xpath" during startup
 SELECT xpath('//text()', '<local:data xmlns:local="http://127.0.0.1"><local:piece id="1">number one</local:piece><local...
      xpath      
 ----------------
@@ -1221,7 +1221,7 @@
 DETAIL:  line 1: Namespace prefix nosuchprefix on tag is not defined
 <nosuchprefix:tag/>
                  ^
-CONTEXT:  SQL function "xpath" statement 1
+CONTEXT:  SQL function "xpath" during startup
 -- XPath deprecates relative namespaces, but they're not supposed to
 -- throw an error, only a warning.
...

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/xml.out /tmp/cirrus-ci-build/build/testrun/regress/regress/resul...
--- /tmp/cirrus-ci-build/src/test/regress/expected/xml.out	2024-11-23 04:57:13.128322101 +0000
+++ /tmp/cirrus-ci-build/build/testrun/regress/regress/results/xml.out	2024-11-23 04:59:20.571381816 +0000
@@ -855,7 +855,7 @@
 
 SELECT xpath('', '<!-- error -->');
 ERROR:  empty XPath expression
-CONTEXT:  SQL function "xpath" statement 1
+CONTEXT:  SQL function "xpath" during startup
 SELECT xpath('//text()', '<local:data xmlns:local="http://127.0.0.1"><local:piece id="1">number one</local:piece><local...
      xpath      
 ----------------
@@ -1221,7 +1221,7 @@
 DETAIL:  line 1: Namespace prefix nosuchprefix on tag is not defined
 <nosuchprefix:tag/>
                  ^
-CONTEXT:  SQL function "xpath" statement 1
+CONTEXT:  SQL function "xpath" during startup
 -- XPath deprecates relative namespaces, but they're not supposed to
 -- throw an error, only a warning.
...

diff -U3 /Users/admin/pgsql/src/test/regress/expected/xml.out /Users/admin/pgsql/build/testrun/pg_upgrade/002_pg_upgrade...
--- /Users/admin/pgsql/src/test/regress/expected/xml.out	2024-11-23 04:57:09
+++ /Users/admin/pgsql/build/testrun/pg_upgrade/002_pg_upgrade/data/results/xml.out	2024-11-23 04:58:54
@@ -855,7 +855,7 @@
 
 SELECT xpath('', '<!-- error -->');
 ERROR:  empty XPath expression
-CONTEXT:  SQL function "xpath" statement 1
+CONTEXT:  SQL function "xpath" during startup
 SELECT xpath('//text()', '<local:data xmlns:local="http://127.0.0.1"><local:piece id="1">number one</local:piece><local...
      xpath      
 ----------------
@@ -1221,7 +1221,7 @@
 DETAIL:  line 1: Namespace prefix nosuchprefix on tag is not defined
 <nosuchprefix:tag/>
                  ^
-CONTEXT:  SQL function "xpath" statement 1
+CONTEXT:  SQL function "xpath" during startup
 -- XPath deprecates relative namespaces, but they're not supposed to
 -- throw an error, only a warning.
...

diff -U3 /Users/admin/pgsql/src/test/regress/expected/xml.out /Users/admin/pgsql/build/testrun/recovery/027_stream_regre...
--- /Users/admin/pgsql/src/test/regress/expected/xml.out	2024-11-23 04:57:09
+++ /Users/admin/pgsql/build/testrun/recovery/027_stream_regress/data/results/xml.out	2024-11-23 04:59:50
@@ -855,7 +855,7 @@
 
 SELECT xpath('', '<!-- error -->');
 ERROR:  empty XPath expression
-CONTEXT:  SQL function "xpath" statement 1
+CONTEXT:  SQL function "xpath" during startup
 SELECT xpath('//text()', '<local:data xmlns:local="http://127.0.0.1"><local:piece id="1">number one</local:piece><local...
      xpath      
 ----------------
@@ -1221,7 +1221,7 @@
 DETAIL:  line 1: Namespace prefix nosuchprefix on tag is not defined
 <nosuchprefix:tag/>
                  ^
-CONTEXT:  SQL function "xpath" statement 1
+CONTEXT:  SQL function "xpath" during startup
 -- XPath deprecates relative namespaces, but they're not supposed to
 -- throw an error, only a warning.
...

diff -U3 /Users/admin/pgsql/src/test/regress/expected/xml.out /Users/admin/pgsql/build/testrun/regress/regress/results/x...
--- /Users/admin/pgsql/src/test/regress/expected/xml.out	2024-11-23 04:57:09
+++ /Users/admin/pgsql/build/testrun/regress/regress/results/xml.out	2024-11-23 04:58:54
@@ -855,7 +855,7 @@
 
 SELECT xpath('', '<!-- error -->');
 ERROR:  empty XPath expression
-CONTEXT:  SQL function "xpath" statement 1
+CONTEXT:  SQL function "xpath" during startup
 SELECT xpath('//text()', '<local:data xmlns:local="http://127.0.0.1"><local:piece id="1">number one</local:piece><local...
      xpath      
 ----------------
@@ -1221,7 +1221,7 @@
 DETAIL:  line 1: Namespace prefix nosuchprefix on tag is not defined
 <nosuchprefix:tag/>
                  ^
-CONTEXT:  SQL function "xpath" statement 1
+CONTEXT:  SQL function "xpath" during startup
 -- XPath deprecates relative namespaces, but they're not supposed to
 -- throw an error, only a warning.
...

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/indexing.out /tmp/cirrus-ci-build/build/testrun/pg_upgrade/002_p...
--- /tmp/cirrus-ci-build/src/test/regress/expected/indexing.out	2024-11-23 02:00:14.830560000 +0000
+++ /tmp/cirrus-ci-build/build/testrun/pg_upgrade/002_pg_upgrade/data/results/indexing.out	2024-11-23 02:01:55.148084000...
@@ -77,7 +77,6 @@
 Partition key: RANGE (a)
 Indexes:
     "idxpart_a_idx" btree (a)
-    "idxpart_a_idx1" UNIQUE, btree (a) INVALID
 Number of partitions: 3 (Use \d+ to list them.)
 
 \d idxpart1
@@ -91,7 +90,6 @@
 Partition key: RANGE (a)
 Indexes:
     "idxpart1_a_idx" btree (a)
-    "idxpart1_a_idx1" UNIQUE, btree (a) INVALID
 Number of partitions: 1 (Use \d+ to list them.)
 
 \d idxpart11
@@ -105,7 +103,6 @@
...

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/indexing.out /tmp/cirrus-ci-build/build/testrun/recovery/027_str...
--- /tmp/cirrus-ci-build/src/test/regress/expected/indexing.out	2024-11-23 02:00:14.830560000 +0000
+++ /tmp/cirrus-ci-build/build/testrun/recovery/027_stream_regress/data/results/indexing.out	2024-11-23 02:02:37.0495970...
@@ -77,7 +77,6 @@
 Partition key: RANGE (a)
 Indexes:
     "idxpart_a_idx" btree (a)
-    "idxpart_a_idx1" UNIQUE, btree (a) INVALID
 Number of partitions: 3 (Use \d+ to list them.)
 
 \d idxpart1
@@ -91,7 +90,6 @@
 Partition key: RANGE (a)
 Indexes:
     "idxpart1_a_idx" btree (a)
-    "idxpart1_a_idx1" UNIQUE, btree (a) INVALID
 Number of partitions: 1 (Use \d+ to list them.)
 
 \d idxpart11
@@ -105,7 +103,6 @@
...

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/indexing.out /tmp/cirrus-ci-build/build/testrun/regress/regress/...
--- /tmp/cirrus-ci-build/src/test/regress/expected/indexing.out	2024-11-23 02:00:14.830560000 +0000
+++ /tmp/cirrus-ci-build/build/testrun/regress/regress/results/indexing.out	2024-11-23 02:01:55.064426000 +0000
@@ -77,7 +77,6 @@
 Partition key: RANGE (a)
 Indexes:
     "idxpart_a_idx" btree (a)
-    "idxpart_a_idx1" UNIQUE, btree (a) INVALID
 Number of partitions: 3 (Use \d+ to list them.)
 
 \d idxpart1
@@ -91,7 +90,6 @@
 Partition key: RANGE (a)
 Indexes:
     "idxpart1_a_idx" btree (a)
-    "idxpart1_a_idx1" UNIQUE, btree (a) INVALID
 Number of partitions: 1 (Use \d+ to list them.)
 
 \d idxpart11
@@ -105,7 +103,6 @@
...

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/indexing.out /tmp/cirrus-ci-build/src/bin/pg_upgrade/tmp_check/r...
--- /tmp/cirrus-ci-build/src/test/regress/expected/indexing.out	2024-11-23 02:00:11.401508936 +0000
+++ /tmp/cirrus-ci-build/src/bin/pg_upgrade/tmp_check/results/indexing.out	2024-11-23 02:05:48.689610332 +0000
@@ -77,7 +77,6 @@
 Partition key: RANGE (a)
 Indexes:
     "idxpart_a_idx" btree (a)
-    "idxpart_a_idx1" UNIQUE, btree (a) INVALID
 Number of partitions: 3 (Use \d+ to list them.)
 
 \d idxpart1
@@ -91,7 +90,6 @@
 Partition key: RANGE (a)
 Indexes:
     "idxpart1_a_idx" btree (a)
-    "idxpart1_a_idx1" UNIQUE, btree (a) INVALID
 Number of partitions: 1 (Use \d+ to list them.)
 
 \d idxpart11
@@ -105,7 +103,6 @@
...

diff -U3 /tmp/cirrus-ci-build/src/test/isolation/expected/partitioned-cic.out /tmp/cirrus-ci-build/src/test/isolation/ou...
--- /tmp/cirrus-ci-build/src/test/isolation/expected/partitioned-cic.out	2024-11-23 02:00:11.236893946 +0000
+++ /tmp/cirrus-ci-build/src/test/isolation/output_iso/results/partitioned-cic.out	2024-11-23 02:27:12.463375107 +0000
@@ -3,10 +3,14 @@
 starting permutation: lock_p1 cic insert drop2 commit chk_content
 step lock_p1: lock cictab_part_1 in row exclusive mode;
 step cic: CREATE INDEX CONCURRENTLY ON cictab(i); <waiting ...>
-step insert: insert into cictab values (1, 1), (11, 1);
-step drop2: DROP TABLE cictab_part_2;
+step insert: insert into cictab values (1, 1), (11, 1); <waiting ...>
+isolationtester: canceling step insert after 360 seconds
+step insert: <... completed>
+ERROR:  canceling statement due to user request
+step drop2: DROP TABLE cictab_part_2; <waiting ...>
 step commit: COMMIT;
 step cic: <... completed>
+step drop2: <... completed>
 step chk_content: 
   set enable_seqscan to off;
   explain (costs off) select * from cictab where i > 0;
...

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/indexing.out /tmp/cirrus-ci-build/src/test/recovery/tmp_check/re...
--- /tmp/cirrus-ci-build/src/test/regress/expected/indexing.out	2024-11-23 02:00:11.401508936 +0000
+++ /tmp/cirrus-ci-build/src/test/recovery/tmp_check/results/indexing.out	2024-11-23 02:06:52.078991285 +0000
@@ -77,7 +77,6 @@
 Partition key: RANGE (a)
 Indexes:
     "idxpart_a_idx" btree (a)
-    "idxpart_a_idx1" UNIQUE, btree (a) INVALID
 Number of partitions: 3 (Use \d+ to list them.)
 
 \d idxpart1
@@ -91,7 +90,6 @@
 Partition key: RANGE (a)
 Indexes:
     "idxpart1_a_idx" btree (a)
-    "idxpart1_a_idx1" UNIQUE, btree (a) INVALID
 Number of partitions: 1 (Use \d+ to list them.)
 
 \d idxpart11
@@ -105,7 +103,6 @@
...

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/indexing.out /tmp/cirrus-ci-build/src/test/regress/results/index...
--- /tmp/cirrus-ci-build/src/test/regress/expected/indexing.out	2024-11-23 02:00:11.401508936 +0000
+++ /tmp/cirrus-ci-build/src/test/regress/results/indexing.out	2024-11-23 02:03:15.701554032 +0000
@@ -77,7 +77,6 @@
 Partition key: RANGE (a)
 Indexes:
     "idxpart_a_idx" btree (a)
-    "idxpart_a_idx1" UNIQUE, btree (a) INVALID
 Number of partitions: 3 (Use \d+ to list them.)
 
 \d idxpart1
@@ -91,7 +90,6 @@
 Partition key: RANGE (a)
 Indexes:
     "idxpart1_a_idx" btree (a)
-    "idxpart1_a_idx1" UNIQUE, btree (a) INVALID
 Number of partitions: 1 (Use \d+ to list them.)
 
 \d idxpart11
@@ -105,7 +103,6 @@
...

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/indexing.out /tmp/cirrus-ci-build/build/testrun/pg_upgrade/002_p...
--- /tmp/cirrus-ci-build/src/test/regress/expected/indexing.out	2024-11-23 02:00:11.400713615 +0000
+++ /tmp/cirrus-ci-build/build/testrun/pg_upgrade/002_pg_upgrade/data/results/indexing.out	2024-11-23 02:02:46.118636301...
@@ -77,7 +77,6 @@
 Partition key: RANGE (a)
 Indexes:
     "idxpart_a_idx" btree (a)
-    "idxpart_a_idx1" UNIQUE, btree (a) INVALID
 Number of partitions: 3 (Use \d+ to list them.)
 
 \d idxpart1
@@ -91,7 +90,6 @@
 Partition key: RANGE (a)
 Indexes:
     "idxpart1_a_idx" btree (a)
-    "idxpart1_a_idx1" UNIQUE, btree (a) INVALID
 Number of partitions: 1 (Use \d+ to list them.)
 
 \d idxpart11
@@ -105,7 +103,6 @@
...

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/indexing.out /tmp/cirrus-ci-build/build/testrun/recovery/027_str...
--- /tmp/cirrus-ci-build/src/test/regress/expected/indexing.out	2024-11-23 02:00:11.400713615 +0000
+++ /tmp/cirrus-ci-build/build/testrun/recovery/027_stream_regress/data/results/indexing.out	2024-11-23 02:03:15.9192292...
@@ -77,7 +77,6 @@
 Partition key: RANGE (a)
 Indexes:
     "idxpart_a_idx" btree (a)
-    "idxpart_a_idx1" UNIQUE, btree (a) INVALID
 Number of partitions: 3 (Use \d+ to list them.)
 
 \d idxpart1
@@ -91,7 +90,6 @@
 Partition key: RANGE (a)
 Indexes:
     "idxpart1_a_idx" btree (a)
-    "idxpart1_a_idx1" UNIQUE, btree (a) INVALID
 Number of partitions: 1 (Use \d+ to list them.)
 
 \d idxpart11
@@ -105,7 +103,6 @@
...

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/indexing.out /tmp/cirrus-ci-build/build/testrun/regress/regress/...
--- /tmp/cirrus-ci-build/src/test/regress/expected/indexing.out	2024-11-23 02:00:11.400713615 +0000
+++ /tmp/cirrus-ci-build/build/testrun/regress/regress/results/indexing.out	2024-11-23 02:02:40.014536165 +0000
@@ -77,7 +77,6 @@
 Partition key: RANGE (a)
 Indexes:
     "idxpart_a_idx" btree (a)
-    "idxpart_a_idx1" UNIQUE, btree (a) INVALID
 Number of partitions: 3 (Use \d+ to list them.)
 
 \d idxpart1
@@ -91,7 +90,6 @@
 Partition key: RANGE (a)
 Indexes:
     "idxpart1_a_idx" btree (a)
-    "idxpart1_a_idx1" UNIQUE, btree (a) INVALID
 Number of partitions: 1 (Use \d+ to list them.)
 
 \d idxpart11
@@ -105,7 +103,6 @@
...

diff -U3 /Users/admin/pgsql/src/test/regress/expected/indexing.out /Users/admin/pgsql/build/testrun/pg_upgrade/002_pg_up...
--- /Users/admin/pgsql/src/test/regress/expected/indexing.out	2024-11-23 02:00:11
+++ /Users/admin/pgsql/build/testrun/pg_upgrade/002_pg_upgrade/data/results/indexing.out	2024-11-23 02:02:03
@@ -77,7 +77,6 @@
 Partition key: RANGE (a)
 Indexes:
     "idxpart_a_idx" btree (a)
-    "idxpart_a_idx1" UNIQUE, btree (a) INVALID
 Number of partitions: 3 (Use \d+ to list them.)
 
 \d idxpart1
@@ -91,7 +90,6 @@
 Partition key: RANGE (a)
 Indexes:
     "idxpart1_a_idx" btree (a)
-    "idxpart1_a_idx1" UNIQUE, btree (a) INVALID
 Number of partitions: 1 (Use \d+ to list them.)
 
 \d idxpart11
@@ -105,7 +103,6 @@
...

diff -U3 /Users/admin/pgsql/src/test/regress/expected/indexing.out /Users/admin/pgsql/build/testrun/recovery/027_stream_...
--- /Users/admin/pgsql/src/test/regress/expected/indexing.out	2024-11-23 02:00:11
+++ /Users/admin/pgsql/build/testrun/recovery/027_stream_regress/data/results/indexing.out	2024-11-23 02:02:50
@@ -77,7 +77,6 @@
 Partition key: RANGE (a)
 Indexes:
     "idxpart_a_idx" btree (a)
-    "idxpart_a_idx1" UNIQUE, btree (a) INVALID
 Number of partitions: 3 (Use \d+ to list them.)
 
 \d idxpart1
@@ -91,7 +90,6 @@
 Partition key: RANGE (a)
 Indexes:
     "idxpart1_a_idx" btree (a)
-    "idxpart1_a_idx1" UNIQUE, btree (a) INVALID
 Number of partitions: 1 (Use \d+ to list them.)
 
 \d idxpart11
@@ -105,7 +103,6 @@
...

diff -U3 /Users/admin/pgsql/src/test/regress/expected/indexing.out /Users/admin/pgsql/build/testrun/regress/regress/resu...
--- /Users/admin/pgsql/src/test/regress/expected/indexing.out	2024-11-23 02:00:11
+++ /Users/admin/pgsql/build/testrun/regress/regress/results/indexing.out	2024-11-23 02:02:06
@@ -77,7 +77,6 @@
 Partition key: RANGE (a)
 Indexes:
     "idxpart_a_idx" btree (a)
-    "idxpart_a_idx1" UNIQUE, btree (a) INVALID
 Number of partitions: 3 (Use \d+ to list them.)
 
 \d idxpart1
@@ -91,7 +90,6 @@
 Partition key: RANGE (a)
 Indexes:
     "idxpart1_a_idx" btree (a)
-    "idxpart1_a_idx1" UNIQUE, btree (a) INVALID
 Number of partitions: 1 (Use \d+ to list them.)
 
 \d idxpart11
@@ -105,7 +103,6 @@
...

diff --strip-trailing-cr -U3 C:/cirrus/src/test/regress/expected/indexing.out C:/cirrus/build/testrun/pg_upgrade/002_pg_...
--- C:/cirrus/src/test/regress/expected/indexing.out	2024-11-23 02:00:23.897336000 +0000
+++ C:/cirrus/build/testrun/pg_upgrade/002_pg_upgrade/data/results/indexing.out	2024-11-23 02:04:02.460949300 +0000
@@ -77,7 +77,6 @@
 Partition key: RANGE (a)
 Indexes:
     "idxpart_a_idx" btree (a)
-    "idxpart_a_idx1" UNIQUE, btree (a) INVALID
 Number of partitions: 3 (Use \d+ to list them.)
 
 \d idxpart1
@@ -91,7 +90,6 @@
 Partition key: RANGE (a)
 Indexes:
     "idxpart1_a_idx" btree (a)
-    "idxpart1_a_idx1" UNIQUE, btree (a) INVALID
 Number of partitions: 1 (Use \d+ to list them.)
 
 \d idxpart11
@@ -105,7 +103,6 @@
...

diff --strip-trailing-cr -U3 C:/cirrus/src/test/regress/expected/indexing.out C:/cirrus/build/testrun/recovery/027_strea...
--- C:/cirrus/src/test/regress/expected/indexing.out	2024-11-23 02:00:23.897336000 +0000
+++ C:/cirrus/build/testrun/recovery/027_stream_regress/data/results/indexing.out	2024-11-23 02:06:19.319871100 +0000
@@ -77,7 +77,6 @@
 Partition key: RANGE (a)
 Indexes:
     "idxpart_a_idx" btree (a)
-    "idxpart_a_idx1" UNIQUE, btree (a) INVALID
 Number of partitions: 3 (Use \d+ to list them.)
 
 \d idxpart1
@@ -91,7 +90,6 @@
 Partition key: RANGE (a)
 Indexes:
     "idxpart1_a_idx" btree (a)
-    "idxpart1_a_idx1" UNIQUE, btree (a) INVALID
 Number of partitions: 1 (Use \d+ to list them.)
 
 \d idxpart11
@@ -105,7 +103,6 @@
...

diff --strip-trailing-cr -U3 C:/cirrus/src/test/regress/expected/indexing.out C:/cirrus/build/testrun/regress/regress/re...
--- C:/cirrus/src/test/regress/expected/indexing.out	2024-11-23 02:00:23.897336000 +0000
+++ C:/cirrus/build/testrun/regress/regress/results/indexing.out	2024-11-23 02:03:57.619150400 +0000
@@ -77,7 +77,6 @@
 Partition key: RANGE (a)
 Indexes:
     "idxpart_a_idx" btree (a)
-    "idxpart_a_idx1" UNIQUE, btree (a) INVALID
 Number of partitions: 3 (Use \d+ to list them.)
 
 \d idxpart1
@@ -91,7 +90,6 @@
 Partition key: RANGE (a)
 Indexes:
     "idxpart1_a_idx" btree (a)
-    "idxpart1_a_idx1" UNIQUE, btree (a) INVALID
 Number of partitions: 1 (Use \d+ to list them.)
 
 \d idxpart11
@@ -105,7 +103,6 @@
...

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/jsonb_jsonpath.out /tmp/cirrus-ci-build/build-32/testrun/pg_upgr...
--- /tmp/cirrus-ci-build/src/test/regress/expected/jsonb_jsonpath.out	2024-11-22 22:43:29.491391115 +0000
+++ /tmp/cirrus-ci-build/build-32/testrun/pg_upgrade/002_pg_upgrade/data/results/jsonb_jsonpath.out	2024-11-22 22:49:38....
@@ -3082,7 +3082,7 @@
 select jsonb_path_query('"abc~@~def~@~ghi"', '$.split_part("~@~", 2)');
  jsonb_path_query 
 ------------------
- "def"
+ ""
 (1 row)
 
 -- Test string methods play nicely together

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/jsonb_jsonpath.out /tmp/cirrus-ci-build/build-32/testrun/recover...
--- /tmp/cirrus-ci-build/src/test/regress/expected/jsonb_jsonpath.out	2024-11-22 22:43:29.491391115 +0000
+++ /tmp/cirrus-ci-build/build-32/testrun/recovery/027_stream_regress/data/results/jsonb_jsonpath.out	2024-11-22 22:50:2...
@@ -3082,7 +3082,7 @@
 select jsonb_path_query('"abc~@~def~@~ghi"', '$.split_part("~@~", 2)');
  jsonb_path_query 
 ------------------
- "def"
+ ""
 (1 row)
 
 -- Test string methods play nicely together

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/jsonb_jsonpath.out /tmp/cirrus-ci-build/build-32/testrun/regress...
--- /tmp/cirrus-ci-build/src/test/regress/expected/jsonb_jsonpath.out	2024-11-22 22:43:29.491391115 +0000
+++ /tmp/cirrus-ci-build/build-32/testrun/regress/regress/results/jsonb_jsonpath.out	2024-11-22 22:49:33.173582766 +0000
@@ -3082,7 +3082,7 @@
 select jsonb_path_query('"abc~@~def~@~ghi"', '$.split_part("~@~", 2)');
  jsonb_path_query 
 ------------------
- "def"
+ ""
 (1 row)
 
 -- Test string methods play nicely together

diff -U3 /tmp/cirrus-ci-build/contrib/btree_gist/expected/partitions.out /tmp/cirrus-ci-build/build/testrun/btree_gist/r...
--- /tmp/cirrus-ci-build/contrib/btree_gist/expected/partitions.out	2024-11-22 18:50:42.679424000 +0000
+++ /tmp/cirrus-ci-build/build/testrun/btree_gist/regress/results/partitions.out	2024-11-22 18:54:18.228639000 +0000
@@ -11,9 +11,7 @@
 ) partition by range (id);
 create table parttmp_1_to_10 partition of parttmp for values from (1) to (10);
 NOTICE:  notice triggered for injection point btree-gist-sorted-build
-NOTICE:  notice triggered for injection point btree-gist-sorted-build
 create table parttmp_11_to_20 partition of parttmp for values from (11) to (20);
-NOTICE:  notice triggered for injection point btree-gist-sorted-build
 NOTICE:  notice triggered for injection point btree-gist-sorted-build
 insert into parttmp (id, valid_at) values
   (1, '[2000-01-01, 2000-02-01)'),
diff -U3 /tmp/cirrus-ci-build/contrib/btree_gist/expected/without_overlaps.out /tmp/cirrus-ci-build/build/testrun/btree_...
--- /tmp/cirrus-ci-build/contrib/btree_gist/expected/without_overlaps.out	2024-11-22 18:50:42.682871000 +0000
+++ /tmp/cirrus-ci-build/build/testrun/btree_gist/regress/results/without_overlaps.out	2024-11-22 18:54:18.556376000 +00...
@@ -9,7 +9,6 @@
   CONSTRAINT temporal_rng_pk PRIMARY KEY (id, valid_at WITHOUT OVERLAPS)
 );
 NOTICE:  notice triggered for injection point btree-gist-sorted-build
...

diff -U3 /tmp/cirrus-ci-build/contrib/btree_gist/expected/partitions.out /tmp/cirrus-ci-build/build/testrun/btree_gist/r...
--- /tmp/cirrus-ci-build/contrib/btree_gist/expected/partitions.out	2024-11-22 18:50:40.113914612 +0000
+++ /tmp/cirrus-ci-build/build/testrun/btree_gist/regress/results/partitions.out	2024-11-22 18:56:57.787911083 +0000
@@ -11,10 +11,8 @@
 ) partition by range (id);
 create table parttmp_1_to_10 partition of parttmp for values from (1) to (10);
 NOTICE:  notice triggered for injection point btree-gist-sorted-build
-NOTICE:  notice triggered for injection point btree-gist-sorted-build
 create table parttmp_11_to_20 partition of parttmp for values from (11) to (20);
 NOTICE:  notice triggered for injection point btree-gist-sorted-build
-NOTICE:  notice triggered for injection point btree-gist-sorted-build
 insert into parttmp (id, valid_at) values
   (1, '[2000-01-01, 2000-02-01)'),
   (1, '[2000-02-01, 2000-03-01)'),
diff -U3 /tmp/cirrus-ci-build/contrib/btree_gist/expected/without_overlaps.out /tmp/cirrus-ci-build/build/testrun/btree_...
--- /tmp/cirrus-ci-build/contrib/btree_gist/expected/without_overlaps.out	2024-11-22 18:50:40.117906133 +0000
+++ /tmp/cirrus-ci-build/build/testrun/btree_gist/regress/results/without_overlaps.out	2024-11-22 18:56:58.023909765 +00...
@@ -9,7 +9,6 @@
   CONSTRAINT temporal_rng_pk PRIMARY KEY (id, valid_at WITHOUT OVERLAPS)
 );
...

diff -U3 /Users/admin/pgsql/contrib/btree_gist/expected/partitions.out /Users/admin/pgsql/build/testrun/btree_gist/regre...
--- /Users/admin/pgsql/contrib/btree_gist/expected/partitions.out	2024-11-22 18:49:10
+++ /Users/admin/pgsql/build/testrun/btree_gist/regress/results/partitions.out	2024-11-22 18:52:48
@@ -11,10 +11,8 @@
 ) partition by range (id);
 create table parttmp_1_to_10 partition of parttmp for values from (1) to (10);
 NOTICE:  notice triggered for injection point btree-gist-sorted-build
-NOTICE:  notice triggered for injection point btree-gist-sorted-build
 create table parttmp_11_to_20 partition of parttmp for values from (11) to (20);
 NOTICE:  notice triggered for injection point btree-gist-sorted-build
-NOTICE:  notice triggered for injection point btree-gist-sorted-build
 insert into parttmp (id, valid_at) values
   (1, '[2000-01-01, 2000-02-01)'),
   (1, '[2000-02-01, 2000-03-01)'),
diff -U3 /Users/admin/pgsql/contrib/btree_gist/expected/without_overlaps.out /Users/admin/pgsql/build/testrun/btree_gist...
--- /Users/admin/pgsql/contrib/btree_gist/expected/without_overlaps.out	2024-11-22 18:49:10
+++ /Users/admin/pgsql/build/testrun/btree_gist/regress/results/without_overlaps.out	2024-11-22 18:52:48
@@ -9,7 +9,6 @@
   CONSTRAINT temporal_rng_pk PRIMARY KEY (id, valid_at WITHOUT OVERLAPS)
 );
...

diff --strip-trailing-cr -U3 C:/cirrus/contrib/btree_gist/expected/partitions.out C:/cirrus/build/testrun/btree_gist/reg...
--- C:/cirrus/contrib/btree_gist/expected/partitions.out	2024-11-22 18:51:17.259336500 +0000
+++ C:/cirrus/build/testrun/btree_gist/regress/results/partitions.out	2024-11-22 18:57:41.735757500 +0000
@@ -11,10 +11,8 @@
 ) partition by range (id);
 create table parttmp_1_to_10 partition of parttmp for values from (1) to (10);
 NOTICE:  notice triggered for injection point btree-gist-sorted-build
-NOTICE:  notice triggered for injection point btree-gist-sorted-build
 create table parttmp_11_to_20 partition of parttmp for values from (11) to (20);
 NOTICE:  notice triggered for injection point btree-gist-sorted-build
-NOTICE:  notice triggered for injection point btree-gist-sorted-build
 insert into parttmp (id, valid_at) values
   (1, '[2000-01-01, 2000-02-01)'),
   (1, '[2000-02-01, 2000-03-01)'),
diff --strip-trailing-cr -U3 C:/cirrus/contrib/btree_gist/expected/without_overlaps.out C:/cirrus/build/testrun/btree_gi...
--- C:/cirrus/contrib/btree_gist/expected/without_overlaps.out	2024-11-22 18:51:17.279335300 +0000
+++ C:/cirrus/build/testrun/btree_gist/regress/results/without_overlaps.out	2024-11-22 18:57:43.207938400 +0000
@@ -9,7 +9,6 @@
   CONSTRAINT temporal_rng_pk PRIMARY KEY (id, valid_at WITHOUT OVERLAPS)
 );
...

diff -U3 /tmp/cirrus-ci-build/contrib/file_fdw/expected/file_fdw.out /tmp/cirrus-ci-build/build/testrun/file_fdw/regress...
--- /tmp/cirrus-ci-build/contrib/file_fdw/expected/file_fdw.out	2024-11-22 16:40:21.885542000 +0000
+++ /tmp/cirrus-ci-build/build/testrun/file_fdw/regress/results/file_fdw.out	2024-11-22 16:42:33.102496000 +0000
@@ -91,7 +91,7 @@
 ');       -- ERROR
 ERROR:  COPY null representation cannot use newline or carriage return
 CREATE FOREIGN TABLE tbl () SERVER file_server OPTIONS (reject_limit '1');       -- ERROR
-ERROR:  COPY REJECT_LIMIT requires ON_ERROR to be set to IGNORE
+ERROR:  COPY REJECT_LIMIT requires ON_ERROR to be set to IGNORE or SET_TO_NULL
 CREATE FOREIGN TABLE tbl () SERVER file_server;  -- ERROR
 ERROR:  either filename or program is required for file_fdw foreign tables
 \set filename :abs_srcdir '/data/agg.data'

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/copy2.out /tmp/cirrus-ci-build/build/testrun/pg_upgrade/002_pg_u...
--- /tmp/cirrus-ci-build/src/test/regress/expected/copy2.out	2024-11-22 16:40:23.434482000 +0000
+++ /tmp/cirrus-ci-build/build/testrun/pg_upgrade/002_pg_upgrade/data/results/copy2.out	2024-11-22 16:41:55.749962000 +0...
@@ -800,12 +800,12 @@
 --fail
 COPY t_on_error_null FROM STDIN WITH (on_error set_to_null);
 ERROR:  failed to replace column containing erroneous data with null
-HINT:  Consider specifying the REJECT LIMIT option to skip erroneous rows.
+HINT:  Consider specifying the REJECT_LIMIT option to skip erroneous rows.
 CONTEXT:  COPY t_on_error_null, line 1, column a: "a"
 --fail
 COPY t_on_error_null FROM STDIN WITH (on_error set_to_null);
 ERROR:  failed to replace column containing erroneous data with null
-HINT:  Consider specifying the REJECT LIMIT option to skip erroneous rows.
+HINT:  Consider specifying the REJECT_LIMIT option to skip erroneous rows.
 CONTEXT:  COPY t_on_error_null, line 1, column a: "-1"
 --ok. Check interaction with REJECT LIMIT
 COPY t_on_error_null FROM STDIN WITH (on_error set_to_null, reject_limit 2);
@@ -835,7 +835,7 @@
 NOTICE:  failed to replace row attribute "l" with NULL at line 1.
...

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/copy2.out /tmp/cirrus-ci-build/build/testrun/recovery/027_stream...
--- /tmp/cirrus-ci-build/src/test/regress/expected/copy2.out	2024-11-22 16:40:23.434482000 +0000
+++ /tmp/cirrus-ci-build/build/testrun/recovery/027_stream_regress/data/results/copy2.out	2024-11-22 16:42:51.824883000 ...
@@ -800,12 +800,12 @@
 --fail
 COPY t_on_error_null FROM STDIN WITH (on_error set_to_null);
 ERROR:  failed to replace column containing erroneous data with null
-HINT:  Consider specifying the REJECT LIMIT option to skip erroneous rows.
+HINT:  Consider specifying the REJECT_LIMIT option to skip erroneous rows.
 CONTEXT:  COPY t_on_error_null, line 1, column a: "a"
 --fail
 COPY t_on_error_null FROM STDIN WITH (on_error set_to_null);
 ERROR:  failed to replace column containing erroneous data with null
-HINT:  Consider specifying the REJECT LIMIT option to skip erroneous rows.
+HINT:  Consider specifying the REJECT_LIMIT option to skip erroneous rows.
 CONTEXT:  COPY t_on_error_null, line 1, column a: "-1"
 --ok. Check interaction with REJECT LIMIT
 COPY t_on_error_null FROM STDIN WITH (on_error set_to_null, reject_limit 2);
@@ -835,7 +835,7 @@
 NOTICE:  failed to replace row attribute "l" with NULL at line 1.
...

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/copy2.out /tmp/cirrus-ci-build/build/testrun/regress/regress/res...
--- /tmp/cirrus-ci-build/src/test/regress/expected/copy2.out	2024-11-22 16:40:23.434482000 +0000
+++ /tmp/cirrus-ci-build/build/testrun/regress/regress/results/copy2.out	2024-11-22 16:41:57.560055000 +0000
@@ -800,12 +800,12 @@
 --fail
 COPY t_on_error_null FROM STDIN WITH (on_error set_to_null);
 ERROR:  failed to replace column containing erroneous data with null
-HINT:  Consider specifying the REJECT LIMIT option to skip erroneous rows.
+HINT:  Consider specifying the REJECT_LIMIT option to skip erroneous rows.
 CONTEXT:  COPY t_on_error_null, line 1, column a: "a"
 --fail
 COPY t_on_error_null FROM STDIN WITH (on_error set_to_null);
 ERROR:  failed to replace column containing erroneous data with null
-HINT:  Consider specifying the REJECT LIMIT option to skip erroneous rows.
+HINT:  Consider specifying the REJECT_LIMIT option to skip erroneous rows.
 CONTEXT:  COPY t_on_error_null, line 1, column a: "-1"
 --ok. Check interaction with REJECT LIMIT
 COPY t_on_error_null FROM STDIN WITH (on_error set_to_null, reject_limit 2);
@@ -835,7 +835,7 @@
 NOTICE:  failed to replace row attribute "l" with NULL at line 1.
...

diff -U3 /tmp/cirrus-ci-build/contrib/file_fdw/expected/file_fdw.out /tmp/cirrus-ci-build/contrib/file_fdw/results/file_...
--- /tmp/cirrus-ci-build/contrib/file_fdw/expected/file_fdw.out	2024-11-22 16:40:17.896828721 +0000
+++ /tmp/cirrus-ci-build/contrib/file_fdw/results/file_fdw.out	2024-11-22 16:44:15.660610029 +0000
@@ -91,7 +91,7 @@
 ');       -- ERROR
 ERROR:  COPY null representation cannot use newline or carriage return
 CREATE FOREIGN TABLE tbl () SERVER file_server OPTIONS (reject_limit '1');       -- ERROR
-ERROR:  COPY REJECT_LIMIT requires ON_ERROR to be set to IGNORE
+ERROR:  COPY REJECT_LIMIT requires ON_ERROR to be set to IGNORE or SET_TO_NULL
 CREATE FOREIGN TABLE tbl () SERVER file_server;  -- ERROR
 ERROR:  either filename or program is required for file_fdw foreign tables
 \set filename :abs_srcdir '/data/agg.data'

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/copy2.out /tmp/cirrus-ci-build/src/bin/pg_upgrade/tmp_check/resu...
--- /tmp/cirrus-ci-build/src/test/regress/expected/copy2.out	2024-11-22 16:40:20.059359746 +0000
+++ /tmp/cirrus-ci-build/src/bin/pg_upgrade/tmp_check/results/copy2.out	2024-11-22 16:46:27.888502792 +0000
@@ -800,12 +800,12 @@
 --fail
 COPY t_on_error_null FROM STDIN WITH (on_error set_to_null);
 ERROR:  failed to replace column containing erroneous data with null
-HINT:  Consider specifying the REJECT LIMIT option to skip erroneous rows.
+HINT:  Consider specifying the REJECT_LIMIT option to skip erroneous rows.
 CONTEXT:  COPY t_on_error_null, line 1, column a: "a"
 --fail
 COPY t_on_error_null FROM STDIN WITH (on_error set_to_null);
 ERROR:  failed to replace column containing erroneous data with null
-HINT:  Consider specifying the REJECT LIMIT option to skip erroneous rows.
+HINT:  Consider specifying the REJECT_LIMIT option to skip erroneous rows.
 CONTEXT:  COPY t_on_error_null, line 1, column a: "-1"
 --ok. Check interaction with REJECT LIMIT
 COPY t_on_error_null FROM STDIN WITH (on_error set_to_null, reject_limit 2);
@@ -835,7 +835,7 @@
 NOTICE:  failed to replace row attribute "l" with NULL at line 1.
...

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/copy2.out /tmp/cirrus-ci-build/src/test/recovery/tmp_check/resul...
--- /tmp/cirrus-ci-build/src/test/regress/expected/copy2.out	2024-11-22 16:40:20.059359746 +0000
+++ /tmp/cirrus-ci-build/src/test/recovery/tmp_check/results/copy2.out	2024-11-22 16:47:53.540259593 +0000
@@ -800,12 +800,12 @@
 --fail
 COPY t_on_error_null FROM STDIN WITH (on_error set_to_null);
 ERROR:  failed to replace column containing erroneous data with null
-HINT:  Consider specifying the REJECT LIMIT option to skip erroneous rows.
+HINT:  Consider specifying the REJECT_LIMIT option to skip erroneous rows.
 CONTEXT:  COPY t_on_error_null, line 1, column a: "a"
 --fail
 COPY t_on_error_null FROM STDIN WITH (on_error set_to_null);
 ERROR:  failed to replace column containing erroneous data with null
-HINT:  Consider specifying the REJECT LIMIT option to skip erroneous rows.
+HINT:  Consider specifying the REJECT_LIMIT option to skip erroneous rows.
 CONTEXT:  COPY t_on_error_null, line 1, column a: "-1"
 --ok. Check interaction with REJECT LIMIT
 COPY t_on_error_null FROM STDIN WITH (on_error set_to_null, reject_limit 2);
@@ -835,7 +835,7 @@
 NOTICE:  failed to replace row attribute "l" with NULL at line 1.
...

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/copy2.out /tmp/cirrus-ci-build/src/test/regress/results/copy2.ou...
--- /tmp/cirrus-ci-build/src/test/regress/expected/copy2.out	2024-11-22 16:40:20.059359746 +0000
+++ /tmp/cirrus-ci-build/src/test/regress/results/copy2.out	2024-11-22 16:43:48.384516657 +0000
@@ -800,12 +800,12 @@
 --fail
 COPY t_on_error_null FROM STDIN WITH (on_error set_to_null);
 ERROR:  failed to replace column containing erroneous data with null
-HINT:  Consider specifying the REJECT LIMIT option to skip erroneous rows.
+HINT:  Consider specifying the REJECT_LIMIT option to skip erroneous rows.
 CONTEXT:  COPY t_on_error_null, line 1, column a: "a"
 --fail
 COPY t_on_error_null FROM STDIN WITH (on_error set_to_null);
 ERROR:  failed to replace column containing erroneous data with null
-HINT:  Consider specifying the REJECT LIMIT option to skip erroneous rows.
+HINT:  Consider specifying the REJECT_LIMIT option to skip erroneous rows.
 CONTEXT:  COPY t_on_error_null, line 1, column a: "-1"
 --ok. Check interaction with REJECT LIMIT
 COPY t_on_error_null FROM STDIN WITH (on_error set_to_null, reject_limit 2);
@@ -835,7 +835,7 @@
 NOTICE:  failed to replace row attribute "l" with NULL at line 1.
...

diff -U3 /tmp/cirrus-ci-build/contrib/file_fdw/expected/file_fdw.out /tmp/cirrus-ci-build/build/testrun/file_fdw/regress...
--- /tmp/cirrus-ci-build/contrib/file_fdw/expected/file_fdw.out	2024-11-22 16:40:15.747059546 +0000
+++ /tmp/cirrus-ci-build/build/testrun/file_fdw/regress/results/file_fdw.out	2024-11-22 16:43:17.106173088 +0000
@@ -91,7 +91,7 @@
 ');       -- ERROR
 ERROR:  COPY null representation cannot use newline or carriage return
 CREATE FOREIGN TABLE tbl () SERVER file_server OPTIONS (reject_limit '1');       -- ERROR
-ERROR:  COPY REJECT_LIMIT requires ON_ERROR to be set to IGNORE
+ERROR:  COPY REJECT_LIMIT requires ON_ERROR to be set to IGNORE or SET_TO_NULL
 CREATE FOREIGN TABLE tbl () SERVER file_server;  -- ERROR
 ERROR:  either filename or program is required for file_fdw foreign tables
 \set filename :abs_srcdir '/data/agg.data'

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/copy2.out /tmp/cirrus-ci-build/build/testrun/pg_upgrade/002_pg_u...
--- /tmp/cirrus-ci-build/src/test/regress/expected/copy2.out	2024-11-22 16:40:17.575059475 +0000
+++ /tmp/cirrus-ci-build/build/testrun/pg_upgrade/002_pg_upgrade/data/results/copy2.out	2024-11-22 16:42:52.962173537 +0...
@@ -800,12 +800,12 @@
 --fail
 COPY t_on_error_null FROM STDIN WITH (on_error set_to_null);
 ERROR:  failed to replace column containing erroneous data with null
-HINT:  Consider specifying the REJECT LIMIT option to skip erroneous rows.
+HINT:  Consider specifying the REJECT_LIMIT option to skip erroneous rows.
 CONTEXT:  COPY t_on_error_null, line 1, column a: "a"
 --fail
 COPY t_on_error_null FROM STDIN WITH (on_error set_to_null);
 ERROR:  failed to replace column containing erroneous data with null
-HINT:  Consider specifying the REJECT LIMIT option to skip erroneous rows.
+HINT:  Consider specifying the REJECT_LIMIT option to skip erroneous rows.
 CONTEXT:  COPY t_on_error_null, line 1, column a: "-1"
 --ok. Check interaction with REJECT LIMIT
 COPY t_on_error_null FROM STDIN WITH (on_error set_to_null, reject_limit 2);
@@ -835,7 +835,7 @@
 NOTICE:  failed to replace row attribute "l" with NULL at line 1.
...

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/copy2.out /tmp/cirrus-ci-build/build/testrun/recovery/027_stream...
--- /tmp/cirrus-ci-build/src/test/regress/expected/copy2.out	2024-11-22 16:40:17.575059475 +0000
+++ /tmp/cirrus-ci-build/build/testrun/recovery/027_stream_regress/data/results/copy2.out	2024-11-22 16:43:31.838172764 ...
@@ -800,12 +800,12 @@
 --fail
 COPY t_on_error_null FROM STDIN WITH (on_error set_to_null);
 ERROR:  failed to replace column containing erroneous data with null
-HINT:  Consider specifying the REJECT LIMIT option to skip erroneous rows.
+HINT:  Consider specifying the REJECT_LIMIT option to skip erroneous rows.
 CONTEXT:  COPY t_on_error_null, line 1, column a: "a"
 --fail
 COPY t_on_error_null FROM STDIN WITH (on_error set_to_null);
 ERROR:  failed to replace column containing erroneous data with null
-HINT:  Consider specifying the REJECT LIMIT option to skip erroneous rows.
+HINT:  Consider specifying the REJECT_LIMIT option to skip erroneous rows.
 CONTEXT:  COPY t_on_error_null, line 1, column a: "-1"
 --ok. Check interaction with REJECT LIMIT
 COPY t_on_error_null FROM STDIN WITH (on_error set_to_null, reject_limit 2);
@@ -835,7 +835,7 @@
 NOTICE:  failed to replace row attribute "l" with NULL at line 1.
...

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/copy2.out /tmp/cirrus-ci-build/build/testrun/regress/regress/res...
--- /tmp/cirrus-ci-build/src/test/regress/expected/copy2.out	2024-11-22 16:40:17.575059475 +0000
+++ /tmp/cirrus-ci-build/build/testrun/regress/regress/results/copy2.out	2024-11-22 16:42:49.134173595 +0000
@@ -800,12 +800,12 @@
 --fail
 COPY t_on_error_null FROM STDIN WITH (on_error set_to_null);
 ERROR:  failed to replace column containing erroneous data with null
-HINT:  Consider specifying the REJECT LIMIT option to skip erroneous rows.
+HINT:  Consider specifying the REJECT_LIMIT option to skip erroneous rows.
 CONTEXT:  COPY t_on_error_null, line 1, column a: "a"
 --fail
 COPY t_on_error_null FROM STDIN WITH (on_error set_to_null);
 ERROR:  failed to replace column containing erroneous data with null
-HINT:  Consider specifying the REJECT LIMIT option to skip erroneous rows.
+HINT:  Consider specifying the REJECT_LIMIT option to skip erroneous rows.
 CONTEXT:  COPY t_on_error_null, line 1, column a: "-1"
 --ok. Check interaction with REJECT LIMIT
 COPY t_on_error_null FROM STDIN WITH (on_error set_to_null, reject_limit 2);
@@ -835,7 +835,7 @@
 NOTICE:  failed to replace row attribute "l" with NULL at line 1.
...

diff -U3 /Users/admin/pgsql/contrib/file_fdw/expected/file_fdw.out /Users/admin/pgsql/build/testrun/file_fdw/regress/res...
--- /Users/admin/pgsql/contrib/file_fdw/expected/file_fdw.out	2024-11-22 16:40:10
+++ /Users/admin/pgsql/build/testrun/file_fdw/regress/results/file_fdw.out	2024-11-22 16:42:50
@@ -91,7 +91,7 @@
 ');       -- ERROR
 ERROR:  COPY null representation cannot use newline or carriage return
 CREATE FOREIGN TABLE tbl () SERVER file_server OPTIONS (reject_limit '1');       -- ERROR
-ERROR:  COPY REJECT_LIMIT requires ON_ERROR to be set to IGNORE
+ERROR:  COPY REJECT_LIMIT requires ON_ERROR to be set to IGNORE or SET_TO_NULL
 CREATE FOREIGN TABLE tbl () SERVER file_server;  -- ERROR
 ERROR:  either filename or program is required for file_fdw foreign tables
 \set filename :abs_srcdir '/data/agg.data'

diff -U3 /Users/admin/pgsql/src/test/regress/expected/copy2.out /Users/admin/pgsql/build/testrun/pg_upgrade/002_pg_upgra...
--- /Users/admin/pgsql/src/test/regress/expected/copy2.out	2024-11-22 16:40:12
+++ /Users/admin/pgsql/build/testrun/pg_upgrade/002_pg_upgrade/data/results/copy2.out	2024-11-22 16:42:00
@@ -800,12 +800,12 @@
 --fail
 COPY t_on_error_null FROM STDIN WITH (on_error set_to_null);
 ERROR:  failed to replace column containing erroneous data with null
-HINT:  Consider specifying the REJECT LIMIT option to skip erroneous rows.
+HINT:  Consider specifying the REJECT_LIMIT option to skip erroneous rows.
 CONTEXT:  COPY t_on_error_null, line 1, column a: "a"
 --fail
 COPY t_on_error_null FROM STDIN WITH (on_error set_to_null);
 ERROR:  failed to replace column containing erroneous data with null
-HINT:  Consider specifying the REJECT LIMIT option to skip erroneous rows.
+HINT:  Consider specifying the REJECT_LIMIT option to skip erroneous rows.
 CONTEXT:  COPY t_on_error_null, line 1, column a: "-1"
 --ok. Check interaction with REJECT LIMIT
 COPY t_on_error_null FROM STDIN WITH (on_error set_to_null, reject_limit 2);
@@ -835,7 +835,7 @@
 NOTICE:  failed to replace row attribute "l" with NULL at line 1.
...

diff -U3 /Users/admin/pgsql/src/test/regress/expected/copy2.out /Users/admin/pgsql/build/testrun/recovery/027_stream_reg...
--- /Users/admin/pgsql/src/test/regress/expected/copy2.out	2024-11-22 16:40:12
+++ /Users/admin/pgsql/build/testrun/recovery/027_stream_regress/data/results/copy2.out	2024-11-22 16:42:53
@@ -800,12 +800,12 @@
 --fail
 COPY t_on_error_null FROM STDIN WITH (on_error set_to_null);
 ERROR:  failed to replace column containing erroneous data with null
-HINT:  Consider specifying the REJECT LIMIT option to skip erroneous rows.
+HINT:  Consider specifying the REJECT_LIMIT option to skip erroneous rows.
 CONTEXT:  COPY t_on_error_null, line 1, column a: "a"
 --fail
 COPY t_on_error_null FROM STDIN WITH (on_error set_to_null);
 ERROR:  failed to replace column containing erroneous data with null
-HINT:  Consider specifying the REJECT LIMIT option to skip erroneous rows.
+HINT:  Consider specifying the REJECT_LIMIT option to skip erroneous rows.
 CONTEXT:  COPY t_on_error_null, line 1, column a: "-1"
 --ok. Check interaction with REJECT LIMIT
 COPY t_on_error_null FROM STDIN WITH (on_error set_to_null, reject_limit 2);
@@ -835,7 +835,7 @@
 NOTICE:  failed to replace row attribute "l" with NULL at line 1.
...

diff -U3 /Users/admin/pgsql/src/test/regress/expected/copy2.out /Users/admin/pgsql/build/testrun/regress/regress/results...
--- /Users/admin/pgsql/src/test/regress/expected/copy2.out	2024-11-22 16:40:12
+++ /Users/admin/pgsql/build/testrun/regress/regress/results/copy2.out	2024-11-22 16:42:02
@@ -800,12 +800,12 @@
 --fail
 COPY t_on_error_null FROM STDIN WITH (on_error set_to_null);
 ERROR:  failed to replace column containing erroneous data with null
-HINT:  Consider specifying the REJECT LIMIT option to skip erroneous rows.
+HINT:  Consider specifying the REJECT_LIMIT option to skip erroneous rows.
 CONTEXT:  COPY t_on_error_null, line 1, column a: "a"
 --fail
 COPY t_on_error_null FROM STDIN WITH (on_error set_to_null);
 ERROR:  failed to replace column containing erroneous data with null
-HINT:  Consider specifying the REJECT LIMIT option to skip erroneous rows.
+HINT:  Consider specifying the REJECT_LIMIT option to skip erroneous rows.
 CONTEXT:  COPY t_on_error_null, line 1, column a: "-1"
 --ok. Check interaction with REJECT LIMIT
 COPY t_on_error_null FROM STDIN WITH (on_error set_to_null, reject_limit 2);
@@ -835,7 +835,7 @@
 NOTICE:  failed to replace row attribute "l" with NULL at line 1.
...

diff --strip-trailing-cr -U3 C:/cirrus/contrib/file_fdw/expected/file_fdw.out C:/cirrus/build/testrun/file_fdw/regress/r...
--- C:/cirrus/contrib/file_fdw/expected/file_fdw.out	2024-11-22 16:41:19.254946600 +0000
+++ C:/cirrus/build/testrun/file_fdw/regress/results/file_fdw.out	2024-11-22 16:47:18.338613500 +0000
@@ -91,7 +91,7 @@
 ');       -- ERROR
 ERROR:  COPY null representation cannot use newline or carriage return
 CREATE FOREIGN TABLE tbl () SERVER file_server OPTIONS (reject_limit '1');       -- ERROR
-ERROR:  COPY REJECT_LIMIT requires ON_ERROR to be set to IGNORE
+ERROR:  COPY REJECT_LIMIT requires ON_ERROR to be set to IGNORE or SET_TO_NULL
 CREATE FOREIGN TABLE tbl () SERVER file_server;  -- ERROR
 ERROR:  either filename or program is required for file_fdw foreign tables
 \set filename :abs_srcdir '/data/agg.data'

diff --strip-trailing-cr -U3 C:/cirrus/src/test/regress/expected/copy2.out C:/cirrus/build/testrun/pg_upgrade/002_pg_upg...
--- C:/cirrus/src/test/regress/expected/copy2.out	2024-11-22 16:41:23.783718900 +0000
+++ C:/cirrus/build/testrun/pg_upgrade/002_pg_upgrade/data/results/copy2.out	2024-11-22 16:45:06.007558500 +0000
@@ -800,12 +800,12 @@
 --fail
 COPY t_on_error_null FROM STDIN WITH (on_error set_to_null);
 ERROR:  failed to replace column containing erroneous data with null
-HINT:  Consider specifying the REJECT LIMIT option to skip erroneous rows.
+HINT:  Consider specifying the REJECT_LIMIT option to skip erroneous rows.
 CONTEXT:  COPY t_on_error_null, line 1, column a: "a"
 --fail
 COPY t_on_error_null FROM STDIN WITH (on_error set_to_null);
 ERROR:  failed to replace column containing erroneous data with null
-HINT:  Consider specifying the REJECT LIMIT option to skip erroneous rows.
+HINT:  Consider specifying the REJECT_LIMIT option to skip erroneous rows.
 CONTEXT:  COPY t_on_error_null, line 1, column a: "-1"
 --ok. Check interaction with REJECT LIMIT
 COPY t_on_error_null FROM STDIN WITH (on_error set_to_null, reject_limit 2);
@@ -835,7 +835,7 @@
 NOTICE:  failed to replace row attribute "l" with NULL at line 1.
...

diff --strip-trailing-cr -U3 C:/cirrus/src/test/regress/expected/copy2.out C:/cirrus/build/testrun/recovery/027_stream_r...
--- C:/cirrus/src/test/regress/expected/copy2.out	2024-11-22 16:41:23.783718900 +0000
+++ C:/cirrus/build/testrun/recovery/027_stream_regress/data/results/copy2.out	2024-11-22 16:47:23.868402600 +0000
@@ -800,12 +800,12 @@
 --fail
 COPY t_on_error_null FROM STDIN WITH (on_error set_to_null);
 ERROR:  failed to replace column containing erroneous data with null
-HINT:  Consider specifying the REJECT LIMIT option to skip erroneous rows.
+HINT:  Consider specifying the REJECT_LIMIT option to skip erroneous rows.
 CONTEXT:  COPY t_on_error_null, line 1, column a: "a"
 --fail
 COPY t_on_error_null FROM STDIN WITH (on_error set_to_null);
 ERROR:  failed to replace column containing erroneous data with null
-HINT:  Consider specifying the REJECT LIMIT option to skip erroneous rows.
+HINT:  Consider specifying the REJECT_LIMIT option to skip erroneous rows.
 CONTEXT:  COPY t_on_error_null, line 1, column a: "-1"
 --ok. Check interaction with REJECT LIMIT
 COPY t_on_error_null FROM STDIN WITH (on_error set_to_null, reject_limit 2);
@@ -835,7 +835,7 @@
 NOTICE:  failed to replace row attribute "l" with NULL at line 1.
...

diff --strip-trailing-cr -U3 C:/cirrus/src/test/regress/expected/copy2.out C:/cirrus/build/testrun/regress/regress/resul...
--- C:/cirrus/src/test/regress/expected/copy2.out	2024-11-22 16:41:23.783718900 +0000
+++ C:/cirrus/build/testrun/regress/regress/results/copy2.out	2024-11-22 16:45:00.717030900 +0000
@@ -800,12 +800,12 @@
 --fail
 COPY t_on_error_null FROM STDIN WITH (on_error set_to_null);
 ERROR:  failed to replace column containing erroneous data with null
-HINT:  Consider specifying the REJECT LIMIT option to skip erroneous rows.
+HINT:  Consider specifying the REJECT_LIMIT option to skip erroneous rows.
 CONTEXT:  COPY t_on_error_null, line 1, column a: "a"
 --fail
 COPY t_on_error_null FROM STDIN WITH (on_error set_to_null);
 ERROR:  failed to replace column containing erroneous data with null
-HINT:  Consider specifying the REJECT LIMIT option to skip erroneous rows.
+HINT:  Consider specifying the REJECT_LIMIT option to skip erroneous rows.
 CONTEXT:  COPY t_on_error_null, line 1, column a: "-1"
 --ok. Check interaction with REJECT LIMIT
 COPY t_on_error_null FROM STDIN WITH (on_error set_to_null, reject_limit 2);
@@ -835,7 +835,7 @@
 NOTICE:  failed to replace row attribute "l" with NULL at line 1.
...

diff -U3 /tmp/cirrus-ci-build/contrib/pgcrypto/expected/init.out /tmp/cirrus-ci-build/build/testrun/pgcrypto/regress/res...
--- /tmp/cirrus-ci-build/contrib/pgcrypto/expected/init.out	2024-11-22 14:48:14.681421000 +0000
+++ /tmp/cirrus-ci-build/build/testrun/pgcrypto/regress/results/init.out	2024-11-22 14:50:48.214294000 +0000
@@ -2,12 +2,30 @@
 -- init pgcrypto
 --
 CREATE EXTENSION pgcrypto;
+ERROR:  could not load library "/tmp/cirrus-ci-build/build/tmp_install/usr/local/pgsql/lib/pgcrypto.so": /tmp/cirrus-ci...
+CONTEXT:  SQL statement "CREATE FUNCTION digest(text, text)
+RETURNS bytea
+AS '$libdir/pgcrypto', 'pg_digest'
+LANGUAGE C IMMUTABLE STRICT PARALLEL SAFE"
+extension script file "pgcrypto--1.3.sql", near line 6
 -- check error handling
 select gen_salt('foo');
-ERROR:  gen_salt: Unknown salt algorithm
+ERROR:  function gen_salt(unknown) does not exist
+LINE 1: select gen_salt('foo');
+               ^
+HINT:  No function matches the given name and argument types. You might need to add explicit type casts.
...

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/sysviews.out /tmp/cirrus-ci-build/build-32/testrun/pg_upgrade/00...
--- /tmp/cirrus-ci-build/src/test/regress/expected/sysviews.out	2024-11-22 13:42:13.706541930 +0000
+++ /tmp/cirrus-ci-build/build-32/testrun/pg_upgrade/002_pg_upgrade/data/results/sysviews.out	2024-11-22 13:52:16.664049...
@@ -233,4 +233,4 @@
         from pg_get_process_memory_contexts(checkpointer_pid, false) where path = '{0}' into r; 
 	RAISE NOTICE '%', r;
 END $$;
-NOTICE:  (AllocSet,TopMemoryContext,,t)
+NOTICE:  (AllocSet,TopMemoryContext,,f)

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/sysviews.out /tmp/cirrus-ci-build/build-32/testrun/recovery/027_...
--- /tmp/cirrus-ci-build/src/test/regress/expected/sysviews.out	2024-11-22 13:42:13.706541930 +0000
+++ /tmp/cirrus-ci-build/build-32/testrun/recovery/027_stream_regress/data/results/sysviews.out	2024-11-22 13:51:52.0800...
@@ -233,4 +233,4 @@
         from pg_get_process_memory_contexts(checkpointer_pid, false) where path = '{0}' into r; 
 	RAISE NOTICE '%', r;
 END $$;
-NOTICE:  (AllocSet,TopMemoryContext,,t)
+NOTICE:  (AllocSet,TopMemoryContext,,f)

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/sysviews.out /tmp/cirrus-ci-build/build-32/testrun/regress/regre...
--- /tmp/cirrus-ci-build/src/test/regress/expected/sysviews.out	2024-11-22 13:42:13.706541930 +0000
+++ /tmp/cirrus-ci-build/build-32/testrun/regress/regress/results/sysviews.out	2024-11-22 13:51:13.640108609 +0000
@@ -233,4 +233,4 @@
         from pg_get_process_memory_contexts(checkpointer_pid, false) where path = '{0}' into r; 
 	RAISE NOTICE '%', r;
 END $$;
-NOTICE:  (AllocSet,TopMemoryContext,,t)
+NOTICE:  (AllocSet,TopMemoryContext,,f)

diff -U3 /tmp/cirrus-ci-build/src/test/isolation/expected/vacuum-extending-in-repetable-read.out /tmp/cirrus-ci-build/bu...
--- /tmp/cirrus-ci-build/src/test/isolation/expected/vacuum-extending-in-repetable-read.out	2024-11-22 12:54:08.45950800...
+++ /tmp/cirrus-ci-build/build/testrun/isolation/isolation/results/vacuum-extending-in-repetable-read.out	2024-11-22 12:...
@@ -9,10 +9,7 @@
     FROM pg_stat_get_vacuum_tables vt, pg_class c
     WHERE vt.relname = 'test_vacuum_stat_isolation' AND vt.relid = c.oid;
 
-relname|tuples_deleted|dead_tuples|tuples_frozen
--------+--------------+-----------+-------------
-(0 rows)
-
+ERROR:  relation "pg_stat_get_vacuum_tables" does not exist
 step s1_begin_repeatable_read: 
   BEGIN transaction ISOLATION LEVEL REPEATABLE READ;
   select count(ival) from test_vacuum_stat_isolation where id>900;
@@ -22,7 +19,8 @@
   100
 (1 row)
 
-step s2_update: UPDATE test_vacuum_stat_isolation SET ival = ival + 2 where id > 900;
...

diff -U3 /tmp/cirrus-ci-build/src/test/isolation/expected/vacuum-extending-in-repetable-read.out /tmp/cirrus-ci-build/sr...
--- /tmp/cirrus-ci-build/src/test/isolation/expected/vacuum-extending-in-repetable-read.out	2024-11-22 12:54:08.48030180...
+++ /tmp/cirrus-ci-build/src/test/isolation/output_iso/results/vacuum-extending-in-repetable-read.out	2024-11-22 12:59:3...
@@ -9,10 +9,7 @@
     FROM pg_stat_get_vacuum_tables vt, pg_class c
     WHERE vt.relname = 'test_vacuum_stat_isolation' AND vt.relid = c.oid;
 
-relname|tuples_deleted|dead_tuples|tuples_frozen
--------+--------------+-----------+-------------
-(0 rows)
-
+ERROR:  relation "pg_stat_get_vacuum_tables" does not exist
 step s1_begin_repeatable_read: 
   BEGIN transaction ISOLATION LEVEL REPEATABLE READ;
   select count(ival) from test_vacuum_stat_isolation where id>900;
@@ -22,7 +19,8 @@
   100
 (1 row)
 
-step s2_update: UPDATE test_vacuum_stat_isolation SET ival = ival + 2 where id > 900;
...

diff -U3 /tmp/cirrus-ci-build/src/test/isolation/expected/vacuum-extending-in-repetable-read.out /tmp/cirrus-ci-build/bu...
--- /tmp/cirrus-ci-build/src/test/isolation/expected/vacuum-extending-in-repetable-read.out	2024-11-22 12:54:04.76593883...
+++ /tmp/cirrus-ci-build/build/testrun/isolation/isolation/results/vacuum-extending-in-repetable-read.out	2024-11-22 12:...
@@ -9,10 +9,7 @@
     FROM pg_stat_get_vacuum_tables vt, pg_class c
     WHERE vt.relname = 'test_vacuum_stat_isolation' AND vt.relid = c.oid;
 
-relname|tuples_deleted|dead_tuples|tuples_frozen
--------+--------------+-----------+-------------
-(0 rows)
-
+ERROR:  relation "pg_stat_get_vacuum_tables" does not exist
 step s1_begin_repeatable_read: 
   BEGIN transaction ISOLATION LEVEL REPEATABLE READ;
   select count(ival) from test_vacuum_stat_isolation where id>900;
@@ -22,7 +19,8 @@
   100
 (1 row)
 
-step s2_update: UPDATE test_vacuum_stat_isolation SET ival = ival + 2 where id > 900;
...

diff -U3 /Users/admin/pgsql/src/test/isolation/expected/vacuum-extending-in-repetable-read.out /Users/admin/pgsql/build/...
--- /Users/admin/pgsql/src/test/isolation/expected/vacuum-extending-in-repetable-read.out	2024-11-22 12:53:10
+++ /Users/admin/pgsql/build/testrun/isolation/isolation/results/vacuum-extending-in-repetable-read.out	2024-11-22 12:56...
@@ -9,10 +9,7 @@
     FROM pg_stat_get_vacuum_tables vt, pg_class c
     WHERE vt.relname = 'test_vacuum_stat_isolation' AND vt.relid = c.oid;
 
-relname|tuples_deleted|dead_tuples|tuples_frozen
--------+--------------+-----------+-------------
-(0 rows)
-
+ERROR:  relation "pg_stat_get_vacuum_tables" does not exist
 step s1_begin_repeatable_read: 
   BEGIN transaction ISOLATION LEVEL REPEATABLE READ;
   select count(ival) from test_vacuum_stat_isolation where id>900;
@@ -22,7 +19,8 @@
   100
 (1 row)
 
-step s2_update: UPDATE test_vacuum_stat_isolation SET ival = ival + 2 where id > 900;
...

diff --strip-trailing-cr -U3 C:/cirrus/src/test/isolation/expected/vacuum-extending-in-repetable-read.out C:/cirrus/buil...
--- C:/cirrus/src/test/isolation/expected/vacuum-extending-in-repetable-read.out	2024-11-22 12:54:26.757533600 +0000
+++ C:/cirrus/build/testrun/isolation/isolation/results/vacuum-extending-in-repetable-read.out	2024-11-22 12:58:41.08213...
@@ -9,10 +9,7 @@
     FROM pg_stat_get_vacuum_tables vt, pg_class c
     WHERE vt.relname = 'test_vacuum_stat_isolation' AND vt.relid = c.oid;
 
-relname|tuples_deleted|dead_tuples|tuples_frozen
--------+--------------+-----------+-------------
-(0 rows)
-
+ERROR:  relation "pg_stat_get_vacuum_tables" does not exist
 step s1_begin_repeatable_read: 
   BEGIN transaction ISOLATION LEVEL REPEATABLE READ;
   select count(ival) from test_vacuum_stat_isolation where id>900;
@@ -22,7 +19,8 @@
   100
 (1 row)
 
-step s2_update: UPDATE test_vacuum_stat_isolation SET ival = ival + 2 where id > 900;
...

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/alter_table.out /tmp/cirrus-ci-build/build/testrun/pg_upgrade/00...
--- /tmp/cirrus-ci-build/src/test/regress/expected/alter_table.out	2024-11-22 06:30:52.852761000 +0000
+++ /tmp/cirrus-ci-build/build/testrun/pg_upgrade/002_pg_upgrade/data/results/alter_table.out	2024-11-22 06:33:03.966721...
@@ -3481,9 +3481,20 @@
 WHERE relkind IN ('r', 'i', 'S', 't', 'm') AND mapped_oid IS DISTINCT FROM oid;
 SELECT m.* FROM filenode_mapping m LEFT JOIN pg_class c ON c.oid = m.oid
 WHERE c.oid IS NOT NULL OR m.mapped_oid IS NOT NULL;
- oid | mapped_oid | reltablespace | relfilenode | relname 
------+------------+---------------+-------------+---------
-(0 rows)
+  oid  | mapped_oid | reltablespace | relfilenode |       relname        
+-------+------------+---------------+-------------+----------------------
+ 39412 |            |             0 |       39412 | pktable_pkey
+ 39407 |            |             0 |       39407 | pktable
+ 39415 |            |             0 |       39415 | fktable
+ 40014 |            |             0 |       40020 | foo
+ 40024 |            |             0 |       40024 | pg_toast_40014_index
+ 40023 |            |             0 |       40023 | pg_toast_40014
+ 40294 |            |             0 |       40294 | old_oids
+ 40325 |            |             0 |       40325 | pg_toast_40322
...

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/alter_table.out /tmp/cirrus-ci-build/build/testrun/recovery/027_...
--- /tmp/cirrus-ci-build/src/test/regress/expected/alter_table.out	2024-11-22 06:30:52.852761000 +0000
+++ /tmp/cirrus-ci-build/build/testrun/recovery/027_stream_regress/data/results/alter_table.out	2024-11-22 06:33:58.6888...
@@ -3481,9 +3481,20 @@
 WHERE relkind IN ('r', 'i', 'S', 't', 'm') AND mapped_oid IS DISTINCT FROM oid;
 SELECT m.* FROM filenode_mapping m LEFT JOIN pg_class c ON c.oid = m.oid
 WHERE c.oid IS NOT NULL OR m.mapped_oid IS NOT NULL;
- oid | mapped_oid | reltablespace | relfilenode | relname 
------+------------+---------------+-------------+---------
-(0 rows)
+  oid  | mapped_oid | reltablespace | relfilenode |       relname        
+-------+------------+---------------+-------------+----------------------
+ 39464 |            |             0 |       39464 | pktable_pkey
+ 39460 |            |             0 |       39460 | pktable
+ 39466 |            |             0 |       39466 | fktable
+ 39946 |            |             0 |       39951 | foo
+ 39955 |            |             0 |       39955 | pg_toast_39946_index
+ 39954 |            |             0 |       39954 | pg_toast_39946
+ 40150 |            |             0 |       40150 | old_oids
+ 40185 |            |             0 |       40185 | pg_toast_40182
...

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/alter_table.out /tmp/cirrus-ci-build/build/testrun/regress/regre...
--- /tmp/cirrus-ci-build/src/test/regress/expected/alter_table.out	2024-11-22 06:30:52.852761000 +0000
+++ /tmp/cirrus-ci-build/build/testrun/regress/regress/results/alter_table.out	2024-11-22 06:33:02.567772000 +0000
@@ -3481,9 +3481,20 @@
 WHERE relkind IN ('r', 'i', 'S', 't', 'm') AND mapped_oid IS DISTINCT FROM oid;
 SELECT m.* FROM filenode_mapping m LEFT JOIN pg_class c ON c.oid = m.oid
 WHERE c.oid IS NOT NULL OR m.mapped_oid IS NOT NULL;
- oid | mapped_oid | reltablespace | relfilenode | relname 
------+------------+---------------+-------------+---------
-(0 rows)
+  oid  | mapped_oid | reltablespace | relfilenode |       relname        
+-------+------------+---------------+-------------+----------------------
+ 39507 |            |             0 |       39507 | pktable_pkey
+ 39503 |            |             0 |       39503 | pktable
+ 39509 |            |             0 |       39509 | fktable
+ 40015 |            |             0 |       40020 | foo
+ 40024 |            |             0 |       40024 | pg_toast_40015_index
+ 40023 |            |             0 |       40023 | pg_toast_40015
+ 40251 |            |             0 |       40251 | old_oids
+ 40270 |            |             0 |       40270 | pg_toast_40267
...

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/alter_table.out /tmp/cirrus-ci-build/src/bin/pg_upgrade/tmp_chec...
--- /tmp/cirrus-ci-build/src/test/regress/expected/alter_table.out	2024-11-22 06:30:51.339454695 +0000
+++ /tmp/cirrus-ci-build/src/bin/pg_upgrade/tmp_check/results/alter_table.out	2024-11-22 06:37:37.921920247 +0000
@@ -3481,9 +3481,29 @@
 WHERE relkind IN ('r', 'i', 'S', 't', 'm') AND mapped_oid IS DISTINCT FROM oid;
 SELECT m.* FROM filenode_mapping m LEFT JOIN pg_class c ON c.oid = m.oid
 WHERE c.oid IS NOT NULL OR m.mapped_oid IS NOT NULL;
- oid | mapped_oid | reltablespace | relfilenode | relname 
------+------------+---------------+-------------+---------
-(0 rows)
+  oid  | mapped_oid | reltablespace | relfilenode |       relname        
+-------+------------+---------------+-------------+----------------------
+ 39570 |            |             0 |       39570 | users_id_seq
+ 39576 |            |             0 |       39576 | pg_toast_39571
+ 39577 |            |             0 |       39577 | pg_toast_39571_index
+ 39571 |            |             0 |       39571 | users
+ 39799 |            |             0 |       39799 | foo
+ 40019 |            |             0 |       40019 | forc_test
+ 39582 |            |             0 |       39582 | pktable_pkey
+ 39578 |            |             0 |       39578 | pktable
...

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/alter_table.out /tmp/cirrus-ci-build/src/test/recovery/tmp_check...
--- /tmp/cirrus-ci-build/src/test/regress/expected/alter_table.out	2024-11-22 06:30:51.339454695 +0000
+++ /tmp/cirrus-ci-build/src/test/recovery/tmp_check/results/alter_table.out	2024-11-22 06:39:26.833694593 +0000
@@ -3481,9 +3481,20 @@
 WHERE relkind IN ('r', 'i', 'S', 't', 'm') AND mapped_oid IS DISTINCT FROM oid;
 SELECT m.* FROM filenode_mapping m LEFT JOIN pg_class c ON c.oid = m.oid
 WHERE c.oid IS NOT NULL OR m.mapped_oid IS NOT NULL;
- oid | mapped_oid | reltablespace | relfilenode | relname 
------+------------+---------------+-------------+---------
-(0 rows)
+  oid  | mapped_oid | reltablespace | relfilenode |       relname        
+-------+------------+---------------+-------------+----------------------
+ 39522 |            |             0 |       39522 | pktable_pkey
+ 39517 |            |             0 |       39517 | pktable
+ 39524 |            |             0 |       39524 | fktable
+ 40055 |            |             0 |       40060 | foo
+ 40064 |            |             0 |       40064 | pg_toast_40055_index
+ 40063 |            |             0 |       40063 | pg_toast_40055
+ 40281 |            |             0 |       40281 | old_oids
+ 40299 |            |             0 |       40299 | pg_toast_40296
...

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/alter_table.out /tmp/cirrus-ci-build/src/test/regress/results/al...
--- /tmp/cirrus-ci-build/src/test/regress/expected/alter_table.out	2024-11-22 06:30:51.339454695 +0000
+++ /tmp/cirrus-ci-build/src/test/regress/results/alter_table.out	2024-11-22 06:35:48.398562566 +0000
@@ -3481,9 +3481,20 @@
 WHERE relkind IN ('r', 'i', 'S', 't', 'm') AND mapped_oid IS DISTINCT FROM oid;
 SELECT m.* FROM filenode_mapping m LEFT JOIN pg_class c ON c.oid = m.oid
 WHERE c.oid IS NOT NULL OR m.mapped_oid IS NOT NULL;
- oid | mapped_oid | reltablespace | relfilenode | relname 
------+------------+---------------+-------------+---------
-(0 rows)
+  oid  | mapped_oid | reltablespace | relfilenode |       relname        
+-------+------------+---------------+-------------+----------------------
+ 39581 |            |             0 |       39581 | pktable_pkey
+ 39577 |            |             0 |       39577 | pktable
+ 39584 |            |             0 |       39584 | fktable
+ 40117 |            |             0 |       40122 | foo
+ 40126 |            |             0 |       40126 | pg_toast_40117_index
+ 40125 |            |             0 |       40125 | pg_toast_40117
+ 40348 |            |             0 |       40348 | old_oids
+ 40368 |            |             0 |       40368 | pg_toast_40365
...

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/alter_table.out /tmp/cirrus-ci-build/build/testrun/pg_upgrade/00...
--- /tmp/cirrus-ci-build/src/test/regress/expected/alter_table.out	2024-11-22 06:30:47.305105721 +0000
+++ /tmp/cirrus-ci-build/build/testrun/pg_upgrade/002_pg_upgrade/data/results/alter_table.out	2024-11-22 06:35:54.722556...
@@ -3481,9 +3481,20 @@
 WHERE relkind IN ('r', 'i', 'S', 't', 'm') AND mapped_oid IS DISTINCT FROM oid;
 SELECT m.* FROM filenode_mapping m LEFT JOIN pg_class c ON c.oid = m.oid
 WHERE c.oid IS NOT NULL OR m.mapped_oid IS NOT NULL;
- oid | mapped_oid | reltablespace | relfilenode | relname 
------+------------+---------------+-------------+---------
-(0 rows)
+  oid  | mapped_oid | reltablespace | relfilenode |       relname        
+-------+------------+---------------+-------------+----------------------
+ 39483 |            |             0 |       39483 | pktable_pkey
+ 39479 |            |             0 |       39479 | pktable
+ 39485 |            |             0 |       39485 | fktable
+ 39975 |            |             0 |       39980 | foo
+ 39984 |            |             0 |       39984 | pg_toast_39975_index
+ 39983 |            |             0 |       39983 | pg_toast_39975
+ 40212 |            |             0 |       40212 | old_oids
+ 40231 |            |             0 |       40231 | pg_toast_40228
...

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/alter_table.out /tmp/cirrus-ci-build/build/testrun/recovery/027_...
--- /tmp/cirrus-ci-build/src/test/regress/expected/alter_table.out	2024-11-22 06:30:47.305105721 +0000
+++ /tmp/cirrus-ci-build/build/testrun/recovery/027_stream_regress/data/results/alter_table.out	2024-11-22 06:36:25.0389...
@@ -3481,9 +3481,29 @@
 WHERE relkind IN ('r', 'i', 'S', 't', 'm') AND mapped_oid IS DISTINCT FROM oid;
 SELECT m.* FROM filenode_mapping m LEFT JOIN pg_class c ON c.oid = m.oid
 WHERE c.oid IS NOT NULL OR m.mapped_oid IS NOT NULL;
- oid | mapped_oid | reltablespace | relfilenode | relname 
------+------------+---------------+-------------+---------
-(0 rows)
+  oid  | mapped_oid | reltablespace | relfilenode |       relname        
+-------+------------+---------------+-------------+----------------------
+ 39335 |            |             0 |       39335 | users_id_seq
+ 39343 |            |             0 |       39343 | pg_toast_39336
+ 39344 |            |             0 |       39344 | pg_toast_39336_index
+ 39336 |            |             0 |       39336 | users
+ 39701 |            |             0 |       39701 | foo
+ 40119 |            |             0 |       40119 | forc_test
+ 40500 |            |             0 |       40500 | pg_toast_40497
+ 40501 |            |             0 |       40501 | pg_toast_40497_index
...

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/alter_table.out /tmp/cirrus-ci-build/build/testrun/regress/regre...
--- /tmp/cirrus-ci-build/src/test/regress/expected/alter_table.out	2024-11-22 06:30:47.305105721 +0000
+++ /tmp/cirrus-ci-build/build/testrun/regress/regress/results/alter_table.out	2024-11-22 06:35:48.126497703 +0000
@@ -3481,9 +3481,20 @@
 WHERE relkind IN ('r', 'i', 'S', 't', 'm') AND mapped_oid IS DISTINCT FROM oid;
 SELECT m.* FROM filenode_mapping m LEFT JOIN pg_class c ON c.oid = m.oid
 WHERE c.oid IS NOT NULL OR m.mapped_oid IS NOT NULL;
- oid | mapped_oid | reltablespace | relfilenode | relname 
------+------------+---------------+-------------+---------
-(0 rows)
+  oid  | mapped_oid | reltablespace | relfilenode |       relname        
+-------+------------+---------------+-------------+----------------------
+ 39391 |            |             0 |       39391 | pktable_pkey
+ 39387 |            |             0 |       39387 | pktable
+ 39394 |            |             0 |       39394 | fktable
+ 39998 |            |             0 |       40004 | foo
+ 40008 |            |             0 |       40008 | pg_toast_39998_index
+ 40007 |            |             0 |       40007 | pg_toast_39998
+ 40226 |            |             0 |       40226 | old_oids
+ 40249 |            |             0 |       40249 | pg_toast_40246
...

diff -U3 /Users/admin/pgsql/src/test/regress/expected/alter_table.out /Users/admin/pgsql/build/testrun/pg_upgrade/002_pg...
--- /Users/admin/pgsql/src/test/regress/expected/alter_table.out	2024-11-22 06:30:11
+++ /Users/admin/pgsql/build/testrun/pg_upgrade/002_pg_upgrade/data/results/alter_table.out	2024-11-22 06:32:28
@@ -3481,9 +3481,20 @@
 WHERE relkind IN ('r', 'i', 'S', 't', 'm') AND mapped_oid IS DISTINCT FROM oid;
 SELECT m.* FROM filenode_mapping m LEFT JOIN pg_class c ON c.oid = m.oid
 WHERE c.oid IS NOT NULL OR m.mapped_oid IS NOT NULL;
- oid | mapped_oid | reltablespace | relfilenode | relname 
------+------------+---------------+-------------+---------
-(0 rows)
+  oid  | mapped_oid | reltablespace | relfilenode |       relname        
+-------+------------+---------------+-------------+----------------------
+ 39486 |            |             0 |       39486 | pktable_pkey
+ 39482 |            |             0 |       39482 | pktable
+ 39488 |            |             0 |       39488 | fktable
+ 40117 |            |             0 |       40122 | foo
+ 40126 |            |             0 |       40126 | pg_toast_40117_index
+ 40125 |            |             0 |       40125 | pg_toast_40117
+ 40345 |            |             0 |       40345 | old_oids
+ 40374 |            |             0 |       40374 | pg_toast_40371
...

diff -U3 /Users/admin/pgsql/src/test/regress/expected/alter_table.out /Users/admin/pgsql/build/testrun/recovery/027_stre...
--- /Users/admin/pgsql/src/test/regress/expected/alter_table.out	2024-11-22 06:30:11
+++ /Users/admin/pgsql/build/testrun/recovery/027_stream_regress/data/results/alter_table.out	2024-11-22 06:33:11
@@ -3481,9 +3481,20 @@
 WHERE relkind IN ('r', 'i', 'S', 't', 'm') AND mapped_oid IS DISTINCT FROM oid;
 SELECT m.* FROM filenode_mapping m LEFT JOIN pg_class c ON c.oid = m.oid
 WHERE c.oid IS NOT NULL OR m.mapped_oid IS NOT NULL;
- oid | mapped_oid | reltablespace | relfilenode | relname 
------+------------+---------------+-------------+---------
-(0 rows)
+  oid  | mapped_oid | reltablespace | relfilenode |       relname        
+-------+------------+---------------+-------------+----------------------
+ 39371 |            |             0 |       39371 | pktable_pkey
+ 39367 |            |             0 |       39367 | pktable
+ 39373 |            |             0 |       39373 | fktable
+ 39929 |            |             0 |       39934 | foo
+ 39938 |            |             0 |       39938 | pg_toast_39929_index
+ 39937 |            |             0 |       39937 | pg_toast_39929
+ 40156 |            |             0 |       40156 | old_oids
+ 40176 |            |             0 |       40176 | pg_toast_40173
...

diff -U3 /Users/admin/pgsql/src/test/regress/expected/alter_table.out /Users/admin/pgsql/build/testrun/regress/regress/r...
--- /Users/admin/pgsql/src/test/regress/expected/alter_table.out	2024-11-22 06:30:11
+++ /Users/admin/pgsql/build/testrun/regress/regress/results/alter_table.out	2024-11-22 06:32:28
@@ -3481,9 +3481,20 @@
 WHERE relkind IN ('r', 'i', 'S', 't', 'm') AND mapped_oid IS DISTINCT FROM oid;
 SELECT m.* FROM filenode_mapping m LEFT JOIN pg_class c ON c.oid = m.oid
 WHERE c.oid IS NOT NULL OR m.mapped_oid IS NOT NULL;
- oid | mapped_oid | reltablespace | relfilenode | relname 
------+------------+---------------+-------------+---------
-(0 rows)
+  oid  | mapped_oid | reltablespace | relfilenode |       relname        
+-------+------------+---------------+-------------+----------------------
+ 39517 |            |             0 |       39517 | pktable_pkey
+ 39513 |            |             0 |       39513 | pktable
+ 39519 |            |             0 |       39519 | fktable
+ 39998 |            |             0 |       40003 | foo
+ 40007 |            |             0 |       40007 | pg_toast_39998_index
+ 40006 |            |             0 |       40006 | pg_toast_39998
+ 40303 |            |             0 |       40303 | old_oids
+ 40320 |            |             0 |       40320 | pg_toast_40317
...

diff --strip-trailing-cr -U3 C:/cirrus/src/test/regress/expected/alter_table.out C:/cirrus/build/testrun/pg_upgrade/002_...
--- C:/cirrus/src/test/regress/expected/alter_table.out	2024-11-22 06:31:01.251751200 +0000
+++ C:/cirrus/build/testrun/pg_upgrade/002_pg_upgrade/data/results/alter_table.out	2024-11-22 06:34:50.741748200 +0000
@@ -3481,9 +3481,20 @@
 WHERE relkind IN ('r', 'i', 'S', 't', 'm') AND mapped_oid IS DISTINCT FROM oid;
 SELECT m.* FROM filenode_mapping m LEFT JOIN pg_class c ON c.oid = m.oid
 WHERE c.oid IS NOT NULL OR m.mapped_oid IS NOT NULL;
- oid | mapped_oid | reltablespace | relfilenode | relname 
------+------------+---------------+-------------+---------
-(0 rows)
+  oid  | mapped_oid | reltablespace | relfilenode |       relname        
+-------+------------+---------------+-------------+----------------------
+ 38592 |            |             0 |       38592 | pktable_pkey
+ 38584 |            |             0 |       38584 | pktable
+ 38595 |            |             0 |       38595 | fktable
+ 39610 |            |             0 |       39615 | foo
+ 39620 |            |             0 |       39620 | pg_toast_39610_index
+ 39619 |            |             0 |       39619 | pg_toast_39610
+ 39875 |            |             0 |       39875 | pg_toast_39872
+ 39876 |            |             0 |       39876 | pg_toast_39872_index
...

diff --strip-trailing-cr -U3 C:/cirrus/src/test/regress/expected/alter_table.out C:/cirrus/build/testrun/recovery/027_st...
--- C:/cirrus/src/test/regress/expected/alter_table.out	2024-11-22 06:31:01.251751200 +0000
+++ C:/cirrus/build/testrun/recovery/027_stream_regress/data/results/alter_table.out	2024-11-22 06:37:04.847251300 +0000
@@ -3481,9 +3481,20 @@
 WHERE relkind IN ('r', 'i', 'S', 't', 'm') AND mapped_oid IS DISTINCT FROM oid;
 SELECT m.* FROM filenode_mapping m LEFT JOIN pg_class c ON c.oid = m.oid
 WHERE c.oid IS NOT NULL OR m.mapped_oid IS NOT NULL;
- oid | mapped_oid | reltablespace | relfilenode | relname 
------+------------+---------------+-------------+---------
-(0 rows)
+  oid  | mapped_oid | reltablespace | relfilenode |       relname        
+-------+------------+---------------+-------------+----------------------
+ 39126 |            |             0 |       39126 | pktable_pkey
+ 39118 |            |             0 |       39118 | pktable
+ 39129 |            |             0 |       39129 | fktable
+ 39723 |            |             0 |       39723 | pg_toast_39683_index
+ 39722 |            |             0 |       39722 | pg_toast_39683
+ 39683 |            |             0 |       39718 | foo
+ 39936 |            |             0 |       39936 | old_oids
+ 39958 |            |             0 |       39958 | pg_toast_39954
...

diff --strip-trailing-cr -U3 C:/cirrus/src/test/regress/expected/alter_table.out C:/cirrus/build/testrun/regress/regress...
--- C:/cirrus/src/test/regress/expected/alter_table.out	2024-11-22 06:31:01.251751200 +0000
+++ C:/cirrus/build/testrun/regress/regress/results/alter_table.out	2024-11-22 06:34:45.180775300 +0000
@@ -3481,9 +3481,20 @@
 WHERE relkind IN ('r', 'i', 'S', 't', 'm') AND mapped_oid IS DISTINCT FROM oid;
 SELECT m.* FROM filenode_mapping m LEFT JOIN pg_class c ON c.oid = m.oid
 WHERE c.oid IS NOT NULL OR m.mapped_oid IS NOT NULL;
- oid | mapped_oid | reltablespace | relfilenode | relname 
------+------------+---------------+-------------+---------
-(0 rows)
+  oid  | mapped_oid | reltablespace | relfilenode |       relname        
+-------+------------+---------------+-------------+----------------------
+ 38311 |            |             0 |       38311 | pktable_pkey
+ 38302 |            |             0 |       38302 | pktable
+ 38318 |            |             0 |       38318 | fktable
+ 39634 |            |             0 |       39643 | foo
+ 39647 |            |             0 |       39647 | pg_toast_39634_index
+ 39646 |            |             0 |       39646 | pg_toast_39634
+ 40007 |            |             0 |       40007 | pg_toast_40003_index
+ 40003 |            |             0 |       40003 | recur2
...

diff --strip-trailing-cr -U3 C:/cirrus/src/test/regress/expected/date.out C:/cirrus/build/testrun/pg_upgrade/002_pg_upgr...
--- C:/cirrus/src/test/regress/expected/date.out	2024-11-22 05:15:02.319848200 +0000
+++ C:/cirrus/build/testrun/pg_upgrade/002_pg_upgrade/data/results/date.out	2024-11-22 05:17:10.836448300 +0000
@@ -1533,4 +1533,4 @@
 select make_time(24, 0, 2.1);
 ERROR:  time field value out of range: 24:00:2.1
 SELECT make_date(-2147483648, 1, 1);
-ERROR:  date field value out of range: -2147483648-01-01
+ERROR:  date field value out of range: 24301-01-01

diff --strip-trailing-cr -U3 C:/cirrus/src/test/regress/expected/date.out C:/cirrus/build/testrun/recovery/027_stream_re...
--- C:/cirrus/src/test/regress/expected/date.out	2024-11-22 05:15:02.319848200 +0000
+++ C:/cirrus/build/testrun/recovery/027_stream_regress/data/results/date.out	2024-11-22 05:19:36.900048700 +0000
@@ -1533,4 +1533,4 @@
 select make_time(24, 0, 2.1);
 ERROR:  time field value out of range: 24:00:2.1
 SELECT make_date(-2147483648, 1, 1);
-ERROR:  date field value out of range: -2147483648-01-01
+ERROR:  date field value out of range: 24301-01-01

diff --strip-trailing-cr -U3 C:/cirrus/src/test/regress/expected/date.out C:/cirrus/build/testrun/regress/regress/result...
--- C:/cirrus/src/test/regress/expected/date.out	2024-11-22 05:15:02.319848200 +0000
+++ C:/cirrus/build/testrun/regress/regress/results/date.out	2024-11-22 05:17:04.705327000 +0000
@@ -1533,4 +1533,4 @@
 select make_time(24, 0, 2.1);
 ERROR:  time field value out of range: 24:00:2.1
 SELECT make_date(-2147483648, 1, 1);
-ERROR:  date field value out of range: -2147483648-01-01
+ERROR:  date field value out of range: 24301-01-01

diff -U3 /tmp/cirrus-ci-build/contrib/passwordcheck/expected/passwordcheck.out /tmp/cirrus-ci-build/build-32/testrun/pas...
--- /tmp/cirrus-ci-build/contrib/passwordcheck/expected/passwordcheck.out	2024-11-21 22:16:23.134863676 +0000
+++ /tmp/cirrus-ci-build/build-32/testrun/passwordcheck/regress/results/passwordcheck.out	2024-11-21 22:24:22.855539899 ...
@@ -8,7 +8,6 @@
 ERROR:  password is too short
 -- error: too short
 ALTER USER regress_passwordcheck_user1 PASSWORD 'äbcdefghijk';
-ERROR:  password is too short
 -- error: contains user name
 ALTER USER regress_passwordcheck_user1 PASSWORD 'xyzregress_passwordcheck_user1';
 ERROR:  password must not contain user name

diff --strip-trailing-cr -U3 C:/cirrus/contrib/passwordcheck/expected/passwordcheck.out C:/cirrus/build/testrun/password...
--- C:/cirrus/contrib/passwordcheck/expected/passwordcheck.out	2024-11-21 22:16:38.829960700 +0000
+++ C:/cirrus/build/testrun/passwordcheck/regress/results/passwordcheck.out	2024-11-21 22:22:27.886303800 +0000
@@ -8,7 +8,6 @@
 ERROR:  password is too short
 -- error: too short
 ALTER USER regress_passwordcheck_user1 PASSWORD 'äbcdefghijk';
-ERROR:  password is too short
 -- error: contains user name
 ALTER USER regress_passwordcheck_user1 PASSWORD 'xyzregress_passwordcheck_user1';
 ERROR:  password must not contain user name

diff -U3 /tmp/cirrus-ci-build/src/pl/plperl/expected/plperl_setup.out /tmp/cirrus-ci-build/build/testrun/plperl/regress/...
--- /tmp/cirrus-ci-build/src/pl/plperl/expected/plperl_setup.out	2024-11-21 21:43:08.715002000 +0000
+++ /tmp/cirrus-ci-build/build/testrun/plperl/regress/results/plperl_setup.out	2024-11-21 21:45:08.240828000 +0000
@@ -12,7 +12,7 @@
 HINT:  Must have CREATE privilege on current database to create this extension.
 CREATE EXTENSION plperlu;  -- fail
 ERROR:  permission denied to create extension "plperlu"
-HINT:  Must be superuser to create this extension.
+HINT:  Only roles with privileges of the "pg_manage_extensions" role are allowed to create this extension.
 RESET ROLE;
 DO $$
 begin
@@ -24,7 +24,7 @@
 CREATE EXTENSION plperl;
 CREATE EXTENSION plperlu;  -- fail
 ERROR:  permission denied to create extension "plperlu"
-HINT:  Must be superuser to create this extension.
+HINT:  Only roles with privileges of the "pg_manage_extensions" role are allowed to create this extension.
 CREATE SCHEMA plperl_setup_scratch;
 SET search_path = plperl_setup_scratch;
...

diff -U3 /tmp/cirrus-ci-build/src/pl/plperl/expected/plperl_setup.out /tmp/cirrus-ci-build/src/pl/plperl/results/plperl_...
--- /tmp/cirrus-ci-build/src/pl/plperl/expected/plperl_setup.out	2024-11-21 21:43:05.036318466 +0000
+++ /tmp/cirrus-ci-build/src/pl/plperl/results/plperl_setup.out	2024-11-21 21:44:26.805019014 +0000
@@ -12,7 +12,7 @@
 HINT:  Must have CREATE privilege on current database to create this extension.
 CREATE EXTENSION plperlu;  -- fail
 ERROR:  permission denied to create extension "plperlu"
-HINT:  Must be superuser to create this extension.
+HINT:  Only roles with privileges of the "pg_manage_extensions" role are allowed to create this extension.
 RESET ROLE;
 DO $$
 begin
@@ -24,7 +24,7 @@
 CREATE EXTENSION plperl;
 CREATE EXTENSION plperlu;  -- fail
 ERROR:  permission denied to create extension "plperlu"
-HINT:  Must be superuser to create this extension.
+HINT:  Only roles with privileges of the "pg_manage_extensions" role are allowed to create this extension.
 CREATE SCHEMA plperl_setup_scratch;
 SET search_path = plperl_setup_scratch;
...

diff -U3 /tmp/cirrus-ci-build/src/pl/plperl/expected/plperl_setup.out /tmp/cirrus-ci-build/build/testrun/plperl/regress/...
--- /tmp/cirrus-ci-build/src/pl/plperl/expected/plperl_setup.out	2024-11-21 21:43:05.663905808 +0000
+++ /tmp/cirrus-ci-build/build/testrun/plperl/regress/results/plperl_setup.out	2024-11-21 21:45:49.373518724 +0000
@@ -12,7 +12,7 @@
 HINT:  Must have CREATE privilege on current database to create this extension.
 CREATE EXTENSION plperlu;  -- fail
 ERROR:  permission denied to create extension "plperlu"
-HINT:  Must be superuser to create this extension.
+HINT:  Only roles with privileges of the "pg_manage_extensions" role are allowed to create this extension.
 RESET ROLE;
 DO $$
 begin
@@ -24,7 +24,7 @@
 CREATE EXTENSION plperl;
 CREATE EXTENSION plperlu;  -- fail
 ERROR:  permission denied to create extension "plperlu"
-HINT:  Must be superuser to create this extension.
+HINT:  Only roles with privileges of the "pg_manage_extensions" role are allowed to create this extension.
 CREATE SCHEMA plperl_setup_scratch;
 SET search_path = plperl_setup_scratch;
...

diff -U3 /Users/admin/pgsql/src/pl/plperl/expected/plperl_setup.out /Users/admin/pgsql/build/testrun/plperl/regress/resu...
--- /Users/admin/pgsql/src/pl/plperl/expected/plperl_setup.out	2024-11-21 21:42:10
+++ /Users/admin/pgsql/build/testrun/plperl/regress/results/plperl_setup.out	2024-11-21 21:44:39
@@ -12,7 +12,7 @@
 HINT:  Must have CREATE privilege on current database to create this extension.
 CREATE EXTENSION plperlu;  -- fail
 ERROR:  permission denied to create extension "plperlu"
-HINT:  Must be superuser to create this extension.
+HINT:  Only roles with privileges of the "pg_manage_extensions" role are allowed to create this extension.
 RESET ROLE;
 DO $$
 begin
@@ -24,7 +24,7 @@
 CREATE EXTENSION plperl;
 CREATE EXTENSION plperlu;  -- fail
 ERROR:  permission denied to create extension "plperlu"
-HINT:  Must be superuser to create this extension.
+HINT:  Only roles with privileges of the "pg_manage_extensions" role are allowed to create this extension.
 CREATE SCHEMA plperl_setup_scratch;
 SET search_path = plperl_setup_scratch;
...

diff --strip-trailing-cr -U3 C:/cirrus/src/pl/plperl/expected/plperl_setup.out C:/cirrus/build/testrun/plperl/regress/re...
--- C:/cirrus/src/pl/plperl/expected/plperl_setup.out	2024-11-21 21:43:18.065172000 +0000
+++ C:/cirrus/build/testrun/plperl/regress/results/plperl_setup.out	2024-11-21 21:48:40.907935400 +0000
@@ -12,7 +12,7 @@
 HINT:  Must have CREATE privilege on current database to create this extension.
 CREATE EXTENSION plperlu;  -- fail
 ERROR:  permission denied to create extension "plperlu"
-HINT:  Must be superuser to create this extension.
+HINT:  Only roles with privileges of the "pg_manage_extensions" role are allowed to create this extension.
 RESET ROLE;
 DO $$
 begin
@@ -24,7 +24,7 @@
 CREATE EXTENSION plperl;
 CREATE EXTENSION plperlu;  -- fail
 ERROR:  permission denied to create extension "plperlu"
-HINT:  Must be superuser to create this extension.
+HINT:  Only roles with privileges of the "pg_manage_extensions" role are allowed to create this extension.
 CREATE SCHEMA plperl_setup_scratch;
 SET search_path = plperl_setup_scratch;
...

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/partition_join.out /tmp/cirrus-ci-build/build/testrun/pg_upgrade...
--- /tmp/cirrus-ci-build/src/test/regress/expected/partition_join.out	2024-11-21 11:52:13.735061000 +0000
+++ /tmp/cirrus-ci-build/build/testrun/pg_upgrade/002_pg_upgrade/data/results/partition_join.out	2024-11-21 11:53:51.682...
@@ -65,31 +65,24 @@
 -- inner join with partially-redundant join clauses
 EXPLAIN (COSTS OFF)
 SELECT t1.a, t1.c, t2.b, t2.c FROM prt1 t1, prt2 t2 WHERE t1.a = t2.a AND t1.a = t2.b ORDER BY t1.a, t2.b;
-                          QUERY PLAN                           
----------------------------------------------------------------
- Sort
-   Sort Key: t1.a
+                       QUERY PLAN                        
+---------------------------------------------------------
+ Merge Join
+   Merge Cond: (t1.a = t2.a)
    ->  Append
-         ->  Merge Join
-               Merge Cond: (t1_1.a = t2_1.a)
-               ->  Index Scan using iprt1_p1_a on prt1_p1 t1_1
-               ->  Sort
...

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/partition_join.out /tmp/cirrus-ci-build/build/testrun/recovery/0...
--- /tmp/cirrus-ci-build/src/test/regress/expected/partition_join.out	2024-11-21 11:52:13.735061000 +0000
+++ /tmp/cirrus-ci-build/build/testrun/recovery/027_stream_regress/data/results/partition_join.out	2024-11-21 11:54:43.2...
@@ -65,31 +65,24 @@
 -- inner join with partially-redundant join clauses
 EXPLAIN (COSTS OFF)
 SELECT t1.a, t1.c, t2.b, t2.c FROM prt1 t1, prt2 t2 WHERE t1.a = t2.a AND t1.a = t2.b ORDER BY t1.a, t2.b;
-                          QUERY PLAN                           
----------------------------------------------------------------
- Sort
-   Sort Key: t1.a
+                       QUERY PLAN                        
+---------------------------------------------------------
+ Merge Join
+   Merge Cond: (t1.a = t2.a)
    ->  Append
-         ->  Merge Join
-               Merge Cond: (t1_1.a = t2_1.a)
-               ->  Index Scan using iprt1_p1_a on prt1_p1 t1_1
-               ->  Sort
...

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/partition_join.out /tmp/cirrus-ci-build/build/testrun/regress/re...
--- /tmp/cirrus-ci-build/src/test/regress/expected/partition_join.out	2024-11-21 11:52:13.735061000 +0000
+++ /tmp/cirrus-ci-build/build/testrun/regress/regress/results/partition_join.out	2024-11-21 11:53:51.923861000 +0000
@@ -65,31 +65,24 @@
 -- inner join with partially-redundant join clauses
 EXPLAIN (COSTS OFF)
 SELECT t1.a, t1.c, t2.b, t2.c FROM prt1 t1, prt2 t2 WHERE t1.a = t2.a AND t1.a = t2.b ORDER BY t1.a, t2.b;
-                          QUERY PLAN                           
----------------------------------------------------------------
- Sort
-   Sort Key: t1.a
+                       QUERY PLAN                        
+---------------------------------------------------------
+ Merge Join
+   Merge Cond: (t1.a = t2.a)
    ->  Append
-         ->  Merge Join
-               Merge Cond: (t1_1.a = t2_1.a)
-               ->  Index Scan using iprt1_p1_a on prt1_p1 t1_1
-               ->  Sort
...

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/partition_join.out /tmp/cirrus-ci-build/src/bin/pg_upgrade/tmp_c...
--- /tmp/cirrus-ci-build/src/test/regress/expected/partition_join.out	2024-11-21 11:52:12.258535718 +0000
+++ /tmp/cirrus-ci-build/src/bin/pg_upgrade/tmp_check/results/partition_join.out	2024-11-21 11:57:29.593048806 +0000
@@ -65,31 +65,24 @@
 -- inner join with partially-redundant join clauses
 EXPLAIN (COSTS OFF)
 SELECT t1.a, t1.c, t2.b, t2.c FROM prt1 t1, prt2 t2 WHERE t1.a = t2.a AND t1.a = t2.b ORDER BY t1.a, t2.b;
-                          QUERY PLAN                           
----------------------------------------------------------------
- Sort
-   Sort Key: t1.a
+                       QUERY PLAN                        
+---------------------------------------------------------
+ Merge Join
+   Merge Cond: (t1.a = t2.a)
    ->  Append
-         ->  Merge Join
-               Merge Cond: (t1_1.a = t2_1.a)
-               ->  Index Scan using iprt1_p1_a on prt1_p1 t1_1
-               ->  Sort
...

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/partition_join.out /tmp/cirrus-ci-build/src/test/regress/results...
--- /tmp/cirrus-ci-build/src/test/regress/expected/partition_join.out	2024-11-21 11:52:12.258535718 +0000
+++ /tmp/cirrus-ci-build/src/test/regress/results/partition_join.out	2024-11-21 11:55:38.281052038 +0000
@@ -65,31 +65,24 @@
 -- inner join with partially-redundant join clauses
 EXPLAIN (COSTS OFF)
 SELECT t1.a, t1.c, t2.b, t2.c FROM prt1 t1, prt2 t2 WHERE t1.a = t2.a AND t1.a = t2.b ORDER BY t1.a, t2.b;
-                          QUERY PLAN                           
----------------------------------------------------------------
- Sort
-   Sort Key: t1.a
+                       QUERY PLAN                        
+---------------------------------------------------------
+ Merge Join
+   Merge Cond: (t1.a = t2.a)
    ->  Append
-         ->  Merge Join
-               Merge Cond: (t1_1.a = t2_1.a)
-               ->  Index Scan using iprt1_p1_a on prt1_p1 t1_1
-               ->  Sort
...

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/partition_join.out /tmp/cirrus-ci-build/build/testrun/pg_upgrade...
--- /tmp/cirrus-ci-build/src/test/regress/expected/partition_join.out	2024-11-21 11:52:11.071946976 +0000
+++ /tmp/cirrus-ci-build/build/testrun/pg_upgrade/002_pg_upgrade/data/results/partition_join.out	2024-11-21 11:54:41.467...
@@ -65,31 +65,24 @@
 -- inner join with partially-redundant join clauses
 EXPLAIN (COSTS OFF)
 SELECT t1.a, t1.c, t2.b, t2.c FROM prt1 t1, prt2 t2 WHERE t1.a = t2.a AND t1.a = t2.b ORDER BY t1.a, t2.b;
-                          QUERY PLAN                           
----------------------------------------------------------------
- Sort
-   Sort Key: t1.a
+                       QUERY PLAN                        
+---------------------------------------------------------
+ Merge Join
+   Merge Cond: (t1.a = t2.a)
    ->  Append
-         ->  Merge Join
-               Merge Cond: (t1_1.a = t2_1.a)
-               ->  Index Scan using iprt1_p1_a on prt1_p1 t1_1
-               ->  Sort
...

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/partition_join.out /tmp/cirrus-ci-build/build/testrun/recovery/0...
--- /tmp/cirrus-ci-build/src/test/regress/expected/partition_join.out	2024-11-21 11:52:11.071946976 +0000
+++ /tmp/cirrus-ci-build/build/testrun/recovery/027_stream_regress/data/results/partition_join.out	2024-11-21 11:55:16.1...
@@ -65,31 +65,24 @@
 -- inner join with partially-redundant join clauses
 EXPLAIN (COSTS OFF)
 SELECT t1.a, t1.c, t2.b, t2.c FROM prt1 t1, prt2 t2 WHERE t1.a = t2.a AND t1.a = t2.b ORDER BY t1.a, t2.b;
-                          QUERY PLAN                           
----------------------------------------------------------------
- Sort
-   Sort Key: t1.a
+                       QUERY PLAN                        
+---------------------------------------------------------
+ Merge Join
+   Merge Cond: (t1.a = t2.a)
    ->  Append
-         ->  Merge Join
-               Merge Cond: (t1_1.a = t2_1.a)
-               ->  Index Scan using iprt1_p1_a on prt1_p1 t1_1
-               ->  Sort
...

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/partition_join.out /tmp/cirrus-ci-build/build/testrun/regress/re...
--- /tmp/cirrus-ci-build/src/test/regress/expected/partition_join.out	2024-11-21 11:52:11.071946976 +0000
+++ /tmp/cirrus-ci-build/build/testrun/regress/regress/results/partition_join.out	2024-11-21 11:54:36.923151504 +0000
@@ -65,31 +65,24 @@
 -- inner join with partially-redundant join clauses
 EXPLAIN (COSTS OFF)
 SELECT t1.a, t1.c, t2.b, t2.c FROM prt1 t1, prt2 t2 WHERE t1.a = t2.a AND t1.a = t2.b ORDER BY t1.a, t2.b;
-                          QUERY PLAN                           
----------------------------------------------------------------
- Sort
-   Sort Key: t1.a
+                       QUERY PLAN                        
+---------------------------------------------------------
+ Merge Join
+   Merge Cond: (t1.a = t2.a)
    ->  Append
-         ->  Merge Join
-               Merge Cond: (t1_1.a = t2_1.a)
-               ->  Index Scan using iprt1_p1_a on prt1_p1 t1_1
-               ->  Sort
...

diff -U3 /Users/admin/pgsql/src/test/regress/expected/partition_join.out /Users/admin/pgsql/build/testrun/pg_upgrade/002...
--- /Users/admin/pgsql/src/test/regress/expected/partition_join.out	2024-11-21 11:52:12
+++ /Users/admin/pgsql/build/testrun/pg_upgrade/002_pg_upgrade/data/results/partition_join.out	2024-11-21 11:54:01
@@ -65,31 +65,24 @@
 -- inner join with partially-redundant join clauses
 EXPLAIN (COSTS OFF)
 SELECT t1.a, t1.c, t2.b, t2.c FROM prt1 t1, prt2 t2 WHERE t1.a = t2.a AND t1.a = t2.b ORDER BY t1.a, t2.b;
-                          QUERY PLAN                           
----------------------------------------------------------------
- Sort
-   Sort Key: t1.a
+                       QUERY PLAN                        
+---------------------------------------------------------
+ Merge Join
+   Merge Cond: (t1.a = t2.a)
    ->  Append
-         ->  Merge Join
-               Merge Cond: (t1_1.a = t2_1.a)
-               ->  Index Scan using iprt1_p1_a on prt1_p1 t1_1
-               ->  Sort
...

diff -U3 /Users/admin/pgsql/src/test/regress/expected/partition_join.out /Users/admin/pgsql/build/testrun/recovery/027_s...
--- /Users/admin/pgsql/src/test/regress/expected/partition_join.out	2024-11-21 11:52:12
+++ /Users/admin/pgsql/build/testrun/recovery/027_stream_regress/data/results/partition_join.out	2024-11-21 11:54:50
@@ -65,31 +65,24 @@
 -- inner join with partially-redundant join clauses
 EXPLAIN (COSTS OFF)
 SELECT t1.a, t1.c, t2.b, t2.c FROM prt1 t1, prt2 t2 WHERE t1.a = t2.a AND t1.a = t2.b ORDER BY t1.a, t2.b;
-                          QUERY PLAN                           
----------------------------------------------------------------
- Sort
-   Sort Key: t1.a
+                       QUERY PLAN                        
+---------------------------------------------------------
+ Merge Join
+   Merge Cond: (t1.a = t2.a)
    ->  Append
-         ->  Merge Join
-               Merge Cond: (t1_1.a = t2_1.a)
-               ->  Index Scan using iprt1_p1_a on prt1_p1 t1_1
-               ->  Sort
...

diff -U3 /Users/admin/pgsql/src/test/regress/expected/partition_join.out /Users/admin/pgsql/build/testrun/regress/regres...
--- /Users/admin/pgsql/src/test/regress/expected/partition_join.out	2024-11-21 11:52:12
+++ /Users/admin/pgsql/build/testrun/regress/regress/results/partition_join.out	2024-11-21 11:54:03
@@ -65,31 +65,24 @@
 -- inner join with partially-redundant join clauses
 EXPLAIN (COSTS OFF)
 SELECT t1.a, t1.c, t2.b, t2.c FROM prt1 t1, prt2 t2 WHERE t1.a = t2.a AND t1.a = t2.b ORDER BY t1.a, t2.b;
-                          QUERY PLAN                           
----------------------------------------------------------------
- Sort
-   Sort Key: t1.a
+                       QUERY PLAN                        
+---------------------------------------------------------
+ Merge Join
+   Merge Cond: (t1.a = t2.a)
    ->  Append
-         ->  Merge Join
-               Merge Cond: (t1_1.a = t2_1.a)
-               ->  Index Scan using iprt1_p1_a on prt1_p1 t1_1
-               ->  Sort
...

diff --strip-trailing-cr -U3 C:/cirrus/src/test/regress/expected/partition_join.out C:/cirrus/build/testrun/pg_upgrade/0...
--- C:/cirrus/src/test/regress/expected/partition_join.out	2024-11-21 11:52:32.704545400 +0000
+++ C:/cirrus/build/testrun/pg_upgrade/002_pg_upgrade/data/results/partition_join.out	2024-11-21 11:56:34.374039000 +000...
@@ -65,31 +65,24 @@
 -- inner join with partially-redundant join clauses
 EXPLAIN (COSTS OFF)
 SELECT t1.a, t1.c, t2.b, t2.c FROM prt1 t1, prt2 t2 WHERE t1.a = t2.a AND t1.a = t2.b ORDER BY t1.a, t2.b;
-                          QUERY PLAN                           
----------------------------------------------------------------
- Sort
-   Sort Key: t1.a
+                       QUERY PLAN                        
+---------------------------------------------------------
+ Merge Join
+   Merge Cond: (t1.a = t2.a)
    ->  Append
-         ->  Merge Join
-               Merge Cond: (t1_1.a = t2_1.a)
-               ->  Index Scan using iprt1_p1_a on prt1_p1 t1_1
-               ->  Sort
...

diff --strip-trailing-cr -U3 C:/cirrus/src/test/regress/expected/partition_join.out C:/cirrus/build/testrun/recovery/027...
--- C:/cirrus/src/test/regress/expected/partition_join.out	2024-11-21 11:52:32.704545400 +0000
+++ C:/cirrus/build/testrun/recovery/027_stream_regress/data/results/partition_join.out	2024-11-21 11:58:52.714412100 +0...
@@ -65,31 +65,24 @@
 -- inner join with partially-redundant join clauses
 EXPLAIN (COSTS OFF)
 SELECT t1.a, t1.c, t2.b, t2.c FROM prt1 t1, prt2 t2 WHERE t1.a = t2.a AND t1.a = t2.b ORDER BY t1.a, t2.b;
-                          QUERY PLAN                           
----------------------------------------------------------------
- Sort
-   Sort Key: t1.a
+                       QUERY PLAN                        
+---------------------------------------------------------
+ Merge Join
+   Merge Cond: (t1.a = t2.a)
    ->  Append
-         ->  Merge Join
-               Merge Cond: (t1_1.a = t2_1.a)
-               ->  Index Scan using iprt1_p1_a on prt1_p1 t1_1
-               ->  Sort
...

diff --strip-trailing-cr -U3 C:/cirrus/src/test/regress/expected/partition_join.out C:/cirrus/build/testrun/regress/regr...
--- C:/cirrus/src/test/regress/expected/partition_join.out	2024-11-21 11:52:32.704545400 +0000
+++ C:/cirrus/build/testrun/regress/regress/results/partition_join.out	2024-11-21 11:56:21.134773000 +0000
@@ -65,31 +65,24 @@
 -- inner join with partially-redundant join clauses
 EXPLAIN (COSTS OFF)
 SELECT t1.a, t1.c, t2.b, t2.c FROM prt1 t1, prt2 t2 WHERE t1.a = t2.a AND t1.a = t2.b ORDER BY t1.a, t2.b;
-                          QUERY PLAN                           
----------------------------------------------------------------
- Sort
-   Sort Key: t1.a
+                       QUERY PLAN                        
+---------------------------------------------------------
+ Merge Join
+   Merge Cond: (t1.a = t2.a)
    ->  Append
-         ->  Merge Join
-               Merge Cond: (t1_1.a = t2_1.a)
-               ->  Index Scan using iprt1_p1_a on prt1_p1 t1_1
-               ->  Sort
...

diff -U3 /tmp/cirrus-ci-build/contrib/citext/expected/citext.out /tmp/cirrus-ci-build/build-32/testrun/citext/regress/re...
--- /tmp/cirrus-ci-build/contrib/citext/expected/citext.out	2024-11-21 10:03:28.707751534 +0000
+++ /tmp/cirrus-ci-build/build-32/testrun/citext/regress/results/citext.out	2024-11-21 10:10:12.639300608 +0000
@@ -500,2185 +500,7 @@
 
 -- SIMILAR TO should be case-insensitive.
 SELECT name FROM srt WHERE name SIMILAR TO '%a.*';
- name 
-------
- ABA
-(1 row)
-
-SELECT name FROM srt WHERE name SIMILAR TO '%A.*';
- name 
-------
- ABA
-(1 row)
-
--- Explicit casts.
-SELECT true::citext = 'true' AS t;
...

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/strings.out /tmp/cirrus-ci-build/build-32/testrun/recovery/027_s...
--- /tmp/cirrus-ci-build/src/test/regress/expected/strings.out	2024-11-21 10:03:30.667751576 +0000
+++ /tmp/cirrus-ci-build/build-32/testrun/recovery/027_stream_regress/data/results/strings.out	2024-11-21 10:09:46.46331...
@@ -438,2255 +438,7 @@
 ERROR:  negative substring length not allowed
 -- T581 regular expression substring (with SQL's bizarre regexp syntax)
 SELECT SUBSTRING('abcdefg' SIMILAR 'a#"(b_d)#"%' ESCAPE '#') AS "bcd";
- bcd 
------
- bcd
-(1 row)
-
--- obsolete SQL99 syntax
-SELECT SUBSTRING('abcdefg' FROM 'a#"(b_d)#"%' FOR '#') AS "bcd";
- bcd 
------
- bcd
-(1 row)
-
--- No match should return NULL
...

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/strings.out /tmp/cirrus-ci-build/build-32/testrun/regress/regres...
--- /tmp/cirrus-ci-build/src/test/regress/expected/strings.out	2024-11-21 10:03:30.667751576 +0000
+++ /tmp/cirrus-ci-build/build-32/testrun/regress/regress/results/strings.out	2024-11-21 10:09:05.071333510 +0000
@@ -438,2255 +438,7 @@
 ERROR:  negative substring length not allowed
 -- T581 regular expression substring (with SQL's bizarre regexp syntax)
 SELECT SUBSTRING('abcdefg' SIMILAR 'a#"(b_d)#"%' ESCAPE '#') AS "bcd";
- bcd 
------
- bcd
-(1 row)
-
--- obsolete SQL99 syntax
-SELECT SUBSTRING('abcdefg' FROM 'a#"(b_d)#"%' FOR '#') AS "bcd";
- bcd 
------
- bcd
-(1 row)
-
--- No match should return NULL
...

diff -U3 /tmp/cirrus-ci-build/src/test/modules/test_regex/expected/test_regex.out /tmp/cirrus-ci-build/build-32/testrun/...
--- /tmp/cirrus-ci-build/src/test/modules/test_regex/expected/test_regex.out	2024-11-21 10:03:30.523751573 +0000
+++ /tmp/cirrus-ci-build/build-32/testrun/test_regex/regress/results/test_regex.out	2024-11-21 10:10:32.547291953 +0000
@@ -1010,4089 +1010,7 @@
 ERROR:  invalid regular expression: invalid character range
 -- expectMatch	9.15 &LP	{[[:<:]]a}	a	a
 select * from test_regex('[[:<:]]a', 'a', 'LP');
-          test_regex           
--------------------------------
- {0,REG_UNONPOSIX,REG_ULOCALE}
- {a}
-(2 rows)
-
-select * from test_regex('[[:<:]]a', 'a', 'LPb');
-          test_regex           
--------------------------------
- {0,REG_UNONPOSIX,REG_ULOCALE}
- {a}
-(2 rows)
-
...

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/privs_in_db.out /tmp/cirrus-ci-build/build/testrun/regress-runni...
--- /tmp/cirrus-ci-build/src/test/regress/expected/privs_in_db.out	2024-11-21 09:26:56.997202000 +0000
+++ /tmp/cirrus-ci-build/build/testrun/regress-running/regress/results/privs_in_db.out	2024-11-21 09:32:47.558786000 +00...
@@ -756,9 +756,10 @@
 DROP DATABASE regression_db_0;
 DROP ROLE regress_role_admin;
 SELECT datname FROM pg_database WHERE datname LIKE 'regression_db_%';
- datname 
----------
-(0 rows)
+      datname      
+-------------------
+ regression_dblink
+(1 row)
 
 SELECT rolname FROM pg_roles WHERE rolname LIKE 'regress_role_%';
  rolname 

diff -U3 /tmp/cirrus-ci-build/src/test/modules/injection_points/expected/reindex_concurrently_upsert.out /tmp/cirrus-ci-...
--- /tmp/cirrus-ci-build/src/test/modules/injection_points/expected/reindex_concurrently_upsert.out	2024-11-21 08:08:24....
+++ /tmp/cirrus-ci-build/build/testrun/injection_points/isolation/results/reindex_concurrently_upsert.out	2024-11-21 08:...
@@ -47,7 +47,6 @@
                        
 (1 row)
 
-step s1_start_upsert: <... completed>
 step s4_wakeup_s2: 
 	SELECT injection_points_wakeup('exec_insert_before_insert_speculative');
 	SELECT injection_points_detach('exec_insert_before_insert_speculative');
@@ -67,17 +66,13 @@
 	SELECT injection_points_wakeup('reindex_relation_concurrently_before_set_dead');
 	SELECT injection_points_detach('reindex_relation_concurrently_before_set_dead');
 
-injection_points_wakeup
------------------------
-                       
-(1 row)
-
...

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/jsonb.out /tmp/cirrus-ci-build/build/testrun/recovery/027_stream...
--- /tmp/cirrus-ci-build/src/test/regress/expected/jsonb.out	2024-11-21 01:30:27.148107000 +0000
+++ /tmp/cirrus-ci-build/build/testrun/recovery/027_stream_regress/data/results/jsonb.out	2024-11-21 01:32:48.093838000 ...
@@ -5766,8 +5766,8 @@
 ----------------------------------------
  null
  ""
- "A"
  "a"
+ "A"
  -3.14159
  0
  0.0000000001

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/jsonb.out /tmp/cirrus-ci-build/build/testrun/regress/regress/res...
--- /tmp/cirrus-ci-build/src/test/regress/expected/jsonb.out	2024-11-21 01:30:27.148107000 +0000
+++ /tmp/cirrus-ci-build/build/testrun/regress/regress/results/jsonb.out	2024-11-21 01:31:55.787907000 +0000
@@ -5766,8 +5766,8 @@
 ----------------------------------------
  null
  ""
- "A"
  "a"
+ "A"
  -3.14159
  0
  0.0000000001

diff --strip-trailing-cr -U3 C:/cirrus/src/test/regress/expected/jsonb.out C:/cirrus/build/testrun/recovery/027_stream_r...
--- C:/cirrus/src/test/regress/expected/jsonb.out	2024-11-21 01:30:32.293218600 +0000
+++ C:/cirrus/build/testrun/recovery/027_stream_regress/data/results/jsonb.out	2024-11-21 01:35:55.894944800 +0000
@@ -5766,8 +5766,8 @@
 ----------------------------------------
  null
  ""
- "A"
  "a"
+ "A"
  -3.14159
  0
  0.0000000001

diff --strip-trailing-cr -U3 C:/cirrus/src/test/regress/expected/jsonb.out C:/cirrus/build/testrun/regress/regress/resul...
--- C:/cirrus/src/test/regress/expected/jsonb.out	2024-11-21 01:30:32.293218600 +0000
+++ C:/cirrus/build/testrun/regress/regress/results/jsonb.out	2024-11-21 01:33:41.993913700 +0000
@@ -5766,8 +5766,8 @@
 ----------------------------------------
  null
  ""
- "A"
  "a"
+ "A"
  -3.14159
  0
  0.0000000001

diff -U3 /tmp/cirrus-ci-build/contrib/pg_stat_statements/expected/level_tracking.out /tmp/cirrus-ci-build/build/testrun/...
--- /tmp/cirrus-ci-build/contrib/pg_stat_statements/expected/level_tracking.out	2024-11-21 00:04:06.029806000 +0000
+++ /tmp/cirrus-ci-build/build/testrun/pg_stat_statements/regress/results/level_tracking.out	2024-11-21 00:07:02.5094320...
@@ -383,26 +383,24 @@
 (1 row)
 
 EXPLAIN (COSTS OFF) SELECT 1, 2 UNION SELECT 3, 4\; EXPLAIN (COSTS OFF) (SELECT 1, 2, 3) UNION SELECT 3, 4, 5;
+      QUERY PLAN       
+-----------------------
+ HashAggregate
+   Group Key: (1), (2)
+   ->  Append
+         ->  Result
+         ->  Result
+(5 rows)
+
          QUERY PLAN         
 ----------------------------
- Unique
-   ->  Sort
...

diff -U3 /tmp/cirrus-ci-build/contrib/pg_stat_statements/expected/level_tracking.out /tmp/cirrus-ci-build/contrib/pg_sta...
--- /tmp/cirrus-ci-build/contrib/pg_stat_statements/expected/level_tracking.out	2024-11-21 00:04:02.366232945 +0000
+++ /tmp/cirrus-ci-build/contrib/pg_stat_statements/results/level_tracking.out	2024-11-21 00:08:39.485180587 +0000
@@ -383,25 +383,23 @@
 (1 row)
 
 EXPLAIN (COSTS OFF) SELECT 1, 2 UNION SELECT 3, 4\; EXPLAIN (COSTS OFF) (SELECT 1, 2, 3) UNION SELECT 3, 4, 5;
+      QUERY PLAN       
+-----------------------
+ HashAggregate
+   Group Key: (1), (2)
+   ->  Append
+         ->  Result
+         ->  Result
+(5 rows)
+
          QUERY PLAN         
 ----------------------------
- Unique
-   ->  Sort
...

diff -U3 /tmp/cirrus-ci-build/contrib/pg_stat_statements/expected/level_tracking.out /tmp/cirrus-ci-build/build/testrun/...
--- /tmp/cirrus-ci-build/contrib/pg_stat_statements/expected/level_tracking.out	2024-11-21 00:04:02.288967889 +0000
+++ /tmp/cirrus-ci-build/build/testrun/pg_stat_statements/regress/results/level_tracking.out	2024-11-21 00:08:57.8410855...
@@ -383,25 +383,23 @@
 (1 row)
 
 EXPLAIN (COSTS OFF) SELECT 1, 2 UNION SELECT 3, 4\; EXPLAIN (COSTS OFF) (SELECT 1, 2, 3) UNION SELECT 3, 4, 5;
+      QUERY PLAN       
+-----------------------
+ HashAggregate
+   Group Key: (1), (2)
+   ->  Append
+         ->  Result
+         ->  Result
+(5 rows)
+
          QUERY PLAN         
 ----------------------------
- Unique
-   ->  Sort
...

diff -U3 /Users/admin/pgsql/contrib/pg_stat_statements/expected/level_tracking.out /Users/admin/pgsql/build/testrun/pg_s...
--- /Users/admin/pgsql/contrib/pg_stat_statements/expected/level_tracking.out	2024-11-21 00:03:06
+++ /Users/admin/pgsql/build/testrun/pg_stat_statements/regress/results/level_tracking.out	2024-11-21 00:06:18
@@ -383,25 +383,23 @@
 (1 row)
 
 EXPLAIN (COSTS OFF) SELECT 1, 2 UNION SELECT 3, 4\; EXPLAIN (COSTS OFF) (SELECT 1, 2, 3) UNION SELECT 3, 4, 5;
+      QUERY PLAN       
+-----------------------
+ HashAggregate
+   Group Key: (1), (2)
+   ->  Append
+         ->  Result
+         ->  Result
+(5 rows)
+
          QUERY PLAN         
 ----------------------------
- Unique
-   ->  Sort
...

diff --strip-trailing-cr -U3 C:/cirrus/contrib/pg_stat_statements/expected/level_tracking.out C:/cirrus/build/testrun/pg...
--- C:/cirrus/contrib/pg_stat_statements/expected/level_tracking.out	2024-11-21 00:04:12.376439200 +0000
+++ C:/cirrus/build/testrun/pg_stat_statements/regress/results/level_tracking.out	2024-11-21 00:10:33.737712600 +0000
@@ -383,25 +383,23 @@
 (1 row)
 
 EXPLAIN (COSTS OFF) SELECT 1, 2 UNION SELECT 3, 4\; EXPLAIN (COSTS OFF) (SELECT 1, 2, 3) UNION SELECT 3, 4, 5;
+      QUERY PLAN       
+-----------------------
+ HashAggregate
+   Group Key: (1), (2)
+   ->  Append
+         ->  Result
+         ->  Result
+(5 rows)
+
          QUERY PLAN         
 ----------------------------
- Unique
-   ->  Sort
...

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/triggers.out /tmp/cirrus-ci-build/build/testrun/regress-running/...
--- /tmp/cirrus-ci-build/src/test/regress/expected/triggers.out	2024-10-24 15:29:17.228211000 +0000
+++ /tmp/cirrus-ci-build/build/testrun/regress-running/regress/results/triggers.out	2024-10-24 15:34:41.423741000 +0000
@@ -2505,19 +2505,23 @@
 insert into parted values (1, 1, 'uno uno v6');
 create table parted_3 partition of parted for values in (3);
 update parted set a = a + 1;
+ERROR:  error triggered for injection point typecache-before-rel-type-cache-insert
+CONTEXT:  PL/pgSQL function parted_trigfunc() during initialization of execution state
 select tableoid::regclass, * from parted;
- tableoid | a | b |                      c                      
-----------+---+---+---------------------------------------------
- parted_3 | 3 | 1 | uno uno v6 did INSERT did UPDATE did INSERT
+  tableoid  | a | b |           c           
+------------+---+---+-----------------------
+ parted_1_1 | 1 | 1 | uno uno v6 did INSERT
 (1 row)
 
 -- there's no partition for a=0, but this update works anyway because
 -- the trigger causes the tuple to be routed to another partition
...

diff -U3 /tmp/cirrus-ci-build/src/test/modules/test_tidstore/expected/test_tidstore.out /tmp/cirrus-ci-build/build/testr...
--- /tmp/cirrus-ci-build/src/test/modules/test_tidstore/expected/test_tidstore.out	2024-10-24 15:29:17.107930000 +0000
+++ /tmp/cirrus-ci-build/build/testrun/test_tidstore-running/regress/results/test_tidstore.out	2024-10-24 15:34:40.31857...
@@ -32,20 +32,17 @@
     (VALUES (0), (1), (:maxblkno / 2), (:maxblkno - 1), (:maxblkno)) AS blocks(blk),
     (VALUES (1), (2), (:maxoffset / 2), (:maxoffset - 1), (:maxoffset)) AS offsets(off)
   GROUP BY blk;
+ERROR:  error triggered for injection point typecache-before-rel-type-cache-insert
+LINE 6:   GROUP BY blk;
+                   ^
 -- Test offsets embedded in the bitmap header.
 SELECT do_set_block_offsets(501, array[greatest((random() * :maxoffset)::int, 1)]::int2[]);
- do_set_block_offsets 
-----------------------
-                  501
-(1 row)
-
+ERROR:  error triggered for injection point typecache-before-rel-type-cache-insert
 SELECT do_set_block_offsets(502, array_agg(DISTINCT greatest((random() * :maxoffset)::int, 1))::int2[])
   FROM generate_series(1, 3);
...

diff -U3 /tmp/cirrus-ci-build/src/test/modules/injection_points/expected/basic.out /tmp/cirrus-ci-build/build/testrun/in...
--- /tmp/cirrus-ci-build/src/test/modules/injection_points/expected/basic.out	2024-10-23 12:56:16.951143000 +0000
+++ /tmp/cirrus-ci-build/build/testrun/injection_points/isolation/results/basic.out	2024-10-23 12:59:41.138085000 +0000
@@ -13,16 +13,16 @@
                        
 (1 row)
 
-step wait1: <... completed>
-injection_points_run
---------------------
-                    
-(1 row)
-
 step detach2: SELECT injection_points_detach('injection-points-wait');
 injection_points_detach
 -----------------------
                        
+(1 row)
+
+step wait1: <... completed>
...

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/triggers.out /tmp/cirrus-ci-build/build/testrun/regress-running/...
--- /tmp/cirrus-ci-build/src/test/regress/expected/triggers.out	2024-10-22 18:23:14.676052000 +0000
+++ /tmp/cirrus-ci-build/build/testrun/regress-running/regress/results/triggers.out	2024-10-22 18:28:03.168650000 +0000
@@ -2145,14 +2145,9 @@
 create table trigpart3 (like trigpart);
 create trigger trg1 after insert on trigpart3 for each row execute procedure trigger_nothing();
 \d trigpart3
-             Table "public.trigpart3"
- Column |  Type   | Collation | Nullable | Default 
---------+---------+-----------+----------+---------
- a      | integer |           |          | 
- b      | integer |           |          | 
-Triggers:
-    trg1 AFTER INSERT ON trigpart3 FOR EACH ROW EXECUTE FUNCTION trigger_nothing()
-
+ERROR:  error triggered for injection point typecache-before-rel-type-cache-insert
+LINE 2: ....pg_roles where oid = any (pol.polroles) order by 1),',') EN...
+                                                             ^
 alter table trigpart attach partition trigpart3 FOR VALUES FROM (2000) to (3000); -- fail
 ERROR:  trigger "trg1" for relation "trigpart3" already exists
...

diff -U3 /tmp/cirrus-ci-build/src/test/modules/injection_points/expected/cluster.out /tmp/cirrus-ci-build/build/testrun/...
--- /tmp/cirrus-ci-build/src/test/modules/injection_points/expected/cluster.out	2024-10-20 17:05:57.229994000 +0000
+++ /tmp/cirrus-ci-build/build/testrun/injection_points/isolation/results/cluster.out	2024-10-20 17:09:20.421691000 +000...
@@ -8,7 +8,8 @@
 
 step wait_before_lock: 
 	CLUSTER (CONCURRENTLY) clstr_test USING clstr_test_pkey;
- <waiting ...>
+
+ERROR:  file of relation "clstr_test" changed by another transaction
 step change_existing: 
 	UPDATE clstr_test SET i=10 where i=1;
 	UPDATE clstr_test SET j=20 where i=2;
@@ -63,12 +64,7 @@
 step wakeup_before_lock: 
 	SELECT injection_points_wakeup('cluster-concurrently-before-lock');
 
-injection_points_wakeup
------------------------
-                       
...

diff -U3 /tmp/cirrus-ci-build/src/test/modules/injection_points/expected/cluster.out /tmp/cirrus-ci-build/build/testrun/...
--- /tmp/cirrus-ci-build/src/test/modules/injection_points/expected/cluster.out	2024-10-20 17:05:54.172866284 +0000
+++ /tmp/cirrus-ci-build/build/testrun/injection_points/isolation/results/cluster.out	2024-10-20 17:11:38.219271952 +000...
@@ -68,118 +68,7 @@
                        
 (1 row)
 
-step wait_before_lock: <... completed>
-step check1: 
-	INSERT INTO relfilenodes(node)
-	SELECT relfilenode FROM pg_class WHERE relname='clstr_test';
-
-	SELECT count(DISTINCT node) FROM relfilenodes;
-
-	SELECT i, j FROM clstr_test ORDER BY i, j;
-
-	INSERT INTO data_s1(_xmin, _cmin, i, j)
-	SELECT xmin, cmin, i, j FROM clstr_test;
-
-	SELECT count(*)
...

diff -U3 /tmp/cirrus-ci-build/contrib/postgres_fdw/expected/postgres_fdw.out /tmp/cirrus-ci-build/build/testrun/postgres...
--- /tmp/cirrus-ci-build/contrib/postgres_fdw/expected/postgres_fdw.out	2024-10-12 08:03:46.883764000 +0000
+++ /tmp/cirrus-ci-build/build/testrun/postgres_fdw/regress/results/postgres_fdw.out	2024-10-12 08:06:38.818036000 +0000
@@ -10155,9 +10155,8 @@
          ->  Foreign Scan
                Relations: (ftprt1_p1 t1_1) INNER JOIN (ftprt2_p1 t2_1)
                ->  Result
-                     Disabled Nodes: 1
                      ->  Sort
-                           Disabled Nodes: 1
+                           Disabled: true
                            Sort Key: t2_1.a
                            ->  Nested Loop
                                  ->  Foreign Scan on ftprt1_p1 t1_1
@@ -10165,14 +10164,13 @@
          ->  Foreign Scan
                Relations: (ftprt1_p2 t1_2) INNER JOIN (ftprt2_p2 t2_2)
                ->  Result
-                     Disabled Nodes: 1
                      ->  Sort
...

diff -U3 /tmp/cirrus-ci-build/contrib/postgres_fdw/expected/postgres_fdw.out /tmp/cirrus-ci-build/contrib/postgres_fdw/r...
--- /tmp/cirrus-ci-build/contrib/postgres_fdw/expected/postgres_fdw.out	2024-10-12 08:03:41.300159101 +0000
+++ /tmp/cirrus-ci-build/contrib/postgres_fdw/results/postgres_fdw.out	2024-10-12 08:09:06.477714299 +0000
@@ -10155,9 +10155,8 @@
          ->  Foreign Scan
                Relations: (ftprt1_p1 t1_1) INNER JOIN (ftprt2_p1 t2_1)
                ->  Result
-                     Disabled Nodes: 1
                      ->  Sort
-                           Disabled Nodes: 1
+                           Disabled: true
                            Sort Key: t2_1.a
                            ->  Nested Loop
                                  ->  Foreign Scan on ftprt1_p1 t1_1
@@ -10165,14 +10164,13 @@
          ->  Foreign Scan
                Relations: (ftprt1_p2 t1_2) INNER JOIN (ftprt2_p2 t2_2)
                ->  Result
-                     Disabled Nodes: 1
                      ->  Sort
...

diff -U3 /tmp/cirrus-ci-build/contrib/postgres_fdw/expected/postgres_fdw.out /tmp/cirrus-ci-build/build/testrun/postgres...
--- /tmp/cirrus-ci-build/contrib/postgres_fdw/expected/postgres_fdw.out	2024-10-12 08:03:39.284306324 +0000
+++ /tmp/cirrus-ci-build/build/testrun/postgres_fdw/regress/results/postgres_fdw.out	2024-10-12 08:08:20.887368441 +0000
@@ -10155,9 +10155,8 @@
          ->  Foreign Scan
                Relations: (ftprt1_p1 t1_1) INNER JOIN (ftprt2_p1 t2_1)
                ->  Result
-                     Disabled Nodes: 1
                      ->  Sort
-                           Disabled Nodes: 1
+                           Disabled: true
                            Sort Key: t2_1.a
                            ->  Nested Loop
                                  ->  Foreign Scan on ftprt1_p1 t1_1
@@ -10165,14 +10164,13 @@
          ->  Foreign Scan
                Relations: (ftprt1_p2 t1_2) INNER JOIN (ftprt2_p2 t2_2)
                ->  Result
-                     Disabled Nodes: 1
                      ->  Sort
...

diff --strip-trailing-cr -U3 C:/cirrus/contrib/postgres_fdw/expected/postgres_fdw.out C:/cirrus/build/testrun/postgres_f...
--- C:/cirrus/contrib/postgres_fdw/expected/postgres_fdw.out	2024-10-12 08:04:05.080264400 +0000
+++ C:/cirrus/build/testrun/postgres_fdw/regress/results/postgres_fdw.out	2024-10-12 08:11:44.225420400 +0000
@@ -10155,9 +10155,8 @@
          ->  Foreign Scan
                Relations: (ftprt1_p1 t1_1) INNER JOIN (ftprt2_p1 t2_1)
                ->  Result
-                     Disabled Nodes: 1
                      ->  Sort
-                           Disabled Nodes: 1
+                           Disabled: true
                            Sort Key: t2_1.a
                            ->  Nested Loop
                                  ->  Foreign Scan on ftprt1_p1 t1_1
@@ -10165,14 +10164,13 @@
          ->  Foreign Scan
                Relations: (ftprt1_p2 t1_2) INNER JOIN (ftprt2_p2 t2_2)
                ->  Result
-                     Disabled Nodes: 1
                      ->  Sort
...

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/triggers.out /tmp/cirrus-ci-build/build/testrun/pg_upgrade/002_p...
--- /tmp/cirrus-ci-build/src/test/regress/expected/triggers.out	2024-09-30 20:42:49.564336000 +0000
+++ /tmp/cirrus-ci-build/build/testrun/pg_upgrade/002_pg_upgrade/data/results/triggers.out	2024-09-30 20:44:15.383031000...
@@ -2574,1184 +2574,7 @@
 
 drop table parted;
 drop function parted_trigfunc();
---
--- Constraint triggers and partitioned tables
-create table parted_constr_ancestor (a int, b text)
-  partition by range (b);
-create table parted_constr (a int, b text)
-  partition by range (b);
-alter table parted_constr_ancestor attach partition parted_constr
-  for values from ('aaaa') to ('zzzz');
-create table parted1_constr (a int, b text);
-alter table parted_constr attach partition parted1_constr
-  for values from ('aaaa') to ('bbbb');
-create constraint trigger parted_trig after insert on parted_constr_ancestor
-  deferrable
...

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/triggers.out /tmp/cirrus-ci-build/build/testrun/recovery/027_str...
--- /tmp/cirrus-ci-build/src/test/regress/expected/triggers.out	2024-09-30 20:42:49.564336000 +0000
+++ /tmp/cirrus-ci-build/build/testrun/recovery/027_stream_regress/data/results/triggers.out	2024-09-30 20:44:37.4183580...
@@ -2625,1133 +2625,10 @@
 NOTICE:  trigger parted_trig_two on parted1_constr AFTER INSERT for ROW: (a,b)=(3,aasvogel)
 drop table parted_constr_ancestor;
 drop function bark(text);
--- Test that the WHEN clause is set properly to partitions
-create table parted_trigger (a int, b text) partition by range (a);
-create table parted_trigger_1 partition of parted_trigger for values from (0) to (1000);
-create table parted_trigger_2 (drp int, a int, b text);
-alter table parted_trigger_2 drop column drp;
-alter table parted_trigger attach partition parted_trigger_2 for values from (1000) to (2000);
-create trigger parted_trigger after update on parted_trigger
-  for each row when (new.a % 2 = 1 and length(old.b) >= 2) execute procedure trigger_notice_ab();
-create table parted_trigger_3 (b text, a int) partition by range (length(b));
-create table parted_trigger_3_1 partition of parted_trigger_3 for values from (1) to (3);
-create table parted_trigger_3_2 partition of parted_trigger_3 for values from (3) to (5);
-alter table parted_trigger attach partition parted_trigger_3 for values from (2000) to (3000);
-insert into parted_trigger values
...

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/triggers.out /tmp/cirrus-ci-build/build/testrun/regress/regress/...
--- /tmp/cirrus-ci-build/src/test/regress/expected/triggers.out	2024-09-30 20:42:49.564336000 +0000
+++ /tmp/cirrus-ci-build/build/testrun/regress/regress/results/triggers.out	2024-09-30 20:44:12.046090000 +0000
@@ -2607,1151 +2607,7 @@
 NOTICE:  trigger parted_trig on parted1_constr AFTER INSERT for ROW: (a,b)=(3,aasvogel)
 commit;
 NOTICE:  trigger parted_trig_two on parted1_constr AFTER INSERT for ROW: (a,b)=(1,aardvark)
-NOTICE:  trigger parted_trig_two on parted1_constr AFTER INSERT for ROW: (a,b)=(3,aasvogel)
--- The WHEN clause is immediate, and both constraint triggers are fired at
--- commit time.
-begin;
-set constraints parted_trig deferred;
-insert into parted_constr values (1, 'aardvark');
-NOTICE:  aardvark <- woof!
-insert into parted1_constr values (2, 'aardwolf'), (3, 'aasvogel');
-NOTICE:  aardwolf <- woof!
-NOTICE:  aasvogel <- woof!
-commit;
-NOTICE:  trigger parted_trig on parted1_constr AFTER INSERT for ROW: (a,b)=(1,aardvark)
-NOTICE:  trigger parted_trig_two on parted1_constr AFTER INSERT for ROW: (a,b)=(1,aardvark)
...

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/triggers.out /tmp/cirrus-ci-build/src/bin/pg_upgrade/tmp_check/r...
--- /tmp/cirrus-ci-build/src/test/regress/expected/triggers.out	2024-09-30 20:42:47.105343454 +0000
+++ /tmp/cirrus-ci-build/src/bin/pg_upgrade/tmp_check/results/triggers.out	2024-09-30 20:46:58.537011418 +0000
@@ -2691,1067 +2691,10 @@
   for each row execute procedure trigger_notice_ab();
 create table parted_trigger_3 (b text, a int) partition by range (length(b));
 create table parted_trigger_3_1 partition of parted_trigger_3 for values from (1) to (4);
-create table parted_trigger_3_2 partition of parted_trigger_3 for values from (4) to (8);
-alter table parted_trigger attach partition parted_trigger_3 for values from (2000) to (3000);
-insert into parted_trigger values (0, 'a'), (1000, 'c'), (2000, 'e'), (2001, 'eeee');
-update parted_trigger set a = a + 2;	-- no notices here
-update parted_trigger set b = b || 'b';	-- all triggers should fire
-NOTICE:  trigger parted_trigger on parted_trigger_1 AFTER UPDATE for ROW: (a,b)=(2,ab)
-NOTICE:  trigger parted_trigger on parted_trigger_2 AFTER UPDATE for ROW: (a,b)=(1002,cb)
-NOTICE:  trigger parted_trigger on parted_trigger_3_1 AFTER UPDATE for ROW: (a,b)=(2002,eb)
-NOTICE:  trigger parted_trigger on parted_trigger_3_2 AFTER UPDATE for ROW: (a,b)=(2003,eeeeb)
-drop table parted_trigger;
-drop function trigger_notice_ab();
--- Make sure we don't end up with unnecessary copies of triggers, when
--- cloning them.
...

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/triggers.out /tmp/cirrus-ci-build/src/test/regress/results/trigg...
--- /tmp/cirrus-ci-build/src/test/regress/expected/triggers.out	2024-09-30 20:42:47.105343454 +0000
+++ /tmp/cirrus-ci-build/src/test/regress/results/triggers.out	2024-09-30 20:45:40.717093299 +0000
@@ -3153,605 +3153,10 @@
   for each statement execute procedure dump_delete();
 -- insert directly into children sees respective child-format tuples
 insert into child1 values ('AAA', 42);
-NOTICE:  trigger = child1_insert_trig, new table = (AAA,42)
-insert into child2 values (42, 'BBB');
-NOTICE:  trigger = child2_insert_trig, new table = (42,BBB)
-insert into child3 values ('CCC', 42, 'foo');
-NOTICE:  trigger = child3_insert_trig, new table = (CCC,42,foo)
--- update via parent sees parent-format tuples
-update parent set b = b + 1;
-NOTICE:  trigger = parent_update_trig, old table = (AAA,42), (BBB,42), (CCC,42), new table = (AAA,43), (BBB,43), (CCC,4...
--- delete via parent sees parent-format tuples
-delete from parent;
-NOTICE:  trigger = parent_delete_trig, old table = (AAA,43), (BBB,43), (CCC,43)
--- reinsert values into children for next test...
-insert into child1 values ('AAA', 42);
...

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/triggers.out /tmp/cirrus-ci-build/build/testrun/pg_upgrade/002_p...
--- /tmp/cirrus-ci-build/src/test/regress/expected/triggers.out	2024-09-30 20:42:45.946820836 +0000
+++ /tmp/cirrus-ci-build/build/testrun/pg_upgrade/002_pg_upgrade/data/results/triggers.out	2024-09-30 20:46:06.737761322...
@@ -2560,1198 +2560,7 @@
 create trigger t before insert or update on parted
   for each row execute function parted_trigfunc();
 insert into parted values (0, 1, 'zero win');
-insert into parted values (1, 1, 'one fail');
-ERROR:  moving row to another partition during a BEFORE FOR EACH ROW trigger is not supported
-DETAIL:  Before executing trigger "t", the row was to be in partition "public.parted_1".
-insert into parted values (1, 2, 'two fail');
-ERROR:  moving row to another partition during a BEFORE FOR EACH ROW trigger is not supported
-DETAIL:  Before executing trigger "t", the row was to be in partition "public.parted_2".
-select * from parted;
- a | b |    c     
----+---+----------
- 1 | 1 | zero win
-(1 row)
-
-drop table parted;
...

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/triggers.out /tmp/cirrus-ci-build/build/testrun/recovery/027_str...
--- /tmp/cirrus-ci-build/src/test/regress/expected/triggers.out	2024-09-30 20:42:45.946820836 +0000
+++ /tmp/cirrus-ci-build/build/testrun/recovery/027_stream_regress/data/results/triggers.out	2024-09-30 20:46:35.1897302...
@@ -1643,2115 +1643,10 @@
 $$;
 create trigger depth_b_tr before insert on depth_b
   for each row execute procedure depth_b_tf();
-create function depth_c_tf() returns trigger
-  language plpgsql as $$
-begin
-  raise notice '%: depth = %', tg_name, pg_trigger_depth();
-  if new.id = 1 then
-    raise exception sqlstate 'U9999';
-  end if;
-  raise notice '%: depth = %', tg_name, pg_trigger_depth();
-  return new;
-end;
-$$;
-create trigger depth_c_tr before insert on depth_c
-  for each row execute procedure depth_c_tf();
...

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/triggers.out /tmp/cirrus-ci-build/build/testrun/regress/regress/...
--- /tmp/cirrus-ci-build/src/test/regress/expected/triggers.out	2024-09-30 20:42:45.946820836 +0000
+++ /tmp/cirrus-ci-build/build/testrun/regress/regress/results/triggers.out	2024-09-30 20:46:02.877766172 +0000
@@ -2625,1133 +2625,10 @@
 NOTICE:  trigger parted_trig_two on parted1_constr AFTER INSERT for ROW: (a,b)=(3,aasvogel)
 drop table parted_constr_ancestor;
 drop function bark(text);
--- Test that the WHEN clause is set properly to partitions
-create table parted_trigger (a int, b text) partition by range (a);
-create table parted_trigger_1 partition of parted_trigger for values from (0) to (1000);
-create table parted_trigger_2 (drp int, a int, b text);
-alter table parted_trigger_2 drop column drp;
-alter table parted_trigger attach partition parted_trigger_2 for values from (1000) to (2000);
-create trigger parted_trigger after update on parted_trigger
-  for each row when (new.a % 2 = 1 and length(old.b) >= 2) execute procedure trigger_notice_ab();
-create table parted_trigger_3 (b text, a int) partition by range (length(b));
-create table parted_trigger_3_1 partition of parted_trigger_3 for values from (1) to (3);
-create table parted_trigger_3_2 partition of parted_trigger_3 for values from (3) to (5);
-alter table parted_trigger attach partition parted_trigger_3 for values from (2000) to (3000);
-insert into parted_trigger values
...

diff -U3 /Users/admin/pgsql/src/test/regress/expected/triggers.out /Users/admin/pgsql/build/testrun/pg_upgrade/002_pg_up...
--- /Users/admin/pgsql/src/test/regress/expected/triggers.out	2024-09-30 20:42:45
+++ /Users/admin/pgsql/build/testrun/pg_upgrade/002_pg_upgrade/data/results/triggers.out	2024-09-30 20:45:56
@@ -999,2759 +999,10 @@
 	f2 int,
 	f3 int);
 INSERT INTO min_updates_test VALUES ('a',1,2),('b','2',null);
-CREATE TRIGGER z_min_update
-BEFORE UPDATE ON min_updates_test
-FOR EACH ROW EXECUTE PROCEDURE suppress_redundant_updates_trigger();
-\set QUIET false
-UPDATE min_updates_test SET f1 = f1;
-UPDATE 0
-UPDATE min_updates_test SET f2 = f2 + 1;
-UPDATE 2
-UPDATE min_updates_test SET f3 = 2 WHERE f3 is null;
-UPDATE 1
-\set QUIET true
-SELECT * FROM min_updates_test;
- f1 | f2 | f3 
...

diff -U3 /Users/admin/pgsql/src/test/regress/expected/triggers.out /Users/admin/pgsql/build/testrun/recovery/027_stream_...
--- /Users/admin/pgsql/src/test/regress/expected/triggers.out	2024-09-30 20:42:45
+++ /Users/admin/pgsql/build/testrun/recovery/027_stream_regress/data/results/triggers.out	2024-09-30 20:47:22
@@ -1618,2140 +1618,14 @@
 begin
   raise notice '%: depth = %', tg_name, pg_trigger_depth();
   insert into depth_b values (new.id);
-  raise notice '%: depth = %', tg_name, pg_trigger_depth();
-  return new;
-end;
-$$;
-create trigger depth_a_tr before insert on depth_a
-  for each row execute procedure depth_a_tf();
-create function depth_b_tf() returns trigger
-  language plpgsql as $$
-begin
-  raise notice '%: depth = %', tg_name, pg_trigger_depth();
-  begin
-    execute 'insert into depth_c values (' || new.id::text || ')';
-  exception
...

diff -U3 /Users/admin/pgsql/src/test/regress/expected/updatable_views.out /Users/admin/pgsql/build/testrun/regress/regre...
--- /Users/admin/pgsql/src/test/regress/expected/updatable_views.out	2024-09-30 20:42:45
+++ /Users/admin/pgsql/build/testrun/regress/regress/results/updatable_views.out	2024-09-30 20:45:56
@@ -1157,2853 +1157,10 @@
 MERGE INTO rw_view2 t
   USING (SELECT x, 'R'||x FROM generate_series(0,3) x) AS s(a,b) ON t.a = s.a
   WHEN MATCHED AND t.a <= 1 THEN DELETE
-  WHEN MATCHED THEN UPDATE SET b = s.b
-  WHEN NOT MATCHED AND s.a > 0 THEN INSERT VALUES (s.a, s.b)
-  RETURNING merge_action(), s.*, t.*;
- merge_action | a | b  | a |   b   
---------------+---+----+---+-------
- DELETE       | 1 | R1 | 1 | Row 1
- UPDATE       | 2 | R2 | 2 | R2
- INSERT       | 3 | R3 | 3 | R3
-(3 rows)
-
-SELECT * FROM base_tbl ORDER BY a;
- a  |   b    
-----+--------
...

diff --strip-trailing-cr -U3 C:/cirrus/src/test/regress/expected/updatable_views.out C:/cirrus/build/testrun/pg_upgrade/...
--- C:/cirrus/src/test/regress/expected/updatable_views.out	2024-09-30 20:42:54.923191100 +0000
+++ C:/cirrus/build/testrun/pg_upgrade/002_pg_upgrade/data/results/updatable_views.out	2024-09-30 20:45:22.136883700 +00...
@@ -1160,2850 +1160,7 @@
   WHEN MATCHED THEN UPDATE SET b = s.b
   WHEN NOT MATCHED AND s.a > 0 THEN INSERT VALUES (s.a, s.b)
   RETURNING merge_action(), s.*, t.*;
- merge_action | a | b  | a |   b   
---------------+---+----+---+-------
- DELETE       | 1 | R1 | 1 | Row 1
- UPDATE       | 2 | R2 | 2 | R2
- INSERT       | 3 | R3 | 3 | R3
-(3 rows)
-
-SELECT * FROM base_tbl ORDER BY a;
- a  |   b    
-----+--------
- -2 | Row -2
- -1 | Row -1
-  0 | Row 0
...

diff --strip-trailing-cr -U3 C:/cirrus/src/test/regress/expected/triggers.out C:/cirrus/build/testrun/recovery/027_strea...
--- C:/cirrus/src/test/regress/expected/triggers.out	2024-09-30 20:42:54.909600700 +0000
+++ C:/cirrus/build/testrun/recovery/027_stream_regress/data/results/triggers.out	2024-09-30 20:47:23.093525700 +0000
@@ -3738,20 +3738,10 @@
 drop table grandparent;
 -- Trigger renaming does not recurse on legacy inheritance
 create table parent (a int);
-create table child () inherits (parent);
-create trigger parenttrig after insert on parent
-for each row execute procedure f();
-create trigger parenttrig after insert on child
-for each row execute procedure f();
-alter trigger parenttrig on parent rename to anothertrig;
-\d+ child
-                                   Table "public.child"
- Column |  Type   | Collation | Nullable | Default | Storage | Stats target | Description 
---------+---------+-----------+----------+---------+---------+--------------+-------------
- a      | integer |           |          |         | plain   |              | 
-Triggers:
-    parenttrig AFTER INSERT ON child FOR EACH ROW EXECUTE FUNCTION f()
...

diff --strip-trailing-cr -U3 C:/cirrus/src/test/regress/expected/updatable_views.out C:/cirrus/build/testrun/regress/reg...
--- C:/cirrus/src/test/regress/expected/updatable_views.out	2024-09-30 20:42:54.923191100 +0000
+++ C:/cirrus/build/testrun/regress/regress/results/updatable_views.out	2024-09-30 20:45:20.543140600 +0000
@@ -1160,2850 +1160,7 @@
   WHEN MATCHED THEN UPDATE SET b = s.b
   WHEN NOT MATCHED AND s.a > 0 THEN INSERT VALUES (s.a, s.b)
   RETURNING merge_action(), s.*, t.*;
- merge_action | a | b  | a |   b   
---------------+---+----+---+-------
- DELETE       | 1 | R1 | 1 | Row 1
- UPDATE       | 2 | R2 | 2 | R2
- INSERT       | 3 | R3 | 3 | R3
-(3 rows)
-
-SELECT * FROM base_tbl ORDER BY a;
- a  |   b    
-----+--------
- -2 | Row -2
- -1 | Row -1
-  0 | Row 0
...

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/select_parallel.out /tmp/cirrus-ci-build/build/testrun/pg_upgrad...
--- /tmp/cirrus-ci-build/src/test/regress/expected/select_parallel.out	2024-09-29 21:28:17.812776000 +0000
+++ /tmp/cirrus-ci-build/build/testrun/pg_upgrade/002_pg_upgrade/data/results/select_parallel.out	2024-09-29 21:30:00.36...
@@ -451,26 +451,36 @@
   join tenk1 t3 on t3.stringu1 = tenk1.stringu1
   where tenk1.four = t.four
 );
-                                                                                                                       ...
------------------------------------------------------------------------------------------------------------------------...
- Seq Scan on public.tenk1 t
+                                                                                                                       ...
+-----------------------------------------------------------------------------------------------------------------------...
+ Hash Join
    Output: t.unique1, t.unique2, t.two, t.four, t.ten, t.twenty, t.hundred, t.thousand, t.twothousand, t.fivethous, t.t...
-   Filter: (SubPlan 1)
-   SubPlan 1
-     ->  Hash Join
-           Output: t.two
-           Hash Cond: (tenk1.stringu1 = t3.stringu1)
-           ->  Seq Scan on public.tenk1
...

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/select_parallel.out /tmp/cirrus-ci-build/build/testrun/recovery/...
--- /tmp/cirrus-ci-build/src/test/regress/expected/select_parallel.out	2024-09-29 21:28:17.812776000 +0000
+++ /tmp/cirrus-ci-build/build/testrun/recovery/027_stream_regress/data/results/select_parallel.out	2024-09-29 21:30:43....
@@ -451,26 +451,36 @@
   join tenk1 t3 on t3.stringu1 = tenk1.stringu1
   where tenk1.four = t.four
 );
-                                                                                                                       ...
------------------------------------------------------------------------------------------------------------------------...
- Seq Scan on public.tenk1 t
+                                                                                                                       ...
+-----------------------------------------------------------------------------------------------------------------------...
+ Hash Join
    Output: t.unique1, t.unique2, t.two, t.four, t.ten, t.twenty, t.hundred, t.thousand, t.twothousand, t.fivethous, t.t...
-   Filter: (SubPlan 1)
-   SubPlan 1
-     ->  Hash Join
-           Output: t.two
-           Hash Cond: (tenk1.stringu1 = t3.stringu1)
-           ->  Seq Scan on public.tenk1
...

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/select_parallel.out /tmp/cirrus-ci-build/build/testrun/regress/r...
--- /tmp/cirrus-ci-build/src/test/regress/expected/select_parallel.out	2024-09-29 21:28:17.812776000 +0000
+++ /tmp/cirrus-ci-build/build/testrun/regress/regress/results/select_parallel.out	2024-09-29 21:29:57.714959000 +0000
@@ -451,26 +451,36 @@
   join tenk1 t3 on t3.stringu1 = tenk1.stringu1
   where tenk1.four = t.four
 );
-                                                                                                                       ...
------------------------------------------------------------------------------------------------------------------------...
- Seq Scan on public.tenk1 t
+                                                                                                                       ...
+-----------------------------------------------------------------------------------------------------------------------...
+ Hash Join
    Output: t.unique1, t.unique2, t.two, t.four, t.ten, t.twenty, t.hundred, t.thousand, t.twothousand, t.fivethous, t.t...
-   Filter: (SubPlan 1)
-   SubPlan 1
-     ->  Hash Join
-           Output: t.two
-           Hash Cond: (tenk1.stringu1 = t3.stringu1)
-           ->  Seq Scan on public.tenk1
...

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/select_parallel.out /tmp/cirrus-ci-build/src/bin/pg_upgrade/tmp_...
--- /tmp/cirrus-ci-build/src/test/regress/expected/select_parallel.out	2024-09-29 21:28:16.554677753 +0000
+++ /tmp/cirrus-ci-build/src/bin/pg_upgrade/tmp_check/results/select_parallel.out	2024-09-29 21:34:02.757341506 +0000
@@ -451,26 +451,36 @@
   join tenk1 t3 on t3.stringu1 = tenk1.stringu1
   where tenk1.four = t.four
 );
-                                                                                                                       ...
------------------------------------------------------------------------------------------------------------------------...
- Seq Scan on public.tenk1 t
+                                                                                                                       ...
+-----------------------------------------------------------------------------------------------------------------------...
+ Hash Join
    Output: t.unique1, t.unique2, t.two, t.four, t.ten, t.twenty, t.hundred, t.thousand, t.twothousand, t.fivethous, t.t...
-   Filter: (SubPlan 1)
-   SubPlan 1
-     ->  Hash Join
-           Output: t.two
-           Hash Cond: (tenk1.stringu1 = t3.stringu1)
-           ->  Seq Scan on public.tenk1
...

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/select_parallel.out /tmp/cirrus-ci-build/src/test/recovery/tmp_c...
--- /tmp/cirrus-ci-build/src/test/regress/expected/select_parallel.out	2024-09-29 21:28:16.554677753 +0000
+++ /tmp/cirrus-ci-build/src/test/recovery/tmp_check/results/select_parallel.out	2024-09-29 21:35:40.985511862 +0000
@@ -451,26 +451,36 @@
   join tenk1 t3 on t3.stringu1 = tenk1.stringu1
   where tenk1.four = t.four
 );
-                                                                                                                       ...
------------------------------------------------------------------------------------------------------------------------...
- Seq Scan on public.tenk1 t
+                                                                                                                       ...
+-----------------------------------------------------------------------------------------------------------------------...
+ Hash Join
    Output: t.unique1, t.unique2, t.two, t.four, t.ten, t.twenty, t.hundred, t.thousand, t.twothousand, t.fivethous, t.t...
-   Filter: (SubPlan 1)
-   SubPlan 1
-     ->  Hash Join
-           Output: t.two
-           Hash Cond: (tenk1.stringu1 = t3.stringu1)
-           ->  Seq Scan on public.tenk1
...

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/select_parallel.out /tmp/cirrus-ci-build/src/test/regress/result...
--- /tmp/cirrus-ci-build/src/test/regress/expected/select_parallel.out	2024-09-29 21:28:16.554677753 +0000
+++ /tmp/cirrus-ci-build/src/test/regress/results/select_parallel.out	2024-09-29 21:31:46.273488891 +0000
@@ -451,26 +451,36 @@
   join tenk1 t3 on t3.stringu1 = tenk1.stringu1
   where tenk1.four = t.four
 );
-                                                                                                                       ...
------------------------------------------------------------------------------------------------------------------------...
- Seq Scan on public.tenk1 t
+                                                                                                                       ...
+-----------------------------------------------------------------------------------------------------------------------...
+ Hash Join
    Output: t.unique1, t.unique2, t.two, t.four, t.ten, t.twenty, t.hundred, t.thousand, t.twothousand, t.fivethous, t.t...
-   Filter: (SubPlan 1)
-   SubPlan 1
-     ->  Hash Join
-           Output: t.two
-           Hash Cond: (tenk1.stringu1 = t3.stringu1)
-           ->  Seq Scan on public.tenk1
...

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/select_parallel.out /tmp/cirrus-ci-build/build/testrun/pg_upgrad...
--- /tmp/cirrus-ci-build/src/test/regress/expected/select_parallel.out	2024-09-29 21:28:16.095001483 +0000
+++ /tmp/cirrus-ci-build/build/testrun/pg_upgrade/002_pg_upgrade/data/results/select_parallel.out	2024-09-29 21:31:31.75...
@@ -451,26 +451,36 @@
   join tenk1 t3 on t3.stringu1 = tenk1.stringu1
   where tenk1.four = t.four
 );
-                                                                                                                       ...
------------------------------------------------------------------------------------------------------------------------...
- Seq Scan on public.tenk1 t
+                                                                                                                       ...
+-----------------------------------------------------------------------------------------------------------------------...
+ Hash Join
    Output: t.unique1, t.unique2, t.two, t.four, t.ten, t.twenty, t.hundred, t.thousand, t.twothousand, t.fivethous, t.t...
-   Filter: (SubPlan 1)
-   SubPlan 1
-     ->  Hash Join
-           Output: t.two
-           Hash Cond: (tenk1.stringu1 = t3.stringu1)
-           ->  Seq Scan on public.tenk1
...

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/select_parallel.out /tmp/cirrus-ci-build/build/testrun/recovery/...
--- /tmp/cirrus-ci-build/src/test/regress/expected/select_parallel.out	2024-09-29 21:28:16.095001483 +0000
+++ /tmp/cirrus-ci-build/build/testrun/recovery/027_stream_regress/data/results/select_parallel.out	2024-09-29 21:32:12....
@@ -451,26 +451,36 @@
   join tenk1 t3 on t3.stringu1 = tenk1.stringu1
   where tenk1.four = t.four
 );
-                                                                                                                       ...
------------------------------------------------------------------------------------------------------------------------...
- Seq Scan on public.tenk1 t
+                                                                                                                       ...
+-----------------------------------------------------------------------------------------------------------------------...
+ Hash Join
    Output: t.unique1, t.unique2, t.two, t.four, t.ten, t.twenty, t.hundred, t.thousand, t.twothousand, t.fivethous, t.t...
-   Filter: (SubPlan 1)
-   SubPlan 1
-     ->  Hash Join
-           Output: t.two
-           Hash Cond: (tenk1.stringu1 = t3.stringu1)
-           ->  Seq Scan on public.tenk1
...

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/select_parallel.out /tmp/cirrus-ci-build/build/testrun/regress/r...
--- /tmp/cirrus-ci-build/src/test/regress/expected/select_parallel.out	2024-09-29 21:28:16.095001483 +0000
+++ /tmp/cirrus-ci-build/build/testrun/regress/regress/results/select_parallel.out	2024-09-29 21:31:29.104345850 +0000
@@ -451,26 +451,36 @@
   join tenk1 t3 on t3.stringu1 = tenk1.stringu1
   where tenk1.four = t.four
 );
-                                                                                                                       ...
------------------------------------------------------------------------------------------------------------------------...
- Seq Scan on public.tenk1 t
+                                                                                                                       ...
+-----------------------------------------------------------------------------------------------------------------------...
+ Hash Join
    Output: t.unique1, t.unique2, t.two, t.four, t.ten, t.twenty, t.hundred, t.thousand, t.twothousand, t.fivethous, t.t...
-   Filter: (SubPlan 1)
-   SubPlan 1
-     ->  Hash Join
-           Output: t.two
-           Hash Cond: (tenk1.stringu1 = t3.stringu1)
-           ->  Seq Scan on public.tenk1
...

diff -U3 /Users/admin/pgsql/src/test/regress/expected/select_parallel.out /Users/admin/pgsql/build/testrun/pg_upgrade/00...
--- /Users/admin/pgsql/src/test/regress/expected/select_parallel.out	2024-09-29 21:28:21
+++ /Users/admin/pgsql/build/testrun/pg_upgrade/002_pg_upgrade/data/results/select_parallel.out	2024-09-29 21:30:26
@@ -451,26 +451,36 @@
   join tenk1 t3 on t3.stringu1 = tenk1.stringu1
   where tenk1.four = t.four
 );
-                                                                                                                       ...
------------------------------------------------------------------------------------------------------------------------...
- Seq Scan on public.tenk1 t
+                                                                                                                       ...
+-----------------------------------------------------------------------------------------------------------------------...
+ Hash Join
    Output: t.unique1, t.unique2, t.two, t.four, t.ten, t.twenty, t.hundred, t.thousand, t.twothousand, t.fivethous, t.t...
-   Filter: (SubPlan 1)
-   SubPlan 1
-     ->  Hash Join
-           Output: t.two
-           Hash Cond: (tenk1.stringu1 = t3.stringu1)
-           ->  Seq Scan on public.tenk1
...

diff -U3 /Users/admin/pgsql/src/test/regress/expected/select_parallel.out /Users/admin/pgsql/build/testrun/recovery/027_...
--- /Users/admin/pgsql/src/test/regress/expected/select_parallel.out	2024-09-29 21:28:21
+++ /Users/admin/pgsql/build/testrun/recovery/027_stream_regress/data/results/select_parallel.out	2024-09-29 21:31:31
@@ -451,26 +451,36 @@
   join tenk1 t3 on t3.stringu1 = tenk1.stringu1
   where tenk1.four = t.four
 );
-                                                                                                                       ...
------------------------------------------------------------------------------------------------------------------------...
- Seq Scan on public.tenk1 t
+                                                                                                                       ...
+-----------------------------------------------------------------------------------------------------------------------...
+ Hash Join
    Output: t.unique1, t.unique2, t.two, t.four, t.ten, t.twenty, t.hundred, t.thousand, t.twothousand, t.fivethous, t.t...
-   Filter: (SubPlan 1)
-   SubPlan 1
-     ->  Hash Join
-           Output: t.two
-           Hash Cond: (tenk1.stringu1 = t3.stringu1)
-           ->  Seq Scan on public.tenk1
...

diff -U3 /Users/admin/pgsql/src/test/regress/expected/select_parallel.out /Users/admin/pgsql/build/testrun/regress/regre...
--- /Users/admin/pgsql/src/test/regress/expected/select_parallel.out	2024-09-29 21:28:21
+++ /Users/admin/pgsql/build/testrun/regress/regress/results/select_parallel.out	2024-09-29 21:30:26
@@ -451,26 +451,36 @@
   join tenk1 t3 on t3.stringu1 = tenk1.stringu1
   where tenk1.four = t.four
 );
-                                                                                                                       ...
------------------------------------------------------------------------------------------------------------------------...
- Seq Scan on public.tenk1 t
+                                                                                                                       ...
+-----------------------------------------------------------------------------------------------------------------------...
+ Hash Join
    Output: t.unique1, t.unique2, t.two, t.four, t.ten, t.twenty, t.hundred, t.thousand, t.twothousand, t.fivethous, t.t...
-   Filter: (SubPlan 1)
-   SubPlan 1
-     ->  Hash Join
-           Output: t.two
-           Hash Cond: (tenk1.stringu1 = t3.stringu1)
-           ->  Seq Scan on public.tenk1
...

diff --strip-trailing-cr -U3 C:/cirrus/src/test/regress/expected/select_parallel.out C:/cirrus/build/testrun/pg_upgrade/...
--- C:/cirrus/src/test/regress/expected/select_parallel.out	2024-09-29 21:28:28.524331700 +0000
+++ C:/cirrus/build/testrun/pg_upgrade/002_pg_upgrade/data/results/select_parallel.out	2024-09-29 21:31:37.171944500 +00...
@@ -451,26 +451,36 @@
   join tenk1 t3 on t3.stringu1 = tenk1.stringu1
   where tenk1.four = t.four
 );
-                                                                                                                       ...
------------------------------------------------------------------------------------------------------------------------...
- Seq Scan on public.tenk1 t
+                                                                                                                       ...
+-----------------------------------------------------------------------------------------------------------------------...
+ Hash Join
    Output: t.unique1, t.unique2, t.two, t.four, t.ten, t.twenty, t.hundred, t.thousand, t.twothousand, t.fivethous, t.t...
-   Filter: (SubPlan 1)
-   SubPlan 1
-     ->  Hash Join
-           Output: t.two
-           Hash Cond: (tenk1.stringu1 = t3.stringu1)
-           ->  Seq Scan on public.tenk1
...

diff --strip-trailing-cr -U3 C:/cirrus/src/test/regress/expected/select_parallel.out C:/cirrus/build/testrun/recovery/02...
--- C:/cirrus/src/test/regress/expected/select_parallel.out	2024-09-29 21:28:28.524331700 +0000
+++ C:/cirrus/build/testrun/recovery/027_stream_regress/data/results/select_parallel.out	2024-09-29 21:33:58.633858300 +...
@@ -451,26 +451,36 @@
   join tenk1 t3 on t3.stringu1 = tenk1.stringu1
   where tenk1.four = t.four
 );
-                                                                                                                       ...
------------------------------------------------------------------------------------------------------------------------...
- Seq Scan on public.tenk1 t
+                                                                                                                       ...
+-----------------------------------------------------------------------------------------------------------------------...
+ Hash Join
    Output: t.unique1, t.unique2, t.two, t.four, t.ten, t.twenty, t.hundred, t.thousand, t.twothousand, t.fivethous, t.t...
-   Filter: (SubPlan 1)
-   SubPlan 1
-     ->  Hash Join
-           Output: t.two
-           Hash Cond: (tenk1.stringu1 = t3.stringu1)
-           ->  Seq Scan on public.tenk1
...

diff --strip-trailing-cr -U3 C:/cirrus/src/test/regress/expected/select_parallel.out C:/cirrus/build/testrun/regress/reg...
--- C:/cirrus/src/test/regress/expected/select_parallel.out	2024-09-29 21:28:28.524331700 +0000
+++ C:/cirrus/build/testrun/regress/regress/results/select_parallel.out	2024-09-29 21:31:35.323798800 +0000
@@ -451,26 +451,36 @@
   join tenk1 t3 on t3.stringu1 = tenk1.stringu1
   where tenk1.four = t.four
 );
-                                                                                                                       ...
------------------------------------------------------------------------------------------------------------------------...
- Seq Scan on public.tenk1 t
+                                                                                                                       ...
+-----------------------------------------------------------------------------------------------------------------------...
+ Hash Join
    Output: t.unique1, t.unique2, t.two, t.four, t.ten, t.twenty, t.hundred, t.thousand, t.twothousand, t.fivethous, t.t...
-   Filter: (SubPlan 1)
-   SubPlan 1
-     ->  Hash Join
-           Output: t.two
-           Hash Cond: (tenk1.stringu1 = t3.stringu1)
-           ->  Seq Scan on public.tenk1
...

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/alter_table.out /tmp/cirrus-ci-build/build/testrun/pg_upgrade/00...
--- /tmp/cirrus-ci-build/src/test/regress/expected/alter_table.out	2024-09-23 08:34:19.292256000 +0000
+++ /tmp/cirrus-ci-build/build/testrun/pg_upgrade/002_pg_upgrade/data/results/alter_table.out	2024-09-23 08:35:59.079318...
@@ -3911,7 +3911,8 @@
 );
 CREATE TABLE fail_part (like unparted);
 ALTER TABLE unparted ATTACH PARTITION fail_part FOR VALUES IN ('a');
-ERROR:  table "unparted" is not partitioned
+ERROR:  ALTER action ATTACH PARTITION cannot be performed on relation "unparted"
+DETAIL:  This operation is not supported for tables.
 DROP TABLE unparted, fail_part;
 -- check that partition bound is compatible
 CREATE TABLE list_parted (
@@ -4281,7 +4282,8 @@
 -- check that the table is partitioned at all
 CREATE TABLE regular_table (a int);
 ALTER TABLE regular_table DETACH PARTITION any_name;
-ERROR:  table "regular_table" is not partitioned
+ERROR:  ALTER action DETACH PARTITION cannot be performed on relation "regular_table"
+DETAIL:  This operation is not supported for tables.
...

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/alter_table.out /tmp/cirrus-ci-build/build/testrun/recovery/027_...
--- /tmp/cirrus-ci-build/src/test/regress/expected/alter_table.out	2024-09-23 08:34:19.292256000 +0000
+++ /tmp/cirrus-ci-build/build/testrun/recovery/027_stream_regress/data/results/alter_table.out	2024-09-23 08:36:45.9655...
@@ -3911,7 +3911,8 @@
 );
 CREATE TABLE fail_part (like unparted);
 ALTER TABLE unparted ATTACH PARTITION fail_part FOR VALUES IN ('a');
-ERROR:  table "unparted" is not partitioned
+ERROR:  ALTER action ATTACH PARTITION cannot be performed on relation "unparted"
+DETAIL:  This operation is not supported for tables.
 DROP TABLE unparted, fail_part;
 -- check that partition bound is compatible
 CREATE TABLE list_parted (
@@ -4281,7 +4282,8 @@
 -- check that the table is partitioned at all
 CREATE TABLE regular_table (a int);
 ALTER TABLE regular_table DETACH PARTITION any_name;
-ERROR:  table "regular_table" is not partitioned
+ERROR:  ALTER action DETACH PARTITION cannot be performed on relation "regular_table"
+DETAIL:  This operation is not supported for tables.
...

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/alter_table.out /tmp/cirrus-ci-build/build/testrun/regress/regre...
--- /tmp/cirrus-ci-build/src/test/regress/expected/alter_table.out	2024-09-23 08:34:19.292256000 +0000
+++ /tmp/cirrus-ci-build/build/testrun/regress/regress/results/alter_table.out	2024-09-23 08:35:54.515008000 +0000
@@ -3911,7 +3911,8 @@
 );
 CREATE TABLE fail_part (like unparted);
 ALTER TABLE unparted ATTACH PARTITION fail_part FOR VALUES IN ('a');
-ERROR:  table "unparted" is not partitioned
+ERROR:  ALTER action ATTACH PARTITION cannot be performed on relation "unparted"
+DETAIL:  This operation is not supported for tables.
 DROP TABLE unparted, fail_part;
 -- check that partition bound is compatible
 CREATE TABLE list_parted (
@@ -4281,7 +4282,8 @@
 -- check that the table is partitioned at all
 CREATE TABLE regular_table (a int);
 ALTER TABLE regular_table DETACH PARTITION any_name;
-ERROR:  table "regular_table" is not partitioned
+ERROR:  ALTER action DETACH PARTITION cannot be performed on relation "regular_table"
+DETAIL:  This operation is not supported for tables.
...

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/alter_table.out /tmp/cirrus-ci-build/src/bin/pg_upgrade/tmp_chec...
--- /tmp/cirrus-ci-build/src/test/regress/expected/alter_table.out	2024-09-23 08:34:17.849944613 +0000
+++ /tmp/cirrus-ci-build/src/bin/pg_upgrade/tmp_check/results/alter_table.out	2024-09-23 08:40:06.409651473 +0000
@@ -3911,7 +3911,8 @@
 );
 CREATE TABLE fail_part (like unparted);
 ALTER TABLE unparted ATTACH PARTITION fail_part FOR VALUES IN ('a');
-ERROR:  table "unparted" is not partitioned
+ERROR:  ALTER action ATTACH PARTITION cannot be performed on relation "unparted"
+DETAIL:  This operation is not supported for tables.
 DROP TABLE unparted, fail_part;
 -- check that partition bound is compatible
 CREATE TABLE list_parted (
@@ -4281,7 +4282,8 @@
 -- check that the table is partitioned at all
 CREATE TABLE regular_table (a int);
 ALTER TABLE regular_table DETACH PARTITION any_name;
-ERROR:  table "regular_table" is not partitioned
+ERROR:  ALTER action DETACH PARTITION cannot be performed on relation "regular_table"
+DETAIL:  This operation is not supported for tables.
...

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/alter_table.out /tmp/cirrus-ci-build/src/test/recovery/tmp_check...
--- /tmp/cirrus-ci-build/src/test/regress/expected/alter_table.out	2024-09-23 08:34:17.849944613 +0000
+++ /tmp/cirrus-ci-build/src/test/recovery/tmp_check/results/alter_table.out	2024-09-23 08:41:24.566490457 +0000
@@ -3911,7 +3911,8 @@
 );
 CREATE TABLE fail_part (like unparted);
 ALTER TABLE unparted ATTACH PARTITION fail_part FOR VALUES IN ('a');
-ERROR:  table "unparted" is not partitioned
+ERROR:  ALTER action ATTACH PARTITION cannot be performed on relation "unparted"
+DETAIL:  This operation is not supported for tables.
 DROP TABLE unparted, fail_part;
 -- check that partition bound is compatible
 CREATE TABLE list_parted (
@@ -4281,7 +4282,8 @@
 -- check that the table is partitioned at all
 CREATE TABLE regular_table (a int);
 ALTER TABLE regular_table DETACH PARTITION any_name;
-ERROR:  table "regular_table" is not partitioned
+ERROR:  ALTER action DETACH PARTITION cannot be performed on relation "regular_table"
+DETAIL:  This operation is not supported for tables.
...

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/alter_table.out /tmp/cirrus-ci-build/src/test/regress/results/al...
--- /tmp/cirrus-ci-build/src/test/regress/expected/alter_table.out	2024-09-23 08:34:17.849944613 +0000
+++ /tmp/cirrus-ci-build/src/test/regress/results/alter_table.out	2024-09-23 08:37:37.826103940 +0000
@@ -3911,7 +3911,8 @@
 );
 CREATE TABLE fail_part (like unparted);
 ALTER TABLE unparted ATTACH PARTITION fail_part FOR VALUES IN ('a');
-ERROR:  table "unparted" is not partitioned
+ERROR:  ALTER action ATTACH PARTITION cannot be performed on relation "unparted"
+DETAIL:  This operation is not supported for tables.
 DROP TABLE unparted, fail_part;
 -- check that partition bound is compatible
 CREATE TABLE list_parted (
@@ -4281,7 +4282,8 @@
 -- check that the table is partitioned at all
 CREATE TABLE regular_table (a int);
 ALTER TABLE regular_table DETACH PARTITION any_name;
-ERROR:  table "regular_table" is not partitioned
+ERROR:  ALTER action DETACH PARTITION cannot be performed on relation "regular_table"
+DETAIL:  This operation is not supported for tables.
...

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/alter_table.out /tmp/cirrus-ci-build/build/testrun/pg_upgrade/00...
--- /tmp/cirrus-ci-build/src/test/regress/expected/alter_table.out	2024-09-23 08:34:15.207581083 +0000
+++ /tmp/cirrus-ci-build/build/testrun/pg_upgrade/002_pg_upgrade/data/results/alter_table.out	2024-09-23 08:36:54.592717...
@@ -3911,7 +3911,8 @@
 );
 CREATE TABLE fail_part (like unparted);
 ALTER TABLE unparted ATTACH PARTITION fail_part FOR VALUES IN ('a');
-ERROR:  table "unparted" is not partitioned
+ERROR:  ALTER action ATTACH PARTITION cannot be performed on relation "unparted"
+DETAIL:  This operation is not supported for tables.
 DROP TABLE unparted, fail_part;
 -- check that partition bound is compatible
 CREATE TABLE list_parted (
@@ -4281,7 +4282,8 @@
 -- check that the table is partitioned at all
 CREATE TABLE regular_table (a int);
 ALTER TABLE regular_table DETACH PARTITION any_name;
-ERROR:  table "regular_table" is not partitioned
+ERROR:  ALTER action DETACH PARTITION cannot be performed on relation "regular_table"
+DETAIL:  This operation is not supported for tables.
...

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/alter_table.out /tmp/cirrus-ci-build/build/testrun/recovery/027_...
--- /tmp/cirrus-ci-build/src/test/regress/expected/alter_table.out	2024-09-23 08:34:15.207581083 +0000
+++ /tmp/cirrus-ci-build/build/testrun/recovery/027_stream_regress/data/results/alter_table.out	2024-09-23 08:37:26.8210...
@@ -3911,7 +3911,8 @@
 );
 CREATE TABLE fail_part (like unparted);
 ALTER TABLE unparted ATTACH PARTITION fail_part FOR VALUES IN ('a');
-ERROR:  table "unparted" is not partitioned
+ERROR:  ALTER action ATTACH PARTITION cannot be performed on relation "unparted"
+DETAIL:  This operation is not supported for tables.
 DROP TABLE unparted, fail_part;
 -- check that partition bound is compatible
 CREATE TABLE list_parted (
@@ -4281,7 +4282,8 @@
 -- check that the table is partitioned at all
 CREATE TABLE regular_table (a int);
 ALTER TABLE regular_table DETACH PARTITION any_name;
-ERROR:  table "regular_table" is not partitioned
+ERROR:  ALTER action DETACH PARTITION cannot be performed on relation "regular_table"
+DETAIL:  This operation is not supported for tables.
...

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/alter_table.out /tmp/cirrus-ci-build/build/testrun/regress/regre...
--- /tmp/cirrus-ci-build/src/test/regress/expected/alter_table.out	2024-09-23 08:34:15.207581083 +0000
+++ /tmp/cirrus-ci-build/build/testrun/regress/regress/results/alter_table.out	2024-09-23 08:36:49.180671412 +0000
@@ -3911,7 +3911,8 @@
 );
 CREATE TABLE fail_part (like unparted);
 ALTER TABLE unparted ATTACH PARTITION fail_part FOR VALUES IN ('a');
-ERROR:  table "unparted" is not partitioned
+ERROR:  ALTER action ATTACH PARTITION cannot be performed on relation "unparted"
+DETAIL:  This operation is not supported for tables.
 DROP TABLE unparted, fail_part;
 -- check that partition bound is compatible
 CREATE TABLE list_parted (
@@ -4281,7 +4282,8 @@
 -- check that the table is partitioned at all
 CREATE TABLE regular_table (a int);
 ALTER TABLE regular_table DETACH PARTITION any_name;
-ERROR:  table "regular_table" is not partitioned
+ERROR:  ALTER action DETACH PARTITION cannot be performed on relation "regular_table"
+DETAIL:  This operation is not supported for tables.
...

diff -U3 /Users/admin/pgsql/src/test/regress/expected/alter_table.out /Users/admin/pgsql/build/testrun/pg_upgrade/002_pg...
--- /Users/admin/pgsql/src/test/regress/expected/alter_table.out	2024-09-23 08:34:18
+++ /Users/admin/pgsql/build/testrun/pg_upgrade/002_pg_upgrade/data/results/alter_table.out	2024-09-23 08:36:18
@@ -3911,7 +3911,8 @@
 );
 CREATE TABLE fail_part (like unparted);
 ALTER TABLE unparted ATTACH PARTITION fail_part FOR VALUES IN ('a');
-ERROR:  table "unparted" is not partitioned
+ERROR:  ALTER action ATTACH PARTITION cannot be performed on relation "unparted"
+DETAIL:  This operation is not supported for tables.
 DROP TABLE unparted, fail_part;
 -- check that partition bound is compatible
 CREATE TABLE list_parted (
@@ -4281,7 +4282,8 @@
 -- check that the table is partitioned at all
 CREATE TABLE regular_table (a int);
 ALTER TABLE regular_table DETACH PARTITION any_name;
-ERROR:  table "regular_table" is not partitioned
+ERROR:  ALTER action DETACH PARTITION cannot be performed on relation "regular_table"
+DETAIL:  This operation is not supported for tables.
...

diff -U3 /Users/admin/pgsql/src/test/regress/expected/alter_table.out /Users/admin/pgsql/build/testrun/recovery/027_stre...
--- /Users/admin/pgsql/src/test/regress/expected/alter_table.out	2024-09-23 08:34:18
+++ /Users/admin/pgsql/build/testrun/recovery/027_stream_regress/data/results/alter_table.out	2024-09-23 08:37:25
@@ -3911,7 +3911,8 @@
 );
 CREATE TABLE fail_part (like unparted);
 ALTER TABLE unparted ATTACH PARTITION fail_part FOR VALUES IN ('a');
-ERROR:  table "unparted" is not partitioned
+ERROR:  ALTER action ATTACH PARTITION cannot be performed on relation "unparted"
+DETAIL:  This operation is not supported for tables.
 DROP TABLE unparted, fail_part;
 -- check that partition bound is compatible
 CREATE TABLE list_parted (
@@ -4281,7 +4282,8 @@
 -- check that the table is partitioned at all
 CREATE TABLE regular_table (a int);
 ALTER TABLE regular_table DETACH PARTITION any_name;
-ERROR:  table "regular_table" is not partitioned
+ERROR:  ALTER action DETACH PARTITION cannot be performed on relation "regular_table"
+DETAIL:  This operation is not supported for tables.
...

diff -U3 /Users/admin/pgsql/src/test/regress/expected/alter_table.out /Users/admin/pgsql/build/testrun/regress/regress/r...
--- /Users/admin/pgsql/src/test/regress/expected/alter_table.out	2024-09-23 08:34:18
+++ /Users/admin/pgsql/build/testrun/regress/regress/results/alter_table.out	2024-09-23 08:36:18
@@ -3911,7 +3911,8 @@
 );
 CREATE TABLE fail_part (like unparted);
 ALTER TABLE unparted ATTACH PARTITION fail_part FOR VALUES IN ('a');
-ERROR:  table "unparted" is not partitioned
+ERROR:  ALTER action ATTACH PARTITION cannot be performed on relation "unparted"
+DETAIL:  This operation is not supported for tables.
 DROP TABLE unparted, fail_part;
 -- check that partition bound is compatible
 CREATE TABLE list_parted (
@@ -4281,7 +4282,8 @@
 -- check that the table is partitioned at all
 CREATE TABLE regular_table (a int);
 ALTER TABLE regular_table DETACH PARTITION any_name;
-ERROR:  table "regular_table" is not partitioned
+ERROR:  ALTER action DETACH PARTITION cannot be performed on relation "regular_table"
+DETAIL:  This operation is not supported for tables.
...

diff --strip-trailing-cr -U3 C:/cirrus/src/test/regress/expected/alter_table.out C:/cirrus/build/testrun/pg_upgrade/002_...
--- C:/cirrus/src/test/regress/expected/alter_table.out	2024-09-23 08:34:34.262682400 +0000
+++ C:/cirrus/build/testrun/pg_upgrade/002_pg_upgrade/data/results/alter_table.out	2024-09-23 08:38:19.092584300 +0000
@@ -3911,7 +3911,8 @@
 );
 CREATE TABLE fail_part (like unparted);
 ALTER TABLE unparted ATTACH PARTITION fail_part FOR VALUES IN ('a');
-ERROR:  table "unparted" is not partitioned
+ERROR:  ALTER action ATTACH PARTITION cannot be performed on relation "unparted"
+DETAIL:  This operation is not supported for tables.
 DROP TABLE unparted, fail_part;
 -- check that partition bound is compatible
 CREATE TABLE list_parted (
@@ -4281,7 +4282,8 @@
 -- check that the table is partitioned at all
 CREATE TABLE regular_table (a int);
 ALTER TABLE regular_table DETACH PARTITION any_name;
-ERROR:  table "regular_table" is not partitioned
+ERROR:  ALTER action DETACH PARTITION cannot be performed on relation "regular_table"
+DETAIL:  This operation is not supported for tables.
...

diff --strip-trailing-cr -U3 C:/cirrus/src/test/regress/expected/alter_table.out C:/cirrus/build/testrun/recovery/027_st...
--- C:/cirrus/src/test/regress/expected/alter_table.out	2024-09-23 08:34:34.262682400 +0000
+++ C:/cirrus/build/testrun/recovery/027_stream_regress/data/results/alter_table.out	2024-09-23 08:40:36.114558500 +0000
@@ -3911,7 +3911,8 @@
 );
 CREATE TABLE fail_part (like unparted);
 ALTER TABLE unparted ATTACH PARTITION fail_part FOR VALUES IN ('a');
-ERROR:  table "unparted" is not partitioned
+ERROR:  ALTER action ATTACH PARTITION cannot be performed on relation "unparted"
+DETAIL:  This operation is not supported for tables.
 DROP TABLE unparted, fail_part;
 -- check that partition bound is compatible
 CREATE TABLE list_parted (
@@ -4281,7 +4282,8 @@
 -- check that the table is partitioned at all
 CREATE TABLE regular_table (a int);
 ALTER TABLE regular_table DETACH PARTITION any_name;
-ERROR:  table "regular_table" is not partitioned
+ERROR:  ALTER action DETACH PARTITION cannot be performed on relation "regular_table"
+DETAIL:  This operation is not supported for tables.
...

diff --strip-trailing-cr -U3 C:/cirrus/src/test/regress/expected/alter_table.out C:/cirrus/build/testrun/regress/regress...
--- C:/cirrus/src/test/regress/expected/alter_table.out	2024-09-23 08:34:34.262682400 +0000
+++ C:/cirrus/build/testrun/regress/regress/results/alter_table.out	2024-09-23 08:38:11.541798300 +0000
@@ -3911,7 +3911,8 @@
 );
 CREATE TABLE fail_part (like unparted);
 ALTER TABLE unparted ATTACH PARTITION fail_part FOR VALUES IN ('a');
-ERROR:  table "unparted" is not partitioned
+ERROR:  ALTER action ATTACH PARTITION cannot be performed on relation "unparted"
+DETAIL:  This operation is not supported for tables.
 DROP TABLE unparted, fail_part;
 -- check that partition bound is compatible
 CREATE TABLE list_parted (
@@ -4281,7 +4282,8 @@
 -- check that the table is partitioned at all
 CREATE TABLE regular_table (a int);
 ALTER TABLE regular_table DETACH PARTITION any_name;
-ERROR:  table "regular_table" is not partitioned
+ERROR:  ALTER action DETACH PARTITION cannot be performed on relation "regular_table"
+DETAIL:  This operation is not supported for tables.
...

diff -U3 /tmp/cirrus-ci-build/contrib/btree_gist/expected/init.out /tmp/cirrus-ci-build/build/testrun/btree_gist/regress...
--- /tmp/cirrus-ci-build/contrib/btree_gist/expected/init.out	2024-08-11 11:48:03.214239000 +0000
+++ /tmp/cirrus-ci-build/build/testrun/btree_gist/regress/results/init.out	2024-08-11 11:51:07.842611000 +0000
@@ -1,4 +1,5 @@
 CREATE EXTENSION btree_gist;
+ERROR:  extension "btree_gist" has no installation script nor update path for version "1.8"
 -- Check whether any of our opclasses fail amvalidate
 SELECT amname, opcname
 FROM pg_opclass opc LEFT JOIN pg_am am ON am.oid = opcmethod
diff -U3 /tmp/cirrus-ci-build/contrib/btree_gist/expected/int2.out /tmp/cirrus-ci-build/build/testrun/btree_gist/regress...
--- /tmp/cirrus-ci-build/contrib/btree_gist/expected/int2.out	2024-08-11 11:48:03.214311000 +0000
+++ /tmp/cirrus-ci-build/build/testrun/btree_gist/regress/results/int2.out	2024-08-11 11:51:07.896977000 +0000
@@ -41,6 +41,8 @@
 (3 rows)
 
 CREATE INDEX int2idx ON int2tmp USING gist ( a );
+ERROR:  data type smallint has no default operator class for access method "gist"
+HINT:  You must specify an operator class for the index or define a default operator class for the data type.
 SET enable_seqscan=off;
 SELECT count(*) FROM int2tmp WHERE a <  237::int2;
...

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/btree_index.out /tmp/cirrus-ci-build/build/testrun/pg_upgrade/00...
--- /tmp/cirrus-ci-build/src/test/regress/expected/btree_index.out	2024-08-11 11:48:04.725006000 +0000
+++ /tmp/cirrus-ci-build/build/testrun/pg_upgrade/002_pg_upgrade/data/results/btree_index.out	2024-08-11 11:50:13.130212...
@@ -626,15 +626,10 @@
 -------+---------
   5380 | 3000193
   6262 | 3013326
-  2126 | 2648497
-  2681 | 2321799
-  2893 | 1919087
-  6448 | 4157193
-   210 | 1809552
   4408 | 4488889
   6320 | 5257716
   1836 | 5593978
-(10 rows)
+(5 rows)
 
 DROP INDEX bt_i4_heap_random_idx;
 CREATE INDEX bt_i4_heap_random_idx ON bt_i4_heap USING btree(random DESC, seqno);
...

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/btree_index.out /tmp/cirrus-ci-build/build/testrun/recovery/027_...
--- /tmp/cirrus-ci-build/src/test/regress/expected/btree_index.out	2024-08-11 11:48:04.725006000 +0000
+++ /tmp/cirrus-ci-build/build/testrun/recovery/027_stream_regress/data/results/btree_index.out	2024-08-11 11:50:53.9471...
@@ -626,15 +626,10 @@
 -------+---------
   5380 | 3000193
   6262 | 3013326
-  2126 | 2648497
-  2681 | 2321799
-  2893 | 1919087
-  6448 | 4157193
-   210 | 1809552
   4408 | 4488889
   6320 | 5257716
   1836 | 5593978
-(10 rows)
+(5 rows)
 
 DROP INDEX bt_i4_heap_random_idx;
 CREATE INDEX bt_i4_heap_random_idx ON bt_i4_heap USING btree(random DESC, seqno);
...

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/btree_index.out /tmp/cirrus-ci-build/build/testrun/regress/regre...
--- /tmp/cirrus-ci-build/src/test/regress/expected/btree_index.out	2024-08-11 11:48:04.725006000 +0000
+++ /tmp/cirrus-ci-build/build/testrun/regress/regress/results/btree_index.out	2024-08-11 11:50:10.898413000 +0000
@@ -626,15 +626,10 @@
 -------+---------
   5380 | 3000193
   6262 | 3013326
-  2126 | 2648497
-  2681 | 2321799
-  2893 | 1919087
-  6448 | 4157193
-   210 | 1809552
   4408 | 4488889
   6320 | 5257716
   1836 | 5593978
-(10 rows)
+(5 rows)
 
 DROP INDEX bt_i4_heap_random_idx;
 CREATE INDEX bt_i4_heap_random_idx ON bt_i4_heap USING btree(random DESC, seqno);
...

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/btree_index.out /tmp/cirrus-ci-build/src/bin/pg_upgrade/tmp_chec...
--- /tmp/cirrus-ci-build/src/test/regress/expected/btree_index.out	2024-08-11 11:48:02.776379012 +0000
+++ /tmp/cirrus-ci-build/src/bin/pg_upgrade/tmp_check/results/btree_index.out	2024-08-11 11:55:04.814746193 +0000
@@ -626,15 +626,10 @@
 -------+---------
   5380 | 3000193
   6262 | 3013326
-  2126 | 2648497
-  2681 | 2321799
-  2893 | 1919087
-  6448 | 4157193
-   210 | 1809552
   4408 | 4488889
   6320 | 5257716
   1836 | 5593978
-(10 rows)
+(5 rows)
 
 DROP INDEX bt_i4_heap_random_idx;
 CREATE INDEX bt_i4_heap_random_idx ON bt_i4_heap USING btree(random DESC, seqno);
...

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/btree_index.out /tmp/cirrus-ci-build/src/test/recovery/tmp_check...
--- /tmp/cirrus-ci-build/src/test/regress/expected/btree_index.out	2024-08-11 11:48:02.776379012 +0000
+++ /tmp/cirrus-ci-build/src/test/recovery/tmp_check/results/btree_index.out	2024-08-11 11:56:59.282665717 +0000
@@ -626,15 +626,10 @@
 -------+---------
   5380 | 3000193
   6262 | 3013326
-  2126 | 2648497
-  2681 | 2321799
-  2893 | 1919087
-  6448 | 4157193
-   210 | 1809552
   4408 | 4488889
   6320 | 5257716
   1836 | 5593978
-(10 rows)
+(5 rows)
 
 DROP INDEX bt_i4_heap_random_idx;
 CREATE INDEX bt_i4_heap_random_idx ON bt_i4_heap USING btree(random DESC, seqno);
...

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/btree_index.out /tmp/cirrus-ci-build/src/test/regress/results/bt...
--- /tmp/cirrus-ci-build/src/test/regress/expected/btree_index.out	2024-08-11 11:48:02.776379012 +0000
+++ /tmp/cirrus-ci-build/src/test/regress/results/btree_index.out	2024-08-11 11:52:42.302301902 +0000
@@ -626,15 +626,10 @@
 -------+---------
   5380 | 3000193
   6262 | 3013326
-  2126 | 2648497
-  2681 | 2321799
-  2893 | 1919087
-  6448 | 4157193
-   210 | 1809552
   4408 | 4488889
   6320 | 5257716
   1836 | 5593978
-(10 rows)
+(5 rows)
 
 DROP INDEX bt_i4_heap_random_idx;
 CREATE INDEX bt_i4_heap_random_idx ON bt_i4_heap USING btree(random DESC, seqno);
...

diff -U3 /tmp/cirrus-ci-build/contrib/btree_gist/expected/init.out /tmp/cirrus-ci-build/build/testrun/btree_gist/regress...
--- /tmp/cirrus-ci-build/contrib/btree_gist/expected/init.out	2024-08-11 11:48:01.711619909 +0000
+++ /tmp/cirrus-ci-build/build/testrun/btree_gist/regress/results/init.out	2024-08-11 11:53:53.018533047 +0000
@@ -1,4 +1,5 @@
 CREATE EXTENSION btree_gist;
+ERROR:  extension "btree_gist" has no installation script nor update path for version "1.8"
 -- Check whether any of our opclasses fail amvalidate
 SELECT amname, opcname
 FROM pg_opclass opc LEFT JOIN pg_am am ON am.oid = opcmethod
diff -U3 /tmp/cirrus-ci-build/contrib/btree_gist/expected/int2.out /tmp/cirrus-ci-build/build/testrun/btree_gist/regress...
--- /tmp/cirrus-ci-build/contrib/btree_gist/expected/int2.out	2024-08-11 11:48:01.711619909 +0000
+++ /tmp/cirrus-ci-build/build/testrun/btree_gist/regress/results/int2.out	2024-08-11 11:53:53.290534582 +0000
@@ -41,6 +41,8 @@
 (3 rows)
 
 CREATE INDEX int2idx ON int2tmp USING gist ( a );
+ERROR:  data type smallint has no default operator class for access method "gist"
+HINT:  You must specify an operator class for the index or define a default operator class for the data type.
 SET enable_seqscan=off;
 SELECT count(*) FROM int2tmp WHERE a <  237::int2;
...

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/btree_index.out /tmp/cirrus-ci-build/build/testrun/pg_upgrade/00...
--- /tmp/cirrus-ci-build/src/test/regress/expected/btree_index.out	2024-08-11 11:48:03.553128068 +0000
+++ /tmp/cirrus-ci-build/build/testrun/pg_upgrade/002_pg_upgrade/data/results/btree_index.out	2024-08-11 11:52:56.434315...
@@ -626,15 +626,10 @@
 -------+---------
   5380 | 3000193
   6262 | 3013326
-  2126 | 2648497
-  2681 | 2321799
-  2893 | 1919087
-  6448 | 4157193
-   210 | 1809552
   4408 | 4488889
   6320 | 5257716
   1836 | 5593978
-(10 rows)
+(5 rows)
 
 DROP INDEX bt_i4_heap_random_idx;
 CREATE INDEX bt_i4_heap_random_idx ON bt_i4_heap USING btree(random DESC, seqno);
...

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/btree_index.out /tmp/cirrus-ci-build/build/testrun/recovery/027_...
--- /tmp/cirrus-ci-build/src/test/regress/expected/btree_index.out	2024-08-11 11:48:03.553128068 +0000
+++ /tmp/cirrus-ci-build/build/testrun/recovery/027_stream_regress/data/results/btree_index.out	2024-08-11 11:53:42.0064...
@@ -626,15 +626,10 @@
 -------+---------
   5380 | 3000193
   6262 | 3013326
-  2126 | 2648497
-  2681 | 2321799
-  2893 | 1919087
-  6448 | 4157193
-   210 | 1809552
   4408 | 4488889
   6320 | 5257716
   1836 | 5593978
-(10 rows)
+(5 rows)
 
 DROP INDEX bt_i4_heap_random_idx;
 CREATE INDEX bt_i4_heap_random_idx ON bt_i4_heap USING btree(random DESC, seqno);
...

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/btree_index.out /tmp/cirrus-ci-build/build/testrun/regress/regre...
--- /tmp/cirrus-ci-build/src/test/regress/expected/btree_index.out	2024-08-11 11:48:03.553128068 +0000
+++ /tmp/cirrus-ci-build/build/testrun/regress/regress/results/btree_index.out	2024-08-11 11:52:51.278309928 +0000
@@ -626,15 +626,10 @@
 -------+---------
   5380 | 3000193
   6262 | 3013326
-  2126 | 2648497
-  2681 | 2321799
-  2893 | 1919087
-  6448 | 4157193
-   210 | 1809552
   4408 | 4488889
   6320 | 5257716
   1836 | 5593978
-(10 rows)
+(5 rows)
 
 DROP INDEX bt_i4_heap_random_idx;
 CREATE INDEX bt_i4_heap_random_idx ON bt_i4_heap USING btree(random DESC, seqno);
...

diff -U3 /Users/admin/pgsql/contrib/btree_gist/expected/init.out /Users/admin/pgsql/build/testrun/btree_gist/regress/res...
--- /Users/admin/pgsql/contrib/btree_gist/expected/init.out	2024-08-11 11:48:10
+++ /Users/admin/pgsql/build/testrun/btree_gist/regress/results/init.out	2024-08-11 11:51:50
@@ -1,4 +1,5 @@
 CREATE EXTENSION btree_gist;
+ERROR:  extension "btree_gist" has no installation script nor update path for version "1.8"
 -- Check whether any of our opclasses fail amvalidate
 SELECT amname, opcname
 FROM pg_opclass opc LEFT JOIN pg_am am ON am.oid = opcmethod
diff -U3 /Users/admin/pgsql/contrib/btree_gist/expected/int2.out /Users/admin/pgsql/build/testrun/btree_gist/regress/res...
--- /Users/admin/pgsql/contrib/btree_gist/expected/int2.out	2024-08-11 11:48:10
+++ /Users/admin/pgsql/build/testrun/btree_gist/regress/results/int2.out	2024-08-11 11:51:50
@@ -41,6 +41,8 @@
 (3 rows)
 
 CREATE INDEX int2idx ON int2tmp USING gist ( a );
+ERROR:  data type smallint has no default operator class for access method "gist"
+HINT:  You must specify an operator class for the index or define a default operator class for the data type.
 SET enable_seqscan=off;
 SELECT count(*) FROM int2tmp WHERE a <  237::int2;
...

diff -U3 /Users/admin/pgsql/src/test/regress/expected/btree_index.out /Users/admin/pgsql/build/testrun/pg_upgrade/002_pg...
--- /Users/admin/pgsql/src/test/regress/expected/btree_index.out	2024-08-11 11:48:13
+++ /Users/admin/pgsql/build/testrun/pg_upgrade/002_pg_upgrade/data/results/btree_index.out	2024-08-11 11:50:35
@@ -626,506 +626,60471 @@
 -------+---------
   5380 | 3000193
   6262 | 3013326
-  2126 | 2648497
-  2681 | 2321799
-  2893 | 1919087
-  6448 | 4157193
-   210 | 1809552
-  4408 | 4488889
-  6320 | 5257716
-  1836 | 5593978
-(10 rows)
-
-DROP INDEX bt_i4_heap_random_idx;
-CREATE INDEX bt_i4_heap_random_idx ON bt_i4_heap USING btree(random DESC, seqno);
-SELECT * FROM bt_i4_heap
...

diff -U3 /Users/admin/pgsql/src/test/regress/expected/btree_index.out /Users/admin/pgsql/build/testrun/recovery/027_stre...
--- /Users/admin/pgsql/src/test/regress/expected/btree_index.out	2024-08-11 11:48:13
+++ /Users/admin/pgsql/build/testrun/recovery/027_stream_regress/data/results/btree_index.out	2024-08-11 11:51:36
@@ -626,506 +626,60471 @@
 -------+---------
   5380 | 3000193
   6262 | 3013326
-  2126 | 2648497
-  2681 | 2321799
-  2893 | 1919087
-  6448 | 4157193
-   210 | 1809552
-  4408 | 4488889
-  6320 | 5257716
-  1836 | 5593978
-(10 rows)
-
-DROP INDEX bt_i4_heap_random_idx;
-CREATE INDEX bt_i4_heap_random_idx ON bt_i4_heap USING btree(random DESC, seqno);
-SELECT * FROM bt_i4_heap
...

diff -U3 /Users/admin/pgsql/src/test/regress/expected/btree_index.out /Users/admin/pgsql/build/testrun/regress/regress/r...
--- /Users/admin/pgsql/src/test/regress/expected/btree_index.out	2024-08-11 11:48:13
+++ /Users/admin/pgsql/build/testrun/regress/regress/results/btree_index.out	2024-08-11 11:50:31
@@ -626,506 +626,60471 @@
 -------+---------
   5380 | 3000193
   6262 | 3013326
-  2126 | 2648497
-  2681 | 2321799
-  2893 | 1919087
-  6448 | 4157193
-   210 | 1809552
-  4408 | 4488889
-  6320 | 5257716
-  1836 | 5593978
-(10 rows)
-
-DROP INDEX bt_i4_heap_random_idx;
-CREATE INDEX bt_i4_heap_random_idx ON bt_i4_heap USING btree(random DESC, seqno);
-SELECT * FROM bt_i4_heap
...

diff --strip-trailing-cr -U3 C:/cirrus/contrib/btree_gist/expected/init.out C:/cirrus/build/testrun/btree_gist/regress/r...
--- C:/cirrus/contrib/btree_gist/expected/init.out	2024-08-11 11:48:14.954991600 +0000
+++ C:/cirrus/build/testrun/btree_gist/regress/results/init.out	2024-08-11 11:53:51.006001800 +0000
@@ -1,4 +1,5 @@
 CREATE EXTENSION btree_gist;
+ERROR:  extension "btree_gist" has no installation script nor update path for version "1.8"
 -- Check whether any of our opclasses fail amvalidate
 SELECT amname, opcname
 FROM pg_opclass opc LEFT JOIN pg_am am ON am.oid = opcmethod
diff --strip-trailing-cr -U3 C:/cirrus/contrib/btree_gist/expected/int2.out C:/cirrus/build/testrun/btree_gist/regress/r...
--- C:/cirrus/contrib/btree_gist/expected/int2.out	2024-08-11 11:48:14.955970900 +0000
+++ C:/cirrus/build/testrun/btree_gist/regress/results/int2.out	2024-08-11 11:53:51.522598900 +0000
@@ -41,6 +41,8 @@
 (3 rows)
 
 CREATE INDEX int2idx ON int2tmp USING gist ( a );
+ERROR:  data type smallint has no default operator class for access method "gist"
+HINT:  You must specify an operator class for the index or define a default operator class for the data type.
 SET enable_seqscan=off;
 SELECT count(*) FROM int2tmp WHERE a <  237::int2;
...

diff --strip-trailing-cr -U3 C:/cirrus/src/test/regress/expected/btree_index.out C:/cirrus/build/testrun/pg_upgrade/002_...
--- C:/cirrus/src/test/regress/expected/btree_index.out	2024-08-11 11:48:19.584309800 +0000
+++ C:/cirrus/build/testrun/pg_upgrade/002_pg_upgrade/data/results/btree_index.out	2024-08-11 11:51:01.016340500 +0000
@@ -626,15 +626,10 @@
 -------+---------
   5380 | 3000193
   6262 | 3013326
-  2126 | 2648497
-  2681 | 2321799
-  2893 | 1919087
-  6448 | 4157193
-   210 | 1809552
   4408 | 4488889
   6320 | 5257716
   1836 | 5593978
-(10 rows)
+(5 rows)
 
 DROP INDEX bt_i4_heap_random_idx;
 CREATE INDEX bt_i4_heap_random_idx ON bt_i4_heap USING btree(random DESC, seqno);
...

diff --strip-trailing-cr -U3 C:/cirrus/src/test/regress/expected/btree_index.out C:/cirrus/build/testrun/recovery/027_st...
--- C:/cirrus/src/test/regress/expected/btree_index.out	2024-08-11 11:48:19.584309800 +0000
+++ C:/cirrus/build/testrun/recovery/027_stream_regress/data/results/btree_index.out	2024-08-11 11:53:05.500604000 +0000
@@ -626,15 +626,10 @@
 -------+---------
   5380 | 3000193
   6262 | 3013326
-  2126 | 2648497
-  2681 | 2321799
-  2893 | 1919087
-  6448 | 4157193
-   210 | 1809552
   4408 | 4488889
   6320 | 5257716
   1836 | 5593978
-(10 rows)
+(5 rows)
 
 DROP INDEX bt_i4_heap_random_idx;
 CREATE INDEX bt_i4_heap_random_idx ON bt_i4_heap USING btree(random DESC, seqno);
...

diff --strip-trailing-cr -U3 C:/cirrus/src/test/regress/expected/btree_index.out C:/cirrus/build/testrun/regress/regress...
--- C:/cirrus/src/test/regress/expected/btree_index.out	2024-08-11 11:48:19.584309800 +0000
+++ C:/cirrus/build/testrun/regress/regress/results/btree_index.out	2024-08-11 11:50:50.841791200 +0000
@@ -626,15 +626,10 @@
 -------+---------
   5380 | 3000193
   6262 | 3013326
-  2126 | 2648497
-  2681 | 2321799
-  2893 | 1919087
-  6448 | 4157193
-   210 | 1809552
   4408 | 4488889
   6320 | 5257716
   1836 | 5593978
-(10 rows)
+(5 rows)
 
 DROP INDEX bt_i4_heap_random_idx;
 CREATE INDEX bt_i4_heap_random_idx ON bt_i4_heap USING btree(random DESC, seqno);
...