PostgreSQL Patch Tester

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-11-24 02:45:17.116315000 +0000
+++ /tmp/cirrus-ci-build/build/testrun/postgres_fdw-running/regress/results/postgres_fdw.out	2024-11-24 02:50:12.6276790...
@@ -12325,8 +12325,7 @@
   FROM postgres_fdw_get_connections(true);
  case 
 ------
-    1
-(1 row)
+(0 rows)
 
 -- After terminating the remote backend, since the connection is closed,
 -- "closed" should be TRUE, or NULL if the connection status check
@@ -12339,8 +12338,7 @@
   FROM postgres_fdw_get_connections(true);
  case 
 ------
-    1
-(1 row)
+(0 rows)
...

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-24 02:27:45.833543000 +0000
+++ /tmp/cirrus-ci-build/build/testrun/pg_stat_statements/regress/results/level_tracking.out	2024-11-24 02:30:26.5371020...
@@ -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-24 02:27:41.569375817 +0000
+++ /tmp/cirrus-ci-build/contrib/pg_stat_statements/results/level_tracking.out	2024-11-24 02:33:24.170770848 +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-24 02:27:42.006547629 +0000
+++ /tmp/cirrus-ci-build/build/testrun/pg_stat_statements/regress/results/level_tracking.out	2024-11-24 02:32:50.8331893...
@@ -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-24 02:27:10
+++ /Users/admin/pgsql/build/testrun/pg_stat_statements/regress/results/level_tracking.out	2024-11-24 02:30:17
@@ -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-24 02:27:58.939904000 +0000
+++ C:/cirrus/build/testrun/pg_stat_statements/regress/results/level_tracking.out	2024-11-24 02:34:41.428632400 +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/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/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-20 20:59:15.668017000 +0000
+++ /tmp/cirrus-ci-build/build/testrun/isolation/isolation/results/inherit-temp.out	2024-11-20 21:00:45.508932000 +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-20 20:59:08.920304870 +0000
+++ /tmp/cirrus-ci-build/src/test/isolation/output_iso/results/inherit-temp.out	2024-11-20 21:01:41.044086788 +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-20 20:59:07.988684834 +0000
+++ /tmp/cirrus-ci-build/build/testrun/isolation/isolation/results/inherit-temp.out	2024-11-20 21:01:07.341080916 +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-20 20:58:11
+++ /Users/admin/pgsql/build/testrun/isolation/isolation/results/inherit-temp.out	2024-11-20 20: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-20 20:59:29.497403300 +0000
+++ C:/cirrus/build/testrun/isolation/isolation/results/inherit-temp.out	2024-11-20 21:03:18.531013900 +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/btree_index.out /tmp/cirrus-ci-build/src/test/regress/results/bt...
--- /tmp/cirrus-ci-build/src/test/regress/expected/btree_index.out	2024-11-20 17:13:07.833032271 +0000
+++ /tmp/cirrus-ci-build/src/test/regress/results/btree_index.out	2024-11-20 17:17:46.235898473 +0000
@@ -184,11 +184,10 @@
 (3 rows)
 
 select hundred, twenty from tenk1 where hundred <= 48 order by hundred desc limit 1;
- hundred | twenty 
----------+--------
-      48 |      8
-(1 row)
-
+ERROR:  deadlock detected
+DETAIL:  Process 23736 waits for AccessShareLock on relation 25159 of database 16384; blocked by process 23731.
+Process 23731 waits for AccessExclusiveLock on relation 16418 of database 16384; blocked by process 23736.
+HINT:  See server log for query details.
 --
 -- Add coverage for ScalarArrayOp btree quals with pivot tuple constants
 --

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/subselect.out /tmp/cirrus-ci-build/build/testrun/pg_upgrade/002_...
--- /tmp/cirrus-ci-build/src/test/regress/expected/subselect.out	2024-11-20 17:13:05.687793454 +0000
+++ /tmp/cirrus-ci-build/build/testrun/pg_upgrade/002_pg_upgrade/data/results/subselect.out	2024-11-20 17:18:11.21127431...
@@ -1029,7 +1029,7 @@
    ->  Seq Scan on tenk1 t
          Filter: ((ANY (unique2 = (hashed SubPlan 2).col1)) OR (ten < 0))
          SubPlan 2
-           ->  Index Only Scan using tenk1_unique1 on tenk1 k
+           ->  Index Only Scan using idx_int4 on tenk1 k
 (5 rows)
 
 select count(*) from tenk1 t
diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/arrays.out /tmp/cirrus-ci-build/build/testrun/pg_upgrade/002_pg_...
--- /tmp/cirrus-ci-build/src/test/regress/expected/arrays.out	2024-11-20 17:13:05.599793452 +0000
+++ /tmp/cirrus-ci-build/build/testrun/pg_upgrade/002_pg_upgrade/data/results/arrays.out	2024-11-20 17:18:11.003274463 +...
@@ -2227,11 +2227,10 @@
 
 -- array_agg(anynonarray)
 select array_agg(unique1) from (select unique1 from tenk1 where unique1 < 15 order by unique1) ss;
-              array_agg               
...

diff -U3 /Users/admin/pgsql/src/test/regress/expected/subselect.out /Users/admin/pgsql/build/testrun/pg_upgrade/002_pg_u...
--- /Users/admin/pgsql/src/test/regress/expected/subselect.out	2024-11-20 17:12:12
+++ /Users/admin/pgsql/build/testrun/pg_upgrade/002_pg_upgrade/data/results/subselect.out	2024-11-20 17:14:40
@@ -1403,7 +1403,7 @@
    ->  Seq Scan on public.tenk1 b
          Output: b.unique1, b.unique2, b.two, b.four, b.ten, b.twenty, b.hundred, b.thousand, b.twothousand, b.fivethou...
    SubPlan 1
-     ->  Index Only Scan using tenk1_unique1 on public.tenk1 a
+     ->  Index Only Scan using idx_int4 on public.tenk1 a
            Output: a.unique1
 (10 rows)
 

diff -U3 /Users/admin/pgsql/src/test/regress/expected/subselect.out /Users/admin/pgsql/build/testrun/recovery/027_stream...
--- /Users/admin/pgsql/src/test/regress/expected/subselect.out	2024-11-20 17:12:12
+++ /Users/admin/pgsql/build/testrun/recovery/027_stream_regress/data/results/subselect.out	2024-11-20 17:15:18
@@ -1403,7 +1403,7 @@
    ->  Seq Scan on public.tenk1 b
          Output: b.unique1, b.unique2, b.two, b.four, b.ten, b.twenty, b.hundred, b.thousand, b.twothousand, b.fivethou...
    SubPlan 1
-     ->  Index Only Scan using tenk1_unique1 on public.tenk1 a
+     ->  Index Only Scan using idx_int4 on public.tenk1 a
            Output: a.unique1
 (10 rows)
 

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-20 16:51:01.441111000 +0000
+++ /tmp/cirrus-ci-build/build/testrun/pg_upgrade/002_pg_upgrade/data/results/privileges.out	2024-11-20 16:53:10.3124230...
@@ -1842,1417 +1842,10 @@
 -- Do the same concurrently
 CREATE INDEX CONCURRENTLY sro_idx ON sro_tab ((sro_ifun(a) + sro_ifun(0)))
 	WHERE sro_ifun(a + 10) > sro_ifun(10);
--- REINDEX
-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 
...

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-20 16:51:01.384312000 +0000
+++ /tmp/cirrus-ci-build/build/testrun/recovery/027_stream_regress/data/results/brin.out	2024-11-20 16:53:46.429105000 +...
@@ -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/privileges.out /tmp/cirrus-ci-build/build/testrun/regress/regres...
--- /tmp/cirrus-ci-build/src/test/regress/expected/privileges.out	2024-11-20 16:51:01.441111000 +0000
+++ /tmp/cirrus-ci-build/build/testrun/regress/regress/results/privileges.out	2024-11-20 16:53:07.453673000 +0000
@@ -1842,1417 +1842,10 @@
 -- Do the same concurrently
 CREATE INDEX CONCURRENTLY sro_idx ON sro_tab ((sro_ifun(a) + sro_ifun(0)))
 	WHERE sro_ifun(a + 10) > sro_ifun(10);
--- REINDEX
-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 
...

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-20 16:51:04.000851271 +0000
+++ /tmp/cirrus-ci-build/src/bin/pg_upgrade/tmp_check/results/brin.out	2024-11-20 16:56:39.477368505 +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-20 16:51:04.000851271 +0000
+++ /tmp/cirrus-ci-build/src/test/regress/results/brin.out	2024-11-20 16:55:25.693271411 +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-20 16:51:01.638401009 +0000
+++ /tmp/cirrus-ci-build/build/testrun/pg_upgrade/002_pg_upgrade/data/results/brin.out	2024-11-20 16:55:57.385956405 +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-20 16:51:01.638401009 +0000
+++ /tmp/cirrus-ci-build/build/testrun/recovery/027_stream_regress/data/results/brin.out	2024-11-20 16:56:29.841888234 +...
@@ -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-20 16:51:01.638401009 +0000
+++ /tmp/cirrus-ci-build/build/testrun/regress/regress/results/brin.out	2024-11-20 16:55:52.481964368 +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-20 16:50:12
+++ /Users/admin/pgsql/build/testrun/pg_upgrade/002_pg_upgrade/data/results/brin.out	2024-11-20 16:53:39
@@ -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-20 16:50:12
+++ /Users/admin/pgsql/build/testrun/recovery/027_stream_regress/data/results/brin.out	2024-11-20 16:54:22
@@ -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/regress/regress/results/...
--- /Users/admin/pgsql/src/test/regress/expected/brin.out	2024-11-20 16:50:12
+++ /Users/admin/pgsql/build/testrun/regress/regress/results/brin.out	2024-11-20 16:53:39
@@ -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/pg_upgrade/002_pg_upgr...
--- C:/cirrus/src/test/regress/expected/brin.out	2024-11-20 16:51:16.666537700 +0000
+++ C:/cirrus/build/testrun/pg_upgrade/002_pg_upgrade/data/results/brin.out	2024-11-20 16:54:01.051665100 +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-20 16:51:16.666537700 +0000
+++ C:/cirrus/build/testrun/recovery/027_stream_regress/data/results/brin.out	2024-11-20 16:55:58.791932500 +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-20 16:51:16.666537700 +0000
+++ C:/cirrus/build/testrun/regress/regress/results/brin.out	2024-11-20 16:53:56.338283700 +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 --strip-trailing-cr -U3 C:/cirrus/src/test/regress/expected/privileges.out C:/cirrus/build/testrun/regress/regress/...
--- C:/cirrus/src/test/regress/expected/privileges.out	2024-11-20 16:51:16.807133400 +0000
+++ C:/cirrus/build/testrun/regress/regress/results/privileges.out	2024-11-20 16:53:56.338283700 +0000
@@ -1842,1417 +1842,10 @@
 -- Do the same concurrently
...

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/sysviews.out /tmp/cirrus-ci-build/build/testrun/pg_upgrade/002_p...
--- /tmp/cirrus-ci-build/src/test/regress/expected/sysviews.out	2024-11-20 10:06:13.903969000 +0000
+++ /tmp/cirrus-ci-build/build/testrun/pg_upgrade/002_pg_upgrade/data/results/sysviews.out	2024-11-20 10:09:14.939671000...
@@ -233,4 +233,10 @@
         from pg_get_process_memory_contexts(checkpointer_pid, false) where path = '{0}' into r; 
 	RAISE NOTICE '%', r;
 END $$;
-NOTICE:  (AllocSet,TopMemoryContext,,t)
+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/rules.out /tmp/cirrus-ci-build/build/testrun/pg_upgrade/002_pg_u...
--- /tmp/cirrus-ci-build/src/test/regress/expected/rules.out	2024-11-20 10:06:13.895650000 +0000
+++ /tmp/cirrus-ci-build/build/testrun/pg_upgrade/002_pg_upgrade/data/results/rules.out	2024-11-20 10:09:14.973186000 +0...
@@ -1,3849 +1,2 @@
---
...

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/create_table_like.out /tmp/cirrus-ci-build/build/testrun/recover...
--- /tmp/cirrus-ci-build/src/test/regress/expected/create_table_like.out	2024-11-20 10:06:13.839096000 +0000
+++ /tmp/cirrus-ci-build/build/testrun/recovery/027_stream_regress/data/results/create_table_like.out	2024-11-20 10:09:0...
@@ -113,445 +113,10 @@
 (1 row)
 
 DROP TABLE test_like_id_1, test_like_id_2, test_like_id_3;
-CREATE TABLE test_like_gen_1 (a int, b int GENERATED ALWAYS AS (a * 2) STORED);
-\d test_like_gen_1
-                        Table "public.test_like_gen_1"
- Column |  Type   | Collation | Nullable |              Default               
---------+---------+-----------+----------+------------------------------------
- a      | integer |           |          | 
- b      | integer |           |          | generated always as (a * 2) stored
-
-INSERT INTO test_like_gen_1 (a) VALUES (1);
-SELECT * FROM test_like_gen_1;
- a | b 
----+---
- 1 | 2
...

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/create_table_like.out /tmp/cirrus-ci-build/build/testrun/regress...
--- /tmp/cirrus-ci-build/src/test/regress/expected/create_table_like.out	2024-11-20 10:06:13.839096000 +0000
+++ /tmp/cirrus-ci-build/build/testrun/regress/regress/results/create_table_like.out	2024-11-20 10:08:27.177780000 +0000
@@ -178,380 +178,10 @@
 CREATE TABLE test_like_4c (LIKE test_like_4 INCLUDING GENERATED);
 CREATE TABLE test_like_4d (LIKE test_like_4 INCLUDING DEFAULTS INCLUDING GENERATED);
 \d test_like_4a
-            Table "public.test_like_4a"
- Column |  Type   | Collation | Nullable | Default 
---------+---------+-----------+----------+---------
- b      | integer |           |          | 
- c      | integer |           |          | 
- a      | integer |           |          | 
-
-INSERT INTO test_like_4a (a) VALUES(11);
-SELECT a, b, c FROM test_like_4a;
- a  | b | c 
-----+---+---
- 11 |   |  
-(1 row)
...

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/sysviews.out /tmp/cirrus-ci-build/src/bin/pg_upgrade/tmp_check/r...
--- /tmp/cirrus-ci-build/src/test/regress/expected/sysviews.out	2024-11-20 10:06:06.228982532 +0000
+++ /tmp/cirrus-ci-build/src/bin/pg_upgrade/tmp_check/results/sysviews.out	2024-11-20 10:13:13.047359452 +0000
@@ -233,4 +233,10 @@
         from pg_get_process_memory_contexts(checkpointer_pid, false) where path = '{0}' into r; 
 	RAISE NOTICE '%', r;
 END $$;
-NOTICE:  (AllocSet,TopMemoryContext,,t)
+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/rules.out /tmp/cirrus-ci-build/src/bin/pg_upgrade/tmp_check/resu...
--- /tmp/cirrus-ci-build/src/test/regress/expected/rules.out	2024-11-20 10:06:06.216921592 +0000
+++ /tmp/cirrus-ci-build/src/bin/pg_upgrade/tmp_check/results/rules.out	2024-11-20 10:13:13.099361907 +0000
@@ -1,3849 +1,2 @@
---
...

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/select_views.out /tmp/cirrus-ci-build/src/test/regress/results/s...
--- /tmp/cirrus-ci-build/src/test/regress/expected/select_views.out	2024-11-20 10:06:06.220941906 +0000
+++ /tmp/cirrus-ci-build/src/test/regress/results/select_views.out	2024-11-20 10:11:16.214861319 +0000
@@ -1,1552 +1 @@
---
--- SELECT_VIEWS
--- test the views defined in CREATE_VIEWS
---
-SELECT * FROM street;
-                name                |                                                                                  ...
-------------------------------------+----------------------------------------------------------------------------------...
- Access Rd 25                       | [(-121.9283,37.894),(-121.9283,37.9)]                                            ...
- Ada                           St   | [(-122.2487,37.398),(-122.2496,37.401)]                                          ...
- Agua Fria Creek                    | [(-121.9254,37.922),(-121.9281,37.889)]                                          ...
- Allen                         Ct   | [(-122.0131,37.602),(-122.0117,37.597)]                                          ...
- Alvarado Niles                Road | [(-122.0325,37.903),(-122.0316,37.9)]                                            ...
- Andrea                        Cir  | [(-121.733218,37.88641),(-121.733286,37.90617)]                                  ...
- Apricot                       Lane | [(-121.9471,37.401),(-121.9456,37.392)]                                          ...
- Apricot                       Lane | [(-121.9471,37.401),(-121.9456,37.392)]                                          ...
- Arden                         Road | [(-122.0978,37.177),(-122.1,37.177)]                                             ...
...

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/rules.out /tmp/cirrus-ci-build/build/testrun/regress/regress/res...
--- /tmp/cirrus-ci-build/src/test/regress/expected/rules.out	2024-11-20 10:06:07.603839927 +0000
+++ /tmp/cirrus-ci-build/build/testrun/regress/regress/results/rules.out	2024-11-20 10:11:18.304234194 +0000
@@ -2709,11 +2709,13 @@
 	id1b integer,
 	primary key (id1a, id1b)
 );
+ERROR:  pg_attribute catalog is missing 1 attribute(s) for relation OID 2579
 create table rule_and_refint_t2 (
 	id2a integer,
 	id2c integer,
 	primary key (id2a, id2c)
 );
+ERROR:  pg_attribute catalog is missing 1 attribute(s) for relation OID 2579
 create table rule_and_refint_t3 (
 	id3a integer,
 	id3b integer,
@@ -2723,35 +2725,76 @@
 	foreign key (id3a, id3b) references rule_and_refint_t1 (id1a, id1b),
 	foreign key (id3a, id3c) references rule_and_refint_t2 (id2a, id2c)
...

diff -U3 /Users/admin/pgsql/src/test/regress/expected/sysviews.out /Users/admin/pgsql/build/testrun/pg_upgrade/002_pg_up...
--- /Users/admin/pgsql/src/test/regress/expected/sysviews.out	2024-11-20 10:05:12
+++ /Users/admin/pgsql/build/testrun/pg_upgrade/002_pg_upgrade/data/results/sysviews.out	2024-11-20 10:08:36
@@ -233,4 +233,10 @@
         from pg_get_process_memory_contexts(checkpointer_pid, false) where path = '{0}' into r; 
 	RAISE NOTICE '%', r;
 END $$;
-NOTICE:  (AllocSet,TopMemoryContext,,t)
+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 /Users/admin/pgsql/src/test/regress/expected/rules.out /Users/admin/pgsql/build/testrun/pg_upgrade/002_pg_upgra...
--- /Users/admin/pgsql/src/test/regress/expected/rules.out	2024-11-20 10:05:12
+++ /Users/admin/pgsql/build/testrun/pg_upgrade/002_pg_upgrade/data/results/rules.out	2024-11-20 10:08:36
@@ -1,3849 +1,2 @@
---
...

diff -U3 /Users/admin/pgsql/src/test/regress/expected/create_table_like.out /Users/admin/pgsql/build/testrun/recovery/02...
--- /Users/admin/pgsql/src/test/regress/expected/create_table_like.out	2024-11-20 10:05:12
+++ /Users/admin/pgsql/build/testrun/recovery/027_stream_regress/data/results/create_table_like.out	2024-11-20 10:08:33
@@ -276,282 +276,10 @@
     "public.test_like_6c_expr_stat" ON (a || b) FROM test_like_6c
 
 DROP TABLE test_like_4, test_like_4a, test_like_4b, test_like_4c, test_like_4d;
-DROP TABLE test_like_5, test_like_5x, test_like_5c;
-DROP TABLE test_like_6, test_like_6c;
-CREATE TABLE inhg (x text, LIKE inhx INCLUDING INDEXES, y text); /* copies indexes */
-INSERT INTO inhg VALUES (5, 10);
-INSERT INTO inhg VALUES (20, 10); -- should fail
-ERROR:  duplicate key value violates unique constraint "inhg_pkey"
-DETAIL:  Key (xx)=(10) already exists.
-DROP TABLE inhg;
-/* Multiple primary keys creation should fail */
-CREATE TABLE inhg (x text, LIKE inhx INCLUDING INDEXES, PRIMARY KEY(x)); /* fails */
-ERROR:  multiple primary keys for table "inhg" are not allowed
-CREATE TABLE inhz (xx text DEFAULT 'text', yy int UNIQUE);
-CREATE UNIQUE INDEX inhz_xx_idx on inhz (xx) WHERE xx <> 'test';
...

diff -U3 /Users/admin/pgsql/src/test/regress/expected/sysviews.out /Users/admin/pgsql/build/testrun/regress/regress/resu...
--- /Users/admin/pgsql/src/test/regress/expected/sysviews.out	2024-11-20 10:05:12
+++ /Users/admin/pgsql/build/testrun/regress/regress/results/sysviews.out	2024-11-20 10:07:56
@@ -233,4 +233,10 @@
         from pg_get_process_memory_contexts(checkpointer_pid, false) where path = '{0}' into r; 
 	RAISE NOTICE '%', r;
 END $$;
-NOTICE:  (AllocSet,TopMemoryContext,,t)
+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 /Users/admin/pgsql/src/test/regress/expected/rules.out /Users/admin/pgsql/build/testrun/regress/regress/results...
--- /Users/admin/pgsql/src/test/regress/expected/rules.out	2024-11-20 10:05:12
+++ /Users/admin/pgsql/build/testrun/regress/regress/results/rules.out	2024-11-20 10:07:56
@@ -1,3849 +1,2 @@
---
...

diff --strip-trailing-cr -U3 C:/cirrus/src/test/regress/expected/sysviews.out C:/cirrus/build/testrun/pg_upgrade/002_pg_...
--- C:/cirrus/src/test/regress/expected/sysviews.out	2024-11-20 10:06:29.663053100 +0000
+++ C:/cirrus/build/testrun/pg_upgrade/002_pg_upgrade/data/results/sysviews.out	2024-11-20 10:10:39.679544200 +0000
@@ -233,4 +233,10 @@
         from pg_get_process_memory_contexts(checkpointer_pid, false) where path = '{0}' into r; 
 	RAISE NOTICE '%', r;
 END $$;
-NOTICE:  (AllocSet,TopMemoryContext,,t)
+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 --strip-trailing-cr -U3 C:/cirrus/src/test/regress/expected/rules.out C:/cirrus/build/testrun/pg_upgrade/002_pg_upg...
--- C:/cirrus/src/test/regress/expected/rules.out	2024-11-20 10:06:29.641983900 +0000
+++ C:/cirrus/build/testrun/pg_upgrade/002_pg_upgrade/data/results/rules.out	2024-11-20 10:10:41.825035800 +0000
@@ -1,3849 +1,2 @@
---
...

diff --strip-trailing-cr -U3 C:/cirrus/src/test/regress/expected/create_table_like.out C:/cirrus/build/testrun/recovery/...
--- C:/cirrus/src/test/regress/expected/create_table_like.out	2024-11-20 10:06:29.516000400 +0000
+++ C:/cirrus/build/testrun/recovery/027_stream_regress/data/results/create_table_like.out	2024-11-20 10:11:50.421316500...
@@ -489,69 +489,10 @@
     "ctlt1_a_not_null" NOT NULL "a"
 
 DROP TABLE public.pg_attrdef;
--- Check that LIKE isn't confused when new table masks the old, either
-BEGIN;
-CREATE SCHEMA ctl_schema;
-SET LOCAL search_path = ctl_schema, public;
-CREATE TABLE ctlt1 (LIKE ctlt1 INCLUDING ALL);
-\d+ ctlt1
-                                Table "ctl_schema.ctlt1"
- Column | Type | Collation | Nullable | Default | Storage  | Stats target | Description 
---------+------+-----------+----------+---------+----------+--------------+-------------
- a      | text |           | not null |         | main     |              | A
- b      | text |           |          |         | extended |              | B
-Indexes:
-    "ctlt1_pkey" PRIMARY KEY, btree (a)
...

diff --strip-trailing-cr -U3 C:/cirrus/src/test/regress/expected/sysviews.out C:/cirrus/build/testrun/regress/regress/re...
--- C:/cirrus/src/test/regress/expected/sysviews.out	2024-11-20 10:06:29.663053100 +0000
+++ C:/cirrus/build/testrun/regress/regress/results/sysviews.out	2024-11-20 10:09:37.218543600 +0000
@@ -233,4 +233,10 @@
         from pg_get_process_memory_contexts(checkpointer_pid, false) where path = '{0}' into r; 
 	RAISE NOTICE '%', r;
 END $$;
-NOTICE:  (AllocSet,TopMemoryContext,,t)
+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 /Users/admin/pgsql/src/test/regress/expected/subselect.out /Users/admin/pgsql/build/testrun/regress/regress/res...
--- /Users/admin/pgsql/src/test/regress/expected/subselect.out	2024-11-20 09:09:16
+++ /Users/admin/pgsql/build/testrun/regress/regress/results/subselect.out	2024-11-20 09:10:40
@@ -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/pg_upgrade/002_pg...
--- C:/cirrus/src/test/regress/expected/subselect.out	2024-11-20 09:14:34.030865900 +0000
+++ C:/cirrus/build/testrun/pg_upgrade/002_pg_upgrade/data/results/subselect.out	2024-11-20 09:17:11.700158500 +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/recovery/027_stre...
--- C:/cirrus/src/test/regress/expected/subselect.out	2024-11-20 09:14:34.030865900 +0000
+++ C:/cirrus/build/testrun/recovery/027_stream_regress/data/results/subselect.out	2024-11-20 09:19:28.431081300 +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/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-20 01:30:10.744257000 +0000
+++ /tmp/cirrus-ci-build/build/testrun/pg_upgrade/002_pg_upgrade/data/results/xml.out	2024-11-20 01:31:34.351760000 +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-20 01:30:10.744257000 +0000
+++ /tmp/cirrus-ci-build/build/testrun/recovery/027_stream_regress/data/results/xml.out	2024-11-20 01:32:28.898113000 +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-20 01:30:10.744257000 +0000
+++ /tmp/cirrus-ci-build/build/testrun/regress/regress/results/xml.out	2024-11-20 01:31:31.234424000 +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-20 01:30:08.134686527 +0000
+++ /tmp/cirrus-ci-build/src/bin/pg_upgrade/tmp_check/results/xml.out	2024-11-20 01:35:10.958326128 +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/recovery/tmp_check/results...
--- /tmp/cirrus-ci-build/src/test/regress/expected/xml.out	2024-11-20 01:30:08.134686527 +0000
+++ /tmp/cirrus-ci-build/src/test/recovery/tmp_check/results/xml.out	2024-11-20 01:36:50.369749007 +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-20 01:30:08.134686527 +0000
+++ /tmp/cirrus-ci-build/src/test/regress/results/xml.out	2024-11-20 01:33:10.846445027 +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-20 01:30:11.183394188 +0000
+++ /tmp/cirrus-ci-build/build/testrun/pg_upgrade/002_pg_upgrade/data/results/xml.out	2024-11-20 01:32:53.941296264 +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-20 01:30:11.183394188 +0000
+++ /tmp/cirrus-ci-build/build/testrun/recovery/027_stream_regress/data/results/xml.out	2024-11-20 01:33:29.109445106 +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-20 01:30:11.183394188 +0000
+++ /tmp/cirrus-ci-build/build/testrun/regress/regress/results/xml.out	2024-11-20 01:32:48.217270689 +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-20 01:29:13
+++ /Users/admin/pgsql/build/testrun/pg_upgrade/002_pg_upgrade/data/results/xml.out	2024-11-20 01:31:06
@@ -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-20 01:29:13
+++ /Users/admin/pgsql/build/testrun/recovery/027_stream_regress/data/results/xml.out	2024-11-20 01:31: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/regress/regress/results/x...
--- /Users/admin/pgsql/src/test/regress/expected/xml.out	2024-11-20 01:29:13
+++ /Users/admin/pgsql/build/testrun/regress/regress/results/xml.out	2024-11-20 01:31:07
@@ -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-19 22:48:43.538106000 +0000
+++ /tmp/cirrus-ci-build/build/testrun/pg_upgrade/002_pg_upgrade/data/results/indexing.out	2024-11-19 22:50:20.571990000...
@@ -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-19 22:48:43.538106000 +0000
+++ /tmp/cirrus-ci-build/build/testrun/recovery/027_stream_regress/data/results/indexing.out	2024-11-19 22:51:06.8803540...
@@ -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-19 22:48:43.538106000 +0000
+++ /tmp/cirrus-ci-build/build/testrun/regress/regress/results/indexing.out	2024-11-19 22:50:21.162112000 +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-19 22:48:44.055370930 +0000
+++ /tmp/cirrus-ci-build/src/bin/pg_upgrade/tmp_check/results/indexing.out	2024-11-19 22:54:01.406624796 +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-19 22:48:43.887930663 +0000
+++ /tmp/cirrus-ci-build/src/test/isolation/output_iso/results/partitioned-cic.out	2024-11-19 23:15:55.088363550 +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-19 22:48:44.055370930 +0000
+++ /tmp/cirrus-ci-build/src/test/recovery/tmp_check/results/indexing.out	2024-11-19 22:55:33.538278717 +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-19 22:48:44.055370930 +0000
+++ /tmp/cirrus-ci-build/src/test/regress/results/indexing.out	2024-11-19 22:52:04.202618812 +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-19 22:48:39.781786552 +0000
+++ /tmp/cirrus-ci-build/build/testrun/pg_upgrade/002_pg_upgrade/data/results/indexing.out	2024-11-19 22:51:17.633381338...
@@ -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-19 22:48:39.781786552 +0000
+++ /tmp/cirrus-ci-build/build/testrun/recovery/027_stream_regress/data/results/indexing.out	2024-11-19 22:51:48.4733664...
@@ -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-19 22:48:39.781786552 +0000
+++ /tmp/cirrus-ci-build/build/testrun/regress/regress/results/indexing.out	2024-11-19 22:51:13.809383594 +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-19 22:48:12
+++ /Users/admin/pgsql/build/testrun/pg_upgrade/002_pg_upgrade/data/results/indexing.out	2024-11-19 22:53:26
@@ -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-19 22:48:12
+++ /Users/admin/pgsql/build/testrun/recovery/027_stream_regress/data/results/indexing.out	2024-11-19 22:54:08
@@ -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-19 22:48:12
+++ /Users/admin/pgsql/build/testrun/regress/regress/results/indexing.out	2024-11-19 22:53:26
@@ -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-19 22:49:00.430383700 +0000
+++ C:/cirrus/build/testrun/pg_upgrade/002_pg_upgrade/data/results/indexing.out	2024-11-19 22:52:34.198061900 +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-19 22:49:00.430383700 +0000
+++ C:/cirrus/build/testrun/recovery/027_stream_regress/data/results/indexing.out	2024-11-19 22:54:39.483248100 +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-19 22:49:00.430383700 +0000
+++ C:/cirrus/build/testrun/regress/regress/results/indexing.out	2024-11-19 22:52:27.608209000 +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/session_variables.out /tmp/cirrus-ci-build/build/testrun/pg_upgr...
--- /tmp/cirrus-ci-build/src/test/regress/expected/session_variables.out	2024-11-19 22:11:16.434243000 +0000
+++ /tmp/cirrus-ci-build/build/testrun/pg_upgrade/002_pg_upgrade/data/results/session_variables.out	2024-11-19 22:13:26....
@@ -1891,11 +1891,8 @@
 -- no warning
 \set VERBOSITY verbose
 SELECT variable(a) FROM test_table;
- a  
-----
- 10
-(1 row)
-
+ERROR:  XX000: unrecognized node type: 70
+LOCATION:  raw_expression_tree_walker_impl, nodeFuncs.c:4686
 \set VERBOSITY default
 ALTER TABLE test_table DROP COLUMN a;
 -- warning - variable fence is not used
@@ -1911,11 +1908,7 @@
 
 -- no warning
...

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/session_variables.out /tmp/cirrus-ci-build/build/testrun/recover...
--- /tmp/cirrus-ci-build/src/test/regress/expected/session_variables.out	2024-11-19 22:11:16.434243000 +0000
+++ /tmp/cirrus-ci-build/build/testrun/recovery/027_stream_regress/data/results/session_variables.out	2024-11-19 22:14:1...
@@ -1891,11 +1891,8 @@
 -- no warning
 \set VERBOSITY verbose
 SELECT variable(a) FROM test_table;
- a  
-----
- 10
-(1 row)
-
+ERROR:  XX000: unrecognized node type: 70
+LOCATION:  raw_expression_tree_walker_impl, nodeFuncs.c:4686
 \set VERBOSITY default
 ALTER TABLE test_table DROP COLUMN a;
 -- warning - variable fence is not used
@@ -1911,11 +1908,7 @@
 
 -- no warning
...

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/session_variables.out /tmp/cirrus-ci-build/build/testrun/regress...
--- /tmp/cirrus-ci-build/src/test/regress/expected/session_variables.out	2024-11-19 22:11:16.434243000 +0000
+++ /tmp/cirrus-ci-build/build/testrun/regress/regress/results/session_variables.out	2024-11-19 22:13:27.147345000 +0000
@@ -1891,11 +1891,8 @@
 -- no warning
 \set VERBOSITY verbose
 SELECT variable(a) FROM test_table;
- a  
-----
- 10
-(1 row)
-
+ERROR:  XX000: unrecognized node type: 70
+LOCATION:  raw_expression_tree_walker_impl, nodeFuncs.c:4686
 \set VERBOSITY default
 ALTER TABLE test_table DROP COLUMN a;
 -- warning - variable fence is not used
@@ -1911,11 +1908,7 @@
 
 -- no warning
...

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/session_variables.out /tmp/cirrus-ci-build/build/testrun/pg_upgr...
--- /tmp/cirrus-ci-build/src/test/regress/expected/session_variables.out	2024-11-19 20:31:26.650669000 +0000
+++ /tmp/cirrus-ci-build/build/testrun/pg_upgrade/002_pg_upgrade/data/results/session_variables.out	2024-11-19 20:34:18....
@@ -1890,11 +1890,7 @@
 
 -- no warning
 SELECT variable(a) FROM test_table;
- a  
-----
- 10
-(1 row)
-
+ERROR:  unrecognized node type: 70
 ALTER TABLE test_table DROP COLUMN a;
 -- warning - variable fence is not used
 SELECT a, b FROM test_table;
@@ -1909,11 +1905,7 @@
 
 -- no warning
 SELECT variable(a), b FROM test_table;
...

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/session_variables.out /tmp/cirrus-ci-build/build/testrun/recover...
--- /tmp/cirrus-ci-build/src/test/regress/expected/session_variables.out	2024-11-19 20:31:26.650669000 +0000
+++ /tmp/cirrus-ci-build/build/testrun/recovery/027_stream_regress/data/results/session_variables.out	2024-11-19 20:35:0...
@@ -1890,11 +1890,7 @@
 
 -- no warning
 SELECT variable(a) FROM test_table;
- a  
-----
- 10
-(1 row)
-
+ERROR:  unrecognized node type: 70
 ALTER TABLE test_table DROP COLUMN a;
 -- warning - variable fence is not used
 SELECT a, b FROM test_table;
@@ -1909,11 +1905,7 @@
 
 -- no warning
 SELECT variable(a), b FROM test_table;
...

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/session_variables.out /tmp/cirrus-ci-build/build/testrun/regress...
--- /tmp/cirrus-ci-build/src/test/regress/expected/session_variables.out	2024-11-19 20:31:26.650669000 +0000
+++ /tmp/cirrus-ci-build/build/testrun/regress/regress/results/session_variables.out	2024-11-19 20:34:14.469826000 +0000
@@ -1890,11 +1890,7 @@
 
 -- no warning
 SELECT variable(a) FROM test_table;
- a  
-----
- 10
-(1 row)
-
+ERROR:  unrecognized node type: 70
 ALTER TABLE test_table DROP COLUMN a;
 -- warning - variable fence is not used
 SELECT a, b FROM test_table;
@@ -1909,11 +1905,7 @@
 
 -- no warning
 SELECT variable(a), b FROM test_table;
...

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-19 16:31:06.575485888 +0000
+++ /tmp/cirrus-ci-build/build-32/testrun/pg_upgrade/002_pg_upgrade/data/results/jsonb_jsonpath.out	2024-11-19 16:36:59....
@@ -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-19 16:31:06.575485888 +0000
+++ /tmp/cirrus-ci-build/build-32/testrun/recovery/027_stream_regress/data/results/jsonb_jsonpath.out	2024-11-19 16:37:3...
@@ -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-19 16:31:06.575485888 +0000
+++ /tmp/cirrus-ci-build/build-32/testrun/regress/regress/results/jsonb_jsonpath.out	2024-11-19 16:36:52.881470234 +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-19 14:00:43.829686000 +0000
+++ /tmp/cirrus-ci-build/build/testrun/btree_gist/regress/results/partitions.out	2024-11-19 14:03:30.467034000 +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-19 14:00:43.832141000 +0000
+++ /tmp/cirrus-ci-build/build/testrun/btree_gist/regress/results/without_overlaps.out	2024-11-19 14:03:30.883786000 +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-19 14:00:40.017734298 +0000
+++ /tmp/cirrus-ci-build/build/testrun/btree_gist/regress/results/partitions.out	2024-11-19 14:05:55.618098991 +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-19 14:00:40.021745507 +0000
+++ /tmp/cirrus-ci-build/build/testrun/btree_gist/regress/results/without_overlaps.out	2024-11-19 14:05:55.858100091 +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-19 14:00:10
+++ /Users/admin/pgsql/build/testrun/btree_gist/regress/results/partitions.out	2024-11-19 14:03:14
@@ -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-19 14:00:10
+++ /Users/admin/pgsql/build/testrun/btree_gist/regress/results/without_overlaps.out	2024-11-19 14:03:14
@@ -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-19 14:00:48.542049400 +0000
+++ C:/cirrus/build/testrun/btree_gist/regress/results/partitions.out	2024-11-19 14:07:03.326188200 +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-19 14:00:48.560518500 +0000
+++ C:/cirrus/build/testrun/btree_gist/regress/results/without_overlaps.out	2024-11-19 14:07:04.219257200 +0000
@@ -9,7 +9,6 @@
   CONSTRAINT temporal_rng_pk PRIMARY KEY (id, valid_at WITHOUT OVERLAPS)
 );
...

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-19 11:37:13.756121000 +0000
+++ /tmp/cirrus-ci-build/build/testrun/pg_upgrade/002_pg_upgrade/data/results/copy2.out	2024-11-19 11:38:43.388603000 +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-19 11:37:13.756121000 +0000
+++ /tmp/cirrus-ci-build/build/testrun/recovery/027_stream_regress/data/results/copy2.out	2024-11-19 11:39:29.907709000 ...
@@ -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-19 11:37:13.756121000 +0000
+++ /tmp/cirrus-ci-build/build/testrun/regress/regress/results/copy2.out	2024-11-19 11:38:40.094384000 +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/bin/pg_upgrade/tmp_check/resu...
--- /tmp/cirrus-ci-build/src/test/regress/expected/copy2.out	2024-11-19 11:37:14.430110386 +0000
+++ /tmp/cirrus-ci-build/src/bin/pg_upgrade/tmp_check/results/copy2.out	2024-11-19 11:42:05.653404954 +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-19 11:37:14.430110386 +0000
+++ /tmp/cirrus-ci-build/src/test/regress/results/copy2.out	2024-11-19 11:40:14.861398616 +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/build/testrun/pg_upgrade/002_pg_u...
--- /tmp/cirrus-ci-build/src/test/regress/expected/copy2.out	2024-11-19 11:37:14.089083197 +0000
+++ /tmp/cirrus-ci-build/build/testrun/pg_upgrade/002_pg_upgrade/data/results/copy2.out	2024-11-19 11:39:37.960494007 +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-19 11:37:14.089083197 +0000
+++ /tmp/cirrus-ci-build/build/testrun/recovery/027_stream_regress/data/results/copy2.out	2024-11-19 11:40:14.000361556 ...
@@ -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-19 11:37:14.089083197 +0000
+++ /tmp/cirrus-ci-build/build/testrun/regress/regress/results/copy2.out	2024-11-19 11:39:33.292516426 +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/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-19 11:37:08
+++ /Users/admin/pgsql/build/testrun/pg_upgrade/002_pg_upgrade/data/results/copy2.out	2024-11-19 11:38:50
@@ -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-19 11:37:08
+++ /Users/admin/pgsql/build/testrun/recovery/027_stream_regress/data/results/copy2.out	2024-11-19 11:39:40
@@ -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-19 11:37:08
+++ /Users/admin/pgsql/build/testrun/regress/regress/results/copy2.out	2024-11-19 11:38:51
@@ -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/pg_upgrade/002_pg_upg...
--- C:/cirrus/src/test/regress/expected/copy2.out	2024-11-19 11:37:31.601119600 +0000
+++ C:/cirrus/build/testrun/pg_upgrade/002_pg_upgrade/data/results/copy2.out	2024-11-19 11:41:03.720264400 +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-19 11:37:31.601119600 +0000
+++ C:/cirrus/build/testrun/recovery/027_stream_regress/data/results/copy2.out	2024-11-19 11:43:27.295530600 +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-19 11:37:31.601119600 +0000
+++ C:/cirrus/build/testrun/regress/regress/results/copy2.out	2024-11-19 11:40:58.947818200 +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/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-19 07:12:36.94027400...
+++ /tmp/cirrus-ci-build/build/testrun/isolation/isolation/results/vacuum-extending-in-repetable-read.out	2024-11-19 07:...
@@ -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-19 07:12:35.28340440...
+++ /tmp/cirrus-ci-build/src/test/isolation/output_iso/results/vacuum-extending-in-repetable-read.out	2024-11-19 07:18:2...
@@ -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-19 07:12:37.19443425...
+++ /tmp/cirrus-ci-build/build/testrun/isolation/isolation/results/vacuum-extending-in-repetable-read.out	2024-11-19 07:...
@@ -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-19 07:12:12
+++ /Users/admin/pgsql/build/testrun/isolation/isolation/results/vacuum-extending-in-repetable-read.out	2024-11-19 07:15...
@@ -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-19 07:12:50.153921900 +0000
+++ C:/cirrus/build/testrun/isolation/isolation/results/vacuum-extending-in-repetable-read.out	2024-11-19 07:16:37.29320...
@@ -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-18 23:17:51.898437000 +0000
+++ /tmp/cirrus-ci-build/build/testrun/pg_upgrade/002_pg_upgrade/data/results/alter_table.out	2024-11-18 23:20:32.371397...
@@ -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        
+-------+------------+---------------+-------------+----------------------
+ 39356 |            |             0 |       39356 | pktable_pkey
+ 39352 |            |             0 |       39352 | pktable
+ 39358 |            |             0 |       39358 | fktable
+ 40001 |            |             0 |       40009 | foo
+ 40013 |            |             0 |       40013 | pg_toast_40001_index
+ 40012 |            |             0 |       40012 | pg_toast_40001
+ 40232 |            |             0 |       40232 | old_oids
+ 40249 |            |             0 |       40249 | pg_toast_40246
...

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-18 23:17:51.898437000 +0000
+++ /tmp/cirrus-ci-build/build/testrun/recovery/027_stream_regress/data/results/alter_table.out	2024-11-18 23:21:31.0779...
@@ -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        
+-------+------------+---------------+-------------+----------------------
+ 39294 |            |             0 |       39294 | pktable_pkey
+ 39290 |            |             0 |       39290 | pktable
+ 39299 |            |             0 |       39299 | fktable
+ 39958 |            |             0 |       39958 | pg_toast_39948_index
+ 39957 |            |             0 |       39957 | pg_toast_39948
+ 39948 |            |             0 |       39954 | foo
+ 40169 |            |             0 |       40169 | old_oids
+ 40187 |            |             0 |       40187 | pg_toast_40184
...

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-18 23:17:51.898437000 +0000
+++ /tmp/cirrus-ci-build/build/testrun/regress/regress/results/alter_table.out	2024-11-18 23:20:33.863009000 +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        
+-------+------------+---------------+-------------+----------------------
+ 39437 |            |             0 |       39437 | pktable_pkey
+ 39433 |            |             0 |       39433 | pktable
+ 39439 |            |             0 |       39439 | fktable
+ 39998 |            |             0 |       40003 | foo
+ 40007 |            |             0 |       40007 | pg_toast_39998_index
+ 40006 |            |             0 |       40006 | pg_toast_39998
+ 40226 |            |             0 |       40226 | old_oids
+ 40243 |            |             0 |       40243 | pg_toast_40240
...

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-18 23:17:47.186053424 +0000
+++ /tmp/cirrus-ci-build/src/bin/pg_upgrade/tmp_check/results/alter_table.out	2024-11-18 23:25:09.180596941 +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        
+-------+------------+---------------+-------------+----------------------
+ 39541 |            |             0 |       39541 | pktable_pkey
+ 39537 |            |             0 |       39537 | pktable
+ 39543 |            |             0 |       39543 | fktable
+ 40121 |            |             0 |       40126 | foo
+ 40130 |            |             0 |       40130 | pg_toast_40121_index
+ 40129 |            |             0 |       40129 | pg_toast_40121
+ 40348 |            |             0 |       40348 | old_oids
+ 40367 |            |             0 |       40367 | pg_toast_40364
...

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-18 23:17:47.186053424 +0000
+++ /tmp/cirrus-ci-build/src/test/recovery/tmp_check/results/alter_table.out	2024-11-18 23:26:48.816149111 +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        
+-------+------------+---------------+-------------+----------------------
+ 39544 |            |             0 |       39544 | pktable_pkey
+ 39539 |            |             0 |       39539 | pktable
+ 39550 |            |             0 |       39550 | fktable
+ 40076 |            |             0 |       40082 | foo
+ 40086 |            |             0 |       40086 | pg_toast_40076_index
+ 40085 |            |             0 |       40085 | pg_toast_40076
+ 40303 |            |             0 |       40303 | old_oids
+ 40320 |            |             0 |       40320 | pg_toast_40317
...

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-18 23:17:47.186053424 +0000
+++ /tmp/cirrus-ci-build/src/test/regress/results/alter_table.out	2024-11-18 23:22:51.964035861 +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
+ 39576 |            |             0 |       39576 | pktable
+ 39583 |            |             0 |       39583 | fktable
+ 40107 |            |             0 |       40116 | foo
+ 40120 |            |             0 |       40120 | pg_toast_40107_index
+ 40119 |            |             0 |       40119 | pg_toast_40107
+ 40339 |            |             0 |       40339 | old_oids
+ 40356 |            |             0 |       40356 | pg_toast_40353
...

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-18 23:17:48.755306672 +0000
+++ /tmp/cirrus-ci-build/build/testrun/pg_upgrade/002_pg_upgrade/data/results/alter_table.out	2024-11-18 23:22:53.527080...
@@ -3481,9 +3481,26 @@
 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        
+-------+------------+---------------+-------------+----------------------
+ 39621 |            |             0 |       39621 | users_id_seq
+ 39627 |            |             0 |       39627 | pg_toast_39622
+ 39628 |            |             0 |       39628 | pg_toast_39622_index
+ 39622 |            |             0 |       39622 | users
+ 39903 |            |             0 |       39903 | foo
+ 40246 |            |             0 |       40246 | forc_test
+ 39432 |            |             0 |       39432 | pktable_pkey
+ 39428 |            |             0 |       39428 | pktable
...

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-18 23:17:48.755306672 +0000
+++ /tmp/cirrus-ci-build/build/testrun/recovery/027_stream_regress/data/results/alter_table.out	2024-11-18 23:23:34.7028...
@@ -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        
+-------+------------+---------------+-------------+----------------------
+ 39410 |            |             0 |       39410 | pktable_pkey
+ 39406 |            |             0 |       39406 | pktable
+ 39412 |            |             0 |       39412 | fktable
+ 39944 |            |             0 |       39949 | foo
+ 39953 |            |             0 |       39953 | pg_toast_39944_index
+ 39952 |            |             0 |       39952 | pg_toast_39944
+ 40185 |            |             0 |       40185 | pg_toast_40182
+ 40186 |            |             0 |       40186 | pg_toast_40182_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-18 23:17:48.755306672 +0000
+++ /tmp/cirrus-ci-build/build/testrun/regress/regress/results/alter_table.out	2024-11-18 23:22:46.111112305 +0000
@@ -3481,9 +3481,26 @@
 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        
+-------+------------+---------------+-------------+----------------------
+ 39786 |            |             0 |       39786 | pg_toast_39780_index
+ 39780 |            |             0 |       39780 | users
+ 39779 |            |             0 |       39779 | users_id_seq
+ 39785 |            |             0 |       39785 | pg_toast_39780
+ 40143 |            |             0 |       40143 | foo
+ 40482 |            |             0 |       40482 | forc_test
+ 39373 |            |             0 |       39373 | pktable_pkey
+ 39368 |            |             0 |       39368 | pktable
...

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-18 23:17:12
+++ /Users/admin/pgsql/build/testrun/pg_upgrade/002_pg_upgrade/data/results/alter_table.out	2024-11-18 23:19:30
@@ -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        
+-------+------------+---------------+-------------+----------------------
+ 39308 |            |             0 |       39308 | pktable_pkey
+ 39303 |            |             0 |       39303 | pktable
+ 39310 |            |             0 |       39310 | fktable
+ 40016 |            |             0 |       40021 | foo
+ 40025 |            |             0 |       40025 | pg_toast_40016_index
+ 40024 |            |             0 |       40024 | pg_toast_40016
+ 40217 |            |             0 |       40217 | old_oids
+ 40234 |            |             0 |       40234 | pg_toast_40231
...

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-18 23:17:12
+++ /Users/admin/pgsql/build/testrun/recovery/027_stream_regress/data/results/alter_table.out	2024-11-18 23:20:13
@@ -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        
+-------+------------+---------------+-------------+----------------------
+ 39228 |            |             0 |       39228 | pktable_pkey
+ 39224 |            |             0 |       39224 | pktable
+ 39230 |            |             0 |       39230 | fktable
+ 39902 |            |             0 |       39907 | foo
+ 39911 |            |             0 |       39911 | pg_toast_39902_index
+ 39910 |            |             0 |       39910 | pg_toast_39902
+ 40168 |            |             0 |       40168 | old_oids
+ 40186 |            |             0 |       40186 | pg_toast_40183
...

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-18 23:17:12
+++ /Users/admin/pgsql/build/testrun/regress/regress/results/alter_table.out	2024-11-18 23:19:34
@@ -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        
+-------+------------+---------------+-------------+----------------------
+ 38094 |            |             0 |       38094 | pktable_pkey
+ 38090 |            |             0 |       38090 | pktable
+ 38096 |            |             0 |       38096 | fktable
+ 39195 |            |             0 |       39195 | users_id_seq
+ 39207 |            |             0 |       39207 | pg_toast_39200
+ 39208 |            |             0 |       39208 | pg_toast_39200_index
+ 39200 |            |             0 |       39200 | users
+ 39924 |            |             0 |       39924 | foo
...

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-18 23:18:08.126909300 +0000
+++ C:/cirrus/build/testrun/pg_upgrade/002_pg_upgrade/data/results/alter_table.out	2024-11-18 23:22:22.520803900 +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        
+-------+------------+---------------+-------------+----------------------
+ 39128 |            |             0 |       39128 | pktable_pkey
+ 39124 |            |             0 |       39124 | pktable
+ 39131 |            |             0 |       39131 | fktable
+ 39646 |            |             0 |       39654 | foo
+ 39658 |            |             0 |       39658 | pg_toast_39646_index
+ 39657 |            |             0 |       39657 | pg_toast_39646
+ 39912 |            |             0 |       39912 | old_oids
+ 39935 |            |             0 |       39935 | pg_toast_39932
...

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-18 23:18:08.126909300 +0000
+++ C:/cirrus/build/testrun/recovery/027_stream_regress/data/results/alter_table.out	2024-11-18 23:25:02.016539800 +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        
+-------+------------+---------------+-------------+----------------------
+ 39113 |            |             0 |       39113 | pktable_pkey
+ 39108 |            |             0 |       39108 | pktable
+ 39116 |            |             0 |       39116 | fktable
+ 39630 |            |             0 |       39637 | foo
+ 39641 |            |             0 |       39641 | pg_toast_39630_index
+ 39640 |            |             0 |       39640 | pg_toast_39630
+ 39871 |            |             0 |       39871 | old_oids
+ 39891 |            |             0 |       39891 | pg_toast_39888
...

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-18 23:18:08.126909300 +0000
+++ C:/cirrus/build/testrun/regress/regress/results/alter_table.out	2024-11-18 23:22:17.080867200 +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        
+-------+------------+---------------+-------------+----------------------
+ 37558 |            |             0 |       37558 | pktable_pkey
+ 37553 |            |             0 |       37553 | pktable
+ 37560 |            |             0 |       37560 | fktable
+ 38953 |            |             0 |       38968 | foo
+ 38974 |            |             0 |       38974 | pg_toast_38953_index
+ 38973 |            |             0 |       38973 | pg_toast_38953
+ 39120 |            |             0 |       39120 | users_id_seq
+ 39132 |            |             0 |       39132 | pg_toast_39125
...

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-18 21:57:06.616569000 +0000
+++ C:/cirrus/build/testrun/pg_upgrade/002_pg_upgrade/data/results/date.out	2024-11-18 21:59:23.938701100 +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-18 21:57:06.616569000 +0000
+++ C:/cirrus/build/testrun/recovery/027_stream_regress/data/results/date.out	2024-11-18 22:01:50.926177000 +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-18 21:57:06.616569000 +0000
+++ C:/cirrus/build/testrun/regress/regress/results/date.out	2024-11-18 21:59:17.060704700 +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-18 16:41:33.105883255 +0000
+++ /tmp/cirrus-ci-build/build-32/testrun/passwordcheck/regress/results/passwordcheck.out	2024-11-18 16:49:34.793414660 ...
@@ -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-18 16:41:45.615679800 +0000
+++ C:/cirrus/build/testrun/passwordcheck/regress/results/passwordcheck.out	2024-11-18 16:47:35.364544800 +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/contrib/passwordcheck/expected/passwordcheck.out /tmp/cirrus-ci-build/build-32/testrun/pas...
--- /tmp/cirrus-ci-build/contrib/passwordcheck/expected/passwordcheck.out	2024-11-18 16:06:08.004617685 +0000
+++ /tmp/cirrus-ci-build/build-32/testrun/passwordcheck/regress/results/passwordcheck.out	2024-11-18 16:12:20.541659842 ...
@@ -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-18 16:06:25.774178600 +0000
+++ C:/cirrus/build/testrun/passwordcheck/regress/results/passwordcheck.out	2024-11-18 16:12:40.746108100 +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-18 15:48:19.140200000 +0000
+++ /tmp/cirrus-ci-build/build/testrun/plperl/regress/results/plperl_setup.out	2024-11-18 15:50:10.745280000 +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-18 15:48:14.054160434 +0000
+++ /tmp/cirrus-ci-build/src/pl/plperl/results/plperl_setup.out	2024-11-18 15:49:38.424874581 +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-18 15:48:14.143289144 +0000
+++ /tmp/cirrus-ci-build/build/testrun/plperl/regress/results/plperl_setup.out	2024-11-18 15:50:49.106247168 +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-18 15:48:11
+++ /Users/admin/pgsql/build/testrun/plperl/regress/results/plperl_setup.out	2024-11-18 15:50:35
@@ -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-18 15:48:29.313685100 +0000
+++ C:/cirrus/build/testrun/plperl/regress/results/plperl_setup.out	2024-11-18 15:53:26.504201600 +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/sysviews.out /tmp/cirrus-ci-build/build-32/testrun/pg_upgrade/00...
--- /tmp/cirrus-ci-build/src/test/regress/expected/sysviews.out	2024-11-18 15:10:10.210157909 +0000
+++ /tmp/cirrus-ci-build/build-32/testrun/pg_upgrade/002_pg_upgrade/data/results/sysviews.out	2024-11-18 15:19:27.521603...
@@ -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-18 15:10:10.210157909 +0000
+++ /tmp/cirrus-ci-build/build-32/testrun/recovery/027_stream_regress/data/results/sysviews.out	2024-11-18 15:19:04.7936...
@@ -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-18 15:10:10.210157909 +0000
+++ /tmp/cirrus-ci-build/build-32/testrun/regress/regress/results/sysviews.out	2024-11-18 15:18:26.905627306 +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/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-18 04:55:14.721697000 +0000
+++ /tmp/cirrus-ci-build/build/testrun/pg_upgrade/002_pg_upgrade/data/results/partition_join.out	2024-11-18 04:56:59.461...
@@ -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-18 04:55:14.721697000 +0000
+++ /tmp/cirrus-ci-build/build/testrun/recovery/027_stream_regress/data/results/partition_join.out	2024-11-18 04:57:49.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-18 04:55:14.721697000 +0000
+++ /tmp/cirrus-ci-build/build/testrun/regress/regress/results/partition_join.out	2024-11-18 04:56:54.106032000 +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-18 04:55:12.047577419 +0000
+++ /tmp/cirrus-ci-build/src/bin/pg_upgrade/tmp_check/results/partition_join.out	2024-11-18 05:00:08.250146563 +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-18 04:55:12.047577419 +0000
+++ /tmp/cirrus-ci-build/src/test/regress/results/partition_join.out	2024-11-18 04:58:25.034125575 +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-18 04:55:10.674000439 +0000
+++ /tmp/cirrus-ci-build/build/testrun/pg_upgrade/002_pg_upgrade/data/results/partition_join.out	2024-11-18 04:57:37.136...
@@ -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-18 04:55:10.674000439 +0000
+++ /tmp/cirrus-ci-build/build/testrun/recovery/027_stream_regress/data/results/partition_join.out	2024-11-18 04:58:10.9...
@@ -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-18 04:55:10.674000439 +0000
+++ /tmp/cirrus-ci-build/build/testrun/regress/regress/results/partition_join.out	2024-11-18 04:57:30.340419932 +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-18 04:55:09
+++ /Users/admin/pgsql/build/testrun/pg_upgrade/002_pg_upgrade/data/results/partition_join.out	2024-11-18 04:56:55
@@ -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-18 04:55:09
+++ /Users/admin/pgsql/build/testrun/recovery/027_stream_regress/data/results/partition_join.out	2024-11-18 04:57:52
@@ -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-18 04:55:09
+++ /Users/admin/pgsql/build/testrun/regress/regress/results/partition_join.out	2024-11-18 04:56:57
@@ -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-18 04:55:31.659173100 +0000
+++ C:/cirrus/build/testrun/pg_upgrade/002_pg_upgrade/data/results/partition_join.out	2024-11-18 04:59:17.775613100 +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-18 04:55:31.659173100 +0000
+++ C:/cirrus/build/testrun/recovery/027_stream_regress/data/results/partition_join.out	2024-11-18 05:01:40.019255100 +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-18 04:55:31.659173100 +0000
+++ C:/cirrus/build/testrun/regress/regress/results/partition_join.out	2024-11-18 04:59:10.915264400 +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-18 02:44:49.202510148 +0000
+++ /tmp/cirrus-ci-build/build-32/testrun/citext/regress/results/citext.out	2024-11-18 02:53:13.472383783 +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-18 02:44:51.071332281 +0000
+++ /tmp/cirrus-ci-build/build-32/testrun/recovery/027_stream_regress/data/results/strings.out	2024-11-18 02:52:49.40843...
@@ -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-18 02:44:51.071332281 +0000
+++ /tmp/cirrus-ci-build/build-32/testrun/regress/regress/results/strings.out	2024-11-18 02:52:11.072498057 +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-18 02:44:50.939780149 +0000
+++ /tmp/cirrus-ci-build/build-32/testrun/test_regex/regress/results/test_regex.out	2024-11-18 02:53:31.576345243 +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-18 02:24:58.492013000 +0000
+++ /tmp/cirrus-ci-build/build/testrun/regress-running/regress/results/privs_in_db.out	2024-11-18 02:30:44.898062000 +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-18 00:35:15....
+++ /tmp/cirrus-ci-build/build/testrun/injection_points/isolation/results/reindex_concurrently_upsert.out	2024-11-18 00:...
@@ -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 /Users/admin/pgsql/src/test/modules/injection_points/expected/reindex_concurrently_upsert_partitioned.out /User...
--- /Users/admin/pgsql/src/test/modules/injection_points/expected/reindex_concurrently_upsert_partitioned.out	2024-11-18...
+++ /Users/admin/pgsql/build/testrun/injection_points/isolation/results/reindex_concurrently_upsert_partitioned.out	2024...
@@ -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/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-17 17:30:02.368017000 +0000
+++ /tmp/cirrus-ci-build/build/testrun/pg_stat_statements/regress/results/level_tracking.out	2024-11-17 17:32:41.6297110...
@@ -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-17 17:28:48.513409245 +0000
+++ /tmp/cirrus-ci-build/contrib/pg_stat_statements/results/level_tracking.out	2024-11-17 17:33:59.971360894 +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-17 17:28:50.849274755 +0000
+++ /tmp/cirrus-ci-build/build/testrun/pg_stat_statements/regress/results/level_tracking.out	2024-11-17 17:34:08.4781679...
@@ -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-17 17:28:10
+++ /Users/admin/pgsql/build/testrun/pg_stat_statements/regress/results/level_tracking.out	2024-11-17 17:31:27
@@ -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-17 17:29:46.702969800 +0000
+++ C:/cirrus/build/testrun/pg_stat_statements/regress/results/level_tracking.out	2024-11-17 17:36:05.483722100 +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/subselect.out /tmp/cirrus-ci-build/build/testrun/pg_upgrade/002_...
--- /tmp/cirrus-ci-build/src/test/regress/expected/subselect.out	2024-11-17 11:26:52.560283000 +0000
+++ /tmp/cirrus-ci-build/build/testrun/pg_upgrade/002_pg_upgrade/data/results/subselect.out	2024-11-17 11:28:53.52073700...
@@ -1029,7 +1029,7 @@
    ->  Seq Scan on tenk1 t
          Filter: ((ANY (unique2 = (hashed SubPlan 2).col1)) OR (ten < 0))
          SubPlan 2
-           ->  Index Only Scan using tenk1_unique1 on tenk1 k
+           ->  Index Only Scan using idx_int4 on tenk1 k
 (5 rows)
 
 select count(*) from tenk1 t
@@ -1403,7 +1403,7 @@
    ->  Seq Scan on public.tenk1 b
          Output: b.unique1, b.unique2, b.two, b.four, b.ten, b.twenty, b.hundred, b.thousand, b.twothousand, b.fivethou...
    SubPlan 1
-     ->  Index Only Scan using tenk1_unique1 on public.tenk1 a
+     ->  Index Only Scan using idx_int4 on public.tenk1 a
            Output: a.unique1
 (10 rows)
...

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/subselect.out /tmp/cirrus-ci-build/build/testrun/pg_upgrade/002_...
--- /tmp/cirrus-ci-build/src/test/regress/expected/subselect.out	2024-11-17 11:26:52.881456665 +0000
+++ /tmp/cirrus-ci-build/build/testrun/pg_upgrade/002_pg_upgrade/data/results/subselect.out	2024-11-17 11:31:41.79806432...
@@ -1403,7 +1403,7 @@
    ->  Seq Scan on public.tenk1 b
          Output: b.unique1, b.unique2, b.two, b.four, b.ten, b.twenty, b.hundred, b.thousand, b.twothousand, b.fivethou...
    SubPlan 1
-     ->  Index Only Scan using tenk1_unique1 on public.tenk1 a
+     ->  Index Only Scan using idx_int4 on public.tenk1 a
            Output: a.unique1
 (10 rows)
 
diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/join.out /tmp/cirrus-ci-build/build/testrun/pg_upgrade/002_pg_up...
--- /tmp/cirrus-ci-build/src/test/regress/expected/join.out	2024-11-17 11:26:52.833552993 +0000
+++ /tmp/cirrus-ci-build/build/testrun/pg_upgrade/002_pg_upgrade/data/results/join.out	2024-11-17 11:31:44.186058983 +00...
@@ -6540,7 +6540,7 @@
  Aggregate
    ->  Nested Loop
          ->  Nested Loop
-               ->  Index Only Scan using tenk1_unique1 on tenk1 a
...

diff --strip-trailing-cr -U3 C:/cirrus/src/test/regress/expected/union.out C:/cirrus/build/testrun/pg_upgrade/002_pg_upg...
--- C:/cirrus/src/test/regress/expected/union.out	2024-11-17 11:27:08.065306400 +0000
+++ C:/cirrus/build/testrun/pg_upgrade/002_pg_upgrade/data/results/union.out	2024-11-17 11:29:38.782288300 +0000
@@ -1480,13 +1480,7 @@
 left join lateral
   (select t1.tenthous from tenk2 t2 union all (values(1)))
 on true limit 1;
-                            QUERY PLAN                             
--------------------------------------------------------------------
- Limit
-   ->  Nested Loop Left Join
-         ->  Seq Scan on tenk1 t1
-         ->  Append
-               ->  Index Only Scan using tenk2_hundred on tenk2 t2
-               ->  Result
-(6 rows)
-
+ERROR:  deadlock detected
+DETAIL:  Process 6304 waits for AccessShareLock on relation 24788 of database 16387; blocked by process 6100.
+Process 6100 waits for AccessExclusiveLock on relation 16421 of database 16387; blocked by process 6304.
...

diff --strip-trailing-cr -U3 C:/cirrus/src/test/regress/expected/portals.out C:/cirrus/build/testrun/recovery/027_stream...
--- C:/cirrus/src/test/regress/expected/portals.out	2024-11-17 11:27:07.984741000 +0000
+++ C:/cirrus/build/testrun/recovery/027_stream_regress/data/results/portals.out	2024-11-17 11:31:54.064193300 +0000
@@ -9,691 +9,163 @@
 DECLARE foo5 SCROLL CURSOR FOR SELECT * FROM tenk1 ORDER BY unique2;
 DECLARE foo6 SCROLL CURSOR FOR SELECT * FROM tenk2;
 DECLARE foo7 SCROLL CURSOR FOR SELECT * FROM tenk1 ORDER BY unique2;
+ERROR:  deadlock detected
+DETAIL:  Process 3168 waits for AccessShareLock on relation 25153 of database 16384; blocked by process 7260.
+Process 7260 waits for AccessExclusiveLock on relation 16418 of database 16384; blocked by process 3168.
+HINT:  See server log for query details.
 DECLARE foo8 SCROLL CURSOR FOR SELECT * FROM tenk2;
+ERROR:  current transaction is aborted, commands ignored until end of transaction block
 DECLARE foo9 SCROLL CURSOR FOR SELECT * FROM tenk1 ORDER BY unique2;
+ERROR:  current transaction is aborted, commands ignored until end of transaction block
 DECLARE foo10 SCROLL CURSOR FOR SELECT * FROM tenk2;
+ERROR:  current transaction is aborted, commands ignored until end of transaction block
 DECLARE foo11 SCROLL CURSOR FOR SELECT * FROM tenk1 ORDER BY unique2;
+ERROR:  current transaction is aborted, commands ignored until end of transaction block
 DECLARE foo12 SCROLL CURSOR FOR SELECT * FROM tenk2;
...

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-17 11:05:50.944985000 +0000
+++ /tmp/cirrus-ci-build/build/testrun/pg_upgrade/002_pg_upgrade/data/results/privileges.out	2024-11-17 11:07:56.7890950...
@@ -1842,1417 +1842,10 @@
 -- Do the same concurrently
 CREATE INDEX CONCURRENTLY sro_idx ON sro_tab ((sro_ifun(a) + sro_ifun(0)))
 	WHERE sro_ifun(a + 10) > sro_ifun(10);
--- REINDEX
-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 
...

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/privileges.out /tmp/cirrus-ci-build/build/testrun/recovery/027_s...
--- /tmp/cirrus-ci-build/src/test/regress/expected/privileges.out	2024-11-17 11:05:50.944985000 +0000
+++ /tmp/cirrus-ci-build/build/testrun/recovery/027_stream_regress/data/results/privileges.out	2024-11-17 11:08:33.94754...
@@ -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 -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-17 11:05:50.888109000 +0000
+++ /tmp/cirrus-ci-build/build/testrun/regress/regress/results/brin.out	2024-11-17 11:07:56.008534000 +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-17 11:05:50.944985000 +0000
+++ /tmp/cirrus-ci-build/build/testrun/regress/regress/results/privileges.out	2024-11-17 11:07:56.007652000 +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-17 11:05:50.674187779 +0000
+++ /tmp/cirrus-ci-build/src/bin/pg_upgrade/tmp_check/results/brin.out	2024-11-17 11:12:22.604975771 +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/recovery/tmp_check/result...
--- /tmp/cirrus-ci-build/src/test/regress/expected/brin.out	2024-11-17 11:05:50.674187779 +0000
+++ /tmp/cirrus-ci-build/src/test/recovery/tmp_check/results/brin.out	2024-11-17 11:13:32.800919062 +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-17 11:05:50.674187779 +0000
+++ /tmp/cirrus-ci-build/src/test/regress/results/brin.out	2024-11-17 11:10:12.781123640 +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/src/test/regress/results/pri...
--- /tmp/cirrus-ci-build/src/test/regress/expected/privileges.out	2024-11-17 11:05:50.746187782 +0000
+++ /tmp/cirrus-ci-build/src/test/regress/results/privileges.out	2024-11-17 11:10:12.701123776 +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/build/testrun/pg_upgrade/002_pg_up...
--- /tmp/cirrus-ci-build/src/test/regress/expected/brin.out	2024-11-17 11:05:49.986685428 +0000
+++ /tmp/cirrus-ci-build/build/testrun/pg_upgrade/002_pg_upgrade/data/results/brin.out	2024-11-17 11:10:44.013392492 +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-17 11:05:49.986685428 +0000
+++ /tmp/cirrus-ci-build/build/testrun/recovery/027_stream_regress/data/results/brin.out	2024-11-17 11:11:16.965373095 +...
@@ -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-17 11:05:49.986685428 +0000
+++ /tmp/cirrus-ci-build/build/testrun/regress/regress/results/brin.out	2024-11-17 11:10:39.333395506 +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-17 11:05:08
+++ /Users/admin/pgsql/build/testrun/pg_upgrade/002_pg_upgrade/data/results/brin.out	2024-11-17 11:07:58
@@ -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-17 11:05:08
+++ /Users/admin/pgsql/build/testrun/recovery/027_stream_regress/data/results/brin.out	2024-11-17 11:08:32
@@ -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/regress/regress/results/...
--- /Users/admin/pgsql/src/test/regress/expected/brin.out	2024-11-17 11:05:08
+++ /Users/admin/pgsql/build/testrun/regress/regress/results/brin.out	2024-11-17 11:07:58
@@ -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/pg_upgrade/002_pg_upgr...
--- C:/cirrus/src/test/regress/expected/brin.out	2024-11-17 11:06:05.377822600 +0000
+++ C:/cirrus/build/testrun/pg_upgrade/002_pg_upgrade/data/results/brin.out	2024-11-17 11:08:46.222698200 +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-17 11:06:05.377822600 +0000
+++ C:/cirrus/build/testrun/recovery/027_stream_regress/data/results/brin.out	2024-11-17 11:10:28.476236800 +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-17 11:06:05.377822600 +0000
+++ C:/cirrus/build/testrun/regress/regress/results/brin.out	2024-11-17 11:08:44.252963900 +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 --strip-trailing-cr -U3 C:/cirrus/src/test/regress/expected/privileges.out C:/cirrus/build/testrun/regress/regress/...
--- C:/cirrus/src/test/regress/expected/privileges.out	2024-11-17 11:06:05.527257100 +0000
+++ C:/cirrus/build/testrun/regress/regress/results/privileges.out	2024-11-17 11:08:44.252963900 +0000
@@ -1842,1417 +1842,10 @@
 -- Do the same concurrently
...

diff --strip-trailing-cr -U3 C:/cirrus/src/test/regress/expected/subselect.out C:/cirrus/build/testrun/pg_upgrade/002_pg...
--- C:/cirrus/src/test/regress/expected/subselect.out	2024-11-17 03:25:36.824414800 +0000
+++ C:/cirrus/build/testrun/pg_upgrade/002_pg_upgrade/data/results/subselect.out	2024-11-17 03:28:12.734818600 +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/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-16 20:03:03.824171000 +0000
+++ /tmp/cirrus-ci-build/build/testrun/pg_upgrade/002_pg_upgrade/data/results/xml.out	2024-11-16 20:05:07.561139000 +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-16 20:03:03.824171000 +0000
+++ /tmp/cirrus-ci-build/build/testrun/recovery/027_stream_regress/data/results/xml.out	2024-11-16 20:05:54.586050000 +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-16 20:03:03.824171000 +0000
+++ /tmp/cirrus-ci-build/build/testrun/regress/regress/results/xml.out	2024-11-16 20:05:02.747792000 +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-16 20:03:00.729751679 +0000
+++ /tmp/cirrus-ci-build/src/bin/pg_upgrade/tmp_check/results/xml.out	2024-11-16 20:10:36.887179661 +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/recovery/tmp_check/results...
--- /tmp/cirrus-ci-build/src/test/regress/expected/xml.out	2024-11-16 20:03:00.729751679 +0000
+++ /tmp/cirrus-ci-build/src/test/recovery/tmp_check/results/xml.out	2024-11-16 20:12:10.682599484 +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-16 20:03:00.729751679 +0000
+++ /tmp/cirrus-ci-build/src/test/regress/results/xml.out	2024-11-16 20:08:13.218457171 +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-16 20:03:00.714836917 +0000
+++ /tmp/cirrus-ci-build/build/testrun/pg_upgrade/002_pg_upgrade/data/results/xml.out	2024-11-16 20:07:56.772061648 +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-16 20:03:00.714836917 +0000
+++ /tmp/cirrus-ci-build/build/testrun/recovery/027_stream_regress/data/results/xml.out	2024-11-16 20:08:38.160142448 +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-16 20:03:00.714836917 +0000
+++ /tmp/cirrus-ci-build/build/testrun/regress/regress/results/xml.out	2024-11-16 20:07:50.300059515 +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-16 20:02:12
+++ /Users/admin/pgsql/build/testrun/pg_upgrade/002_pg_upgrade/data/results/xml.out	2024-11-16 20:04:26
@@ -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-16 20:02:12
+++ /Users/admin/pgsql/build/testrun/recovery/027_stream_regress/data/results/xml.out	2024-11-16 20:05:05
@@ -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-16 20:02:12
+++ /Users/admin/pgsql/build/testrun/regress/regress/results/xml.out	2024-11-16 20:04:26
@@ -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-16 17:14:34.950080000 +0000
+++ /tmp/cirrus-ci-build/build/testrun/pg_upgrade/002_pg_upgrade/data/results/indexing.out	2024-11-16 17:16:48.213389000...
@@ -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-16 17:14:34.950080000 +0000
+++ /tmp/cirrus-ci-build/build/testrun/recovery/027_stream_regress/data/results/indexing.out	2024-11-16 17:17:37.1652020...
@@ -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-16 17:14:34.950080000 +0000
+++ /tmp/cirrus-ci-build/build/testrun/regress/regress/results/indexing.out	2024-11-16 17:16:51.442435000 +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-16 17:14:27.754423356 +0000
+++ /tmp/cirrus-ci-build/src/bin/pg_upgrade/tmp_check/results/indexing.out	2024-11-16 17:21:01.189557213 +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-16 17:14:27.581756599 +0000
+++ /tmp/cirrus-ci-build/src/test/isolation/output_iso/results/partitioned-cic.out	2024-11-16 17:42:19.218025238 +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-16 17:14:27.754423356 +0000
+++ /tmp/cirrus-ci-build/src/test/recovery/tmp_check/results/indexing.out	2024-11-16 17:22:14.379074418 +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-16 17:14:27.754423356 +0000
+++ /tmp/cirrus-ci-build/src/test/regress/results/indexing.out	2024-11-16 17:18:27.620225079 +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-16 17:14:26.910970259 +0000
+++ /tmp/cirrus-ci-build/build/testrun/pg_upgrade/002_pg_upgrade/data/results/indexing.out	2024-11-16 17:18:07.018488773...
@@ -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-16 17:14:26.910970259 +0000
+++ /tmp/cirrus-ci-build/build/testrun/recovery/027_stream_regress/data/results/indexing.out	2024-11-16 17:18:36.9584506...
@@ -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-16 17:14:26.910970259 +0000
+++ /tmp/cirrus-ci-build/build/testrun/regress/regress/results/indexing.out	2024-11-16 17:18:03.094494783 +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-16 17:14:12
+++ /Users/admin/pgsql/build/testrun/pg_upgrade/002_pg_upgrade/data/results/indexing.out	2024-11-16 17:16:10
@@ -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-16 17:14:12
+++ /Users/admin/pgsql/build/testrun/recovery/027_stream_regress/data/results/indexing.out	2024-11-16 17:16:55
@@ -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-16 17:14:12
+++ /Users/admin/pgsql/build/testrun/regress/regress/results/indexing.out	2024-11-16 17:16:15
@@ -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-16 17:14:48.021163700 +0000
+++ C:/cirrus/build/testrun/pg_upgrade/002_pg_upgrade/data/results/indexing.out	2024-11-16 17:19:10.130384600 +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-16 17:14:48.021163700 +0000
+++ C:/cirrus/build/testrun/recovery/027_stream_regress/data/results/indexing.out	2024-11-16 17:21:15.282242300 +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-16 17:14:48.021163700 +0000
+++ C:/cirrus/build/testrun/regress/regress/results/indexing.out	2024-11-16 17:18:54.026372900 +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-16 15:04:11.149931543 +0000
+++ /tmp/cirrus-ci-build/build-32/testrun/pg_upgrade/002_pg_upgrade/data/results/jsonb_jsonpath.out	2024-11-16 15:09:58....
@@ -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-16 15:04:11.149931543 +0000
+++ /tmp/cirrus-ci-build/build-32/testrun/recovery/027_stream_regress/data/results/jsonb_jsonpath.out	2024-11-16 15:10:3...
@@ -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-16 15:04:11.149931543 +0000
+++ /tmp/cirrus-ci-build/build-32/testrun/regress/regress/results/jsonb_jsonpath.out	2024-11-16 15:09:53.757187957 +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-16 12:49:42.175605000 +0000
+++ /tmp/cirrus-ci-build/build/testrun/btree_gist/regress/results/partitions.out	2024-11-16 12:52:28.920949000 +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-16 12:49:42.178191000 +0000
+++ /tmp/cirrus-ci-build/build/testrun/btree_gist/regress/results/without_overlaps.out	2024-11-16 12:52:29.175970000 +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-16 12:49:41.393128433 +0000
+++ /tmp/cirrus-ci-build/build/testrun/btree_gist/regress/results/partitions.out	2024-11-16 12:55:11.220074664 +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-16 12:49:41.393128433 +0000
+++ /tmp/cirrus-ci-build/build/testrun/btree_gist/regress/results/without_overlaps.out	2024-11-16 12:55:11.428073696 +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-16 12:49:10
+++ /Users/admin/pgsql/build/testrun/btree_gist/regress/results/partitions.out	2024-11-16 12:52:09
@@ -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-16 12:49:10
+++ /Users/admin/pgsql/build/testrun/btree_gist/regress/results/without_overlaps.out	2024-11-16 12:52:09
@@ -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-16 12:49:50.375458400 +0000
+++ C:/cirrus/build/testrun/btree_gist/regress/results/partitions.out	2024-11-16 12:56:02.220381800 +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-16 12:49:50.397500800 +0000
+++ C:/cirrus/build/testrun/btree_gist/regress/results/without_overlaps.out	2024-11-16 12:56:03.548506400 +0000
@@ -9,7 +9,6 @@
   CONSTRAINT temporal_rng_pk PRIMARY KEY (id, valid_at WITHOUT OVERLAPS)
 );
...

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-16 10:14:15.607123000 +0000
+++ /tmp/cirrus-ci-build/build/testrun/pg_upgrade/002_pg_upgrade/data/results/copy2.out	2024-11-16 10:15:47.775070000 +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-16 10:14:15.607123000 +0000
+++ /tmp/cirrus-ci-build/build/testrun/recovery/027_stream_regress/data/results/copy2.out	2024-11-16 10:16:34.313031000 ...
@@ -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-16 10:14:15.607123000 +0000
+++ /tmp/cirrus-ci-build/build/testrun/regress/regress/results/copy2.out	2024-11-16 10:15:44.300141000 +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/bin/pg_upgrade/tmp_check/resu...
--- /tmp/cirrus-ci-build/src/test/regress/expected/copy2.out	2024-11-16 10:14:13.325591870 +0000
+++ /tmp/cirrus-ci-build/src/bin/pg_upgrade/tmp_check/results/copy2.out	2024-11-16 10:18:53.246971167 +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-16 10:14:13.325591870 +0000
+++ /tmp/cirrus-ci-build/src/test/regress/results/copy2.out	2024-11-16 10:17:18.739175070 +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/build/testrun/pg_upgrade/002_pg_u...
--- /tmp/cirrus-ci-build/src/test/regress/expected/copy2.out	2024-11-16 10:14:13.155237773 +0000
+++ /tmp/cirrus-ci-build/build/testrun/pg_upgrade/002_pg_upgrade/data/results/copy2.out	2024-11-16 10:16:30.801941044 +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-16 10:14:13.155237773 +0000
+++ /tmp/cirrus-ci-build/build/testrun/recovery/027_stream_regress/data/results/copy2.out	2024-11-16 10:17:09.094777876 ...
@@ -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-16 10:14:13.155237773 +0000
+++ /tmp/cirrus-ci-build/build/testrun/regress/regress/results/copy2.out	2024-11-16 10:16:26.221877967 +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/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-16 10:14:12
+++ /Users/admin/pgsql/build/testrun/pg_upgrade/002_pg_upgrade/data/results/copy2.out	2024-11-16 10:15:56
@@ -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-16 10:14:12
+++ /Users/admin/pgsql/build/testrun/recovery/027_stream_regress/data/results/copy2.out	2024-11-16 10:16:44
@@ -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-16 10:14:12
+++ /Users/admin/pgsql/build/testrun/regress/regress/results/copy2.out	2024-11-16 10:15:58
@@ -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/pg_upgrade/002_pg_upg...
--- C:/cirrus/src/test/regress/expected/copy2.out	2024-11-16 10:14:28.345751600 +0000
+++ C:/cirrus/build/testrun/pg_upgrade/002_pg_upgrade/data/results/copy2.out	2024-11-16 10:17:54.619982900 +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-16 10:14:28.345751600 +0000
+++ C:/cirrus/build/testrun/recovery/027_stream_regress/data/results/copy2.out	2024-11-16 10:20:00.205472000 +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-16 10:14:28.345751600 +0000
+++ C:/cirrus/build/testrun/regress/regress/results/copy2.out	2024-11-16 10:17:47.713720500 +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/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-16 07:25:12.42939800...
+++ /tmp/cirrus-ci-build/build/testrun/isolation/isolation/results/vacuum-extending-in-repetable-read.out	2024-11-16 07:...
@@ -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-16 07:25:11.25095489...
+++ /tmp/cirrus-ci-build/src/test/isolation/output_iso/results/vacuum-extending-in-repetable-read.out	2024-11-16 07:30:4...
@@ -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/vacuum_index_statistics.out /tmp/cirrus-ci-build/src/test/regres...
--- /tmp/cirrus-ci-build/src/test/regress/expected/vacuum_index_statistics.out	2024-11-16 07:25:11.478728478 +0000
+++ /tmp/cirrus-ci-build/src/test/regress/results/vacuum_index_statistics.out	2024-11-16 07:31:14.819225189 +0000
@@ -120,7 +120,7 @@
 WHERE vt.relname = 'vestat_pkey' AND vt.relid = c.oid;
    relname   | relpages | pages_deleted | tuples_deleted 
 -------------+----------+---------------+----------------
- vestat_pkey | t        | t             | t
+ vestat_pkey | f        | t             | t
 (1 row)
 
 SELECT vt.relname,relpages AS irp,pages_deleted AS ipd,tuples_deleted AS itd

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-16 07:25:10.20395925...
+++ /tmp/cirrus-ci-build/build/testrun/isolation/isolation/results/vacuum-extending-in-repetable-read.out	2024-11-16 07:...
@@ -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-16 07:25:11
+++ /Users/admin/pgsql/build/testrun/isolation/isolation/results/vacuum-extending-in-repetable-read.out	2024-11-16 07:28...
@@ -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-16 07:25:24.326101300 +0000
+++ C:/cirrus/build/testrun/isolation/isolation/results/vacuum-extending-in-repetable-read.out	2024-11-16 07:29:41.02155...
@@ -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-16 00:07:02.406664000 +0000
+++ /tmp/cirrus-ci-build/build/testrun/pg_upgrade/002_pg_upgrade/data/results/alter_table.out	2024-11-16 00:09:11.153290...
@@ -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        
+-------+------------+---------------+-------------+----------------------
+ 39448 |            |             0 |       39448 | pktable_pkey
+ 39443 |            |             0 |       39443 | pktable
+ 39455 |            |             0 |       39455 | fktable
+ 40041 |            |             0 |       40046 | foo
+ 40050 |            |             0 |       40050 | pg_toast_40041_index
+ 40049 |            |             0 |       40049 | pg_toast_40041
+ 40245 |            |             0 |       40245 | old_oids
+ 40265 |            |             0 |       40265 | pg_toast_40262
...

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-16 00:07:02.406664000 +0000
+++ /tmp/cirrus-ci-build/build/testrun/recovery/027_stream_regress/data/results/alter_table.out	2024-11-16 00:10:03.3309...
@@ -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        
+-------+------------+---------------+-------------+----------------------
+ 39516 |            |             0 |       39516 | pktable_pkey
+ 39512 |            |             0 |       39512 | pktable
+ 39518 |            |             0 |       39518 | fktable
+ 40065 |            |             0 |       40065 | pg_toast_40056_index
+ 40064 |            |             0 |       40064 | pg_toast_40056
+ 40056 |            |             0 |       40061 | foo
+ 40260 |            |             0 |       40260 | old_oids
+ 40278 |            |             0 |       40278 | pg_toast_40275
...

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-16 00:07:02.406664000 +0000
+++ /tmp/cirrus-ci-build/build/testrun/regress/regress/results/alter_table.out	2024-11-16 00:09:14.496613000 +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        
+-------+------------+---------------+-------------+----------------------
+ 39558 |            |             0 |       39558 | pktable_pkey
+ 39554 |            |             0 |       39554 | pktable
+ 39560 |            |             0 |       39560 | fktable
+ 40045 |            |             0 |       40050 | foo
+ 40054 |            |             0 |       40054 | pg_toast_40045_index
+ 40053 |            |             0 |       40053 | pg_toast_40045
+ 40316 |            |             0 |       40316 | old_oids
+ 40333 |            |             0 |       40333 | pg_toast_40330
...

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-16 00:07:04.021158405 +0000
+++ /tmp/cirrus-ci-build/src/bin/pg_upgrade/tmp_check/results/alter_table.out	2024-11-16 00:15:06.212545781 +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        
+-------+------------+---------------+-------------+----------------------
+ 39579 |            |             0 |       39579 | pktable_pkey
+ 39575 |            |             0 |       39575 | pktable
+ 39586 |            |             0 |       39586 | fktable
+ 40133 |            |             0 |       40138 | foo
+ 40142 |            |             0 |       40142 | pg_toast_40133_index
+ 40141 |            |             0 |       40141 | pg_toast_40133
+ 40346 |            |             0 |       40346 | old_oids
+ 40365 |            |             0 |       40365 | pg_toast_40362
...

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-16 00:07:04.021158405 +0000
+++ /tmp/cirrus-ci-build/src/test/recovery/tmp_check/results/alter_table.out	2024-11-16 00:16:30.492384910 +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        
+-------+------------+---------------+-------------+----------------------
+ 39527 |            |             0 |       39527 | pktable_pkey
+ 39522 |            |             0 |       39522 | pktable
+ 39529 |            |             0 |       39529 | fktable
+ 40041 |            |             0 |       40046 | foo
+ 40050 |            |             0 |       40050 | pg_toast_40041_index
+ 40049 |            |             0 |       40049 | pg_toast_40041
+ 40266 |            |             0 |       40266 | old_oids
+ 40290 |            |             0 |       40290 | pg_toast_40286
...

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-16 00:07:04.021158405 +0000
+++ /tmp/cirrus-ci-build/src/test/regress/results/alter_table.out	2024-11-16 00:12:35.580703124 +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        
+-------+------------+---------------+-------------+----------------------
+ 39620 |            |             0 |       39620 | pktable_pkey
+ 39614 |            |             0 |       39614 | pktable
+ 39623 |            |             0 |       39623 | fktable
+ 40130 |            |             0 |       40135 | foo
+ 40139 |            |             0 |       40139 | pg_toast_40130_index
+ 40138 |            |             0 |       40138 | pg_toast_40130
+ 40353 |            |             0 |       40353 | old_oids
+ 40371 |            |             0 |       40371 | pg_toast_40368
...

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-16 00:07:02.886905373 +0000
+++ /tmp/cirrus-ci-build/build/testrun/pg_upgrade/002_pg_upgrade/data/results/alter_table.out	2024-11-16 00:12:41.290936...
@@ -3481,9 +3481,26 @@
 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        
+-------+------------+---------------+-------------+----------------------
+ 39779 |            |             0 |       39779 | users_id_seq
+ 39785 |            |             0 |       39785 | pg_toast_39780
+ 39786 |            |             0 |       39786 | pg_toast_39780_index
+ 39780 |            |             0 |       39780 | users
+ 40046 |            |             0 |       40046 | foo
+ 40255 |            |             0 |       40255 | forc_test
+ 39306 |            |             0 |       39306 | pktable_pkey
+ 39302 |            |             0 |       39302 | pktable
...

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-16 00:07:02.886905373 +0000
+++ /tmp/cirrus-ci-build/build/testrun/recovery/027_stream_regress/data/results/alter_table.out	2024-11-16 00:13:20.9868...
@@ -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        
+-------+------------+---------------+-------------+----------------------
+ 39543 |            |             0 |       39543 | users_id_seq
+ 39549 |            |             0 |       39549 | pg_toast_39544
+ 39550 |            |             0 |       39550 | pg_toast_39544_index
+ 39544 |            |             0 |       39544 | users
+ 39829 |            |             0 |       39829 | foo
+ 40097 |            |             0 |       40097 | forc_test
+ 40563 |            |             0 |       40563 | pg_toast_40560
+ 40564 |            |             0 |       40564 | pg_toast_40560_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-16 00:07:02.886905373 +0000
+++ /tmp/cirrus-ci-build/build/testrun/regress/regress/results/alter_table.out	2024-11-16 00:12:29.814951855 +0000
@@ -3481,9 +3481,26 @@
 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        
+-------+------------+---------------+-------------+----------------------
+ 39652 |            |             0 |       39652 | users_id_seq
+ 39658 |            |             0 |       39658 | pg_toast_39653
+ 39659 |            |             0 |       39659 | pg_toast_39653_index
+ 39653 |            |             0 |       39653 | users
+ 40010 |            |             0 |       40010 | foo
+ 40497 |            |             0 |       40497 | forc_test
+ 39468 |            |             0 |       39468 | pktable_pkey
+ 39464 |            |             0 |       39464 | pktable
...

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-16 00:06:12
+++ /Users/admin/pgsql/build/testrun/pg_upgrade/002_pg_upgrade/data/results/alter_table.out	2024-11-16 00:08:32
@@ -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        
+-------+------------+---------------+-------------+----------------------
+ 39147 |            |             0 |       39147 | pktable_pkey
+ 39140 |            |             0 |       39140 | pktable
+ 39152 |            |             0 |       39152 | fktable
+ 40011 |            |             0 |       40016 | foo
+ 40020 |            |             0 |       40020 | pg_toast_40011_index
+ 40019 |            |             0 |       40019 | pg_toast_40011
+ 40217 |            |             0 |       40217 | old_oids
+ 40234 |            |             0 |       40234 | pg_toast_40231
...

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-16 00:06:12
+++ /Users/admin/pgsql/build/testrun/recovery/027_stream_regress/data/results/alter_table.out	2024-11-16 00:09:10
@@ -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        
+-------+------------+---------------+-------------+----------------------
+ 39448 |            |             0 |       39448 | pktable_pkey
+ 39442 |            |             0 |       39442 | pktable
+ 39450 |            |             0 |       39450 | fktable
+ 39961 |            |             0 |       39968 | foo
+ 39972 |            |             0 |       39972 | pg_toast_39961_index
+ 39971 |            |             0 |       39971 | pg_toast_39961
+ 40259 |            |             0 |       40259 | pg_toast_40256
+ 40260 |            |             0 |       40260 | pg_toast_40256_index
...

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-16 00:06:12
+++ /Users/admin/pgsql/build/testrun/regress/regress/results/alter_table.out	2024-11-16 00:08:33
@@ -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        
+-------+------------+---------------+-------------+----------------------
+ 39179 |            |             0 |       39179 | pktable_pkey
+ 39174 |            |             0 |       39174 | pktable
+ 39181 |            |             0 |       39181 | fktable
+ 40005 |            |             0 |       40010 | foo
+ 40014 |            |             0 |       40014 | pg_toast_40005_index
+ 40013 |            |             0 |       40013 | pg_toast_40005
+ 40228 |            |             0 |       40228 | old_oids
+ 40245 |            |             0 |       40245 | pg_toast_40242
...

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-16 00:07:16.044827000 +0000
+++ C:/cirrus/build/testrun/pg_upgrade/002_pg_upgrade/data/results/alter_table.out	2024-11-16 00:11:08.842284500 +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        
+-------+------------+---------------+-------------+----------------------
+ 39941 |            |             0 |       39941 | pg_toast_39937_index
+ 39937 |            |             0 |       39937 | recur2
+ 39932 |            |             0 |       39932 | recur1
+ 39923 |            |             0 |       39923 | old_oids
+ 39940 |            |             0 |       39940 | pg_toast_39937
+ 39188 |            |             0 |       39188 | pktable_pkey
+ 39184 |            |             0 |       39184 | pktable
+ 39190 |            |             0 |       39190 | fktable
...

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-16 00:07:16.044827000 +0000
+++ C:/cirrus/build/testrun/recovery/027_stream_regress/data/results/alter_table.out	2024-11-16 00:13:44.611374600 +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        
+-------+------------+---------------+-------------+----------------------
+ 39435 |            |             0 |       39435 | users_id_seq
+ 39450 |            |             0 |       39450 | pg_toast_39439
+ 39451 |            |             0 |       39451 | pg_toast_39439_index
+ 39439 |            |             0 |       39439 | users
+ 39634 |            |             0 |       39634 | foo
+ 39792 |            |             0 |       39792 | forc_test
+ 38451 |            |             0 |       38451 | pktable_pkey
+ 38447 |            |             0 |       38447 | pktable
...

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-16 00:07:16.044827000 +0000
+++ C:/cirrus/build/testrun/regress/regress/results/alter_table.out	2024-11-16 00:11:01.669431800 +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        
+-------+------------+---------------+-------------+----------------------
+ 38408 |            |             0 |       38408 | pktable_pkey
+ 38400 |            |             0 |       38400 | pktable
+ 38412 |            |             0 |       38412 | fktable
+ 39627 |            |             0 |       39638 | foo
+ 39643 |            |             0 |       39643 | pg_toast_39627_index
+ 39641 |            |             0 |       39641 | pg_toast_39627
+ 39924 |            |             0 |       39924 | old_oids
+ 39947 |            |             0 |       39947 | pg_toast_39941
...

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-15 23:07:12.611769500 +0000
+++ C:/cirrus/build/testrun/pg_upgrade/002_pg_upgrade/data/results/date.out	2024-11-15 23:09:23.519143500 +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-15 23:07:12.611769500 +0000
+++ C:/cirrus/build/testrun/recovery/027_stream_regress/data/results/date.out	2024-11-15 23:11:45.996677700 +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-15 23:07:12.611769500 +0000
+++ C:/cirrus/build/testrun/regress/regress/results/date.out	2024-11-15 23:09:18.129992200 +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/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-15 16:27:18.160408000 +0000
+++ /tmp/cirrus-ci-build/build/testrun/plperl/regress/results/plperl_setup.out	2024-11-15 16:29:14.792765000 +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-15 16:27:15.208332627 +0000
+++ /tmp/cirrus-ci-build/src/pl/plperl/results/plperl_setup.out	2024-11-15 16:28:44.510056030 +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-15 16:27:15.616062799 +0000
+++ /tmp/cirrus-ci-build/build/testrun/plperl/regress/results/plperl_setup.out	2024-11-15 16:30:46.060349968 +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-15 16:26:11
+++ /Users/admin/pgsql/build/testrun/plperl/regress/results/plperl_setup.out	2024-11-15 16:28:40
@@ -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-15 16:27:29.351744000 +0000
+++ C:/cirrus/build/testrun/plperl/regress/results/plperl_setup.out	2024-11-15 16:33:05.603559100 +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/sysviews.out /tmp/cirrus-ci-build/build-32/testrun/pg_upgrade/00...
--- /tmp/cirrus-ci-build/src/test/regress/expected/sysviews.out	2024-11-15 15:49:39.358199681 +0000
+++ /tmp/cirrus-ci-build/build-32/testrun/pg_upgrade/002_pg_upgrade/data/results/sysviews.out	2024-11-15 15:59:16.210094...
@@ -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-15 15:49:39.358199681 +0000
+++ /tmp/cirrus-ci-build/build-32/testrun/recovery/027_stream_regress/data/results/sysviews.out	2024-11-15 15:58:50.5141...
@@ -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-15 15:49:39.358199681 +0000
+++ /tmp/cirrus-ci-build/build-32/testrun/regress/regress/results/sysviews.out	2024-11-15 15:58:11.970167931 +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/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-15 04:54:13.691686000 +0000
+++ /tmp/cirrus-ci-build/build/testrun/pg_upgrade/002_pg_upgrade/data/results/partition_join.out	2024-11-15 04:55:53.838...
@@ -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-15 04:54:13.691686000 +0000
+++ /tmp/cirrus-ci-build/build/testrun/recovery/027_stream_regress/data/results/partition_join.out	2024-11-15 04:56:48.5...
@@ -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-15 04:54:13.691686000 +0000
+++ /tmp/cirrus-ci-build/build/testrun/regress/regress/results/partition_join.out	2024-11-15 04:55:53.462737000 +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-15 04:54:09.719329491 +0000
+++ /tmp/cirrus-ci-build/src/bin/pg_upgrade/tmp_check/results/partition_join.out	2024-11-15 04:59:44.829127170 +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/recovery/tmp_ch...
--- /tmp/cirrus-ci-build/src/test/regress/expected/partition_join.out	2024-11-15 04:54:09.719329491 +0000
+++ /tmp/cirrus-ci-build/src/test/recovery/tmp_check/results/partition_join.out	2024-11-15 05:00:49.597722959 +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-15 04:54:09.719329491 +0000
+++ /tmp/cirrus-ci-build/src/test/regress/results/partition_join.out	2024-11-15 04:57:16.297258623 +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-15 04:54:09.641108440 +0000
+++ /tmp/cirrus-ci-build/build/testrun/pg_upgrade/002_pg_upgrade/data/results/partition_join.out	2024-11-15 04:56:39.563...
@@ -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-15 04:54:09.641108440 +0000
+++ /tmp/cirrus-ci-build/build/testrun/recovery/027_stream_regress/data/results/partition_join.out	2024-11-15 04:57:15.3...
@@ -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-15 04:54:09.641108440 +0000
+++ /tmp/cirrus-ci-build/build/testrun/regress/regress/results/partition_join.out	2024-11-15 04:56:32.067380114 +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-15 04:53:12
+++ /Users/admin/pgsql/build/testrun/pg_upgrade/002_pg_upgrade/data/results/partition_join.out	2024-11-15 04:55:02
@@ -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-15 04:53:12
+++ /Users/admin/pgsql/build/testrun/recovery/027_stream_regress/data/results/partition_join.out	2024-11-15 04:55:52
@@ -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-15 04:53:12
+++ /Users/admin/pgsql/build/testrun/regress/regress/results/partition_join.out	2024-11-15 04:55:06
@@ -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-15 04:54:35.979490100 +0000
+++ C:/cirrus/build/testrun/pg_upgrade/002_pg_upgrade/data/results/partition_join.out	2024-11-15 04:58:38.951606000 +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-15 04:54:35.979490100 +0000
+++ C:/cirrus/build/testrun/recovery/027_stream_regress/data/results/partition_join.out	2024-11-15 05:00:49.668998500 +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-15 04:54:35.979490100 +0000
+++ C:/cirrus/build/testrun/regress/regress/results/partition_join.out	2024-11-15 04:58:32.100524600 +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/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-11-15 02:50:49.430479000 +0000
+++ /tmp/cirrus-ci-build/build/testrun/postgres_fdw-running/regress/results/postgres_fdw.out	2024-11-15 02:56:11.8180190...
@@ -12325,8 +12325,7 @@
   FROM postgres_fdw_get_connections(true);
  case 
 ------
-    1
-(1 row)
+(0 rows)
 
 -- After terminating the remote backend, since the connection is closed,
 -- "closed" should be TRUE, or NULL if the connection status check
@@ -12339,8 +12338,7 @@
   FROM postgres_fdw_get_connections(true);
  case 
 ------
-    1
-(1 row)
+(0 rows)
...

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-15 02:50:50.569670639 +0000
+++ /tmp/cirrus-ci-build/build-32/testrun/citext/regress/results/citext.out	2024-11-15 02:59:37.725136076 +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-15 02:50:52.506022717 +0000
+++ /tmp/cirrus-ci-build/build-32/testrun/recovery/027_stream_regress/data/results/strings.out	2024-11-15 02:59:12.82510...
@@ -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-15 02:50:52.506022717 +0000
+++ /tmp/cirrus-ci-build/build-32/testrun/regress/regress/results/strings.out	2024-11-15 02:58:31.825049316 +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-15 02:50:52.366253121 +0000
+++ /tmp/cirrus-ci-build/build-32/testrun/test_regex/regress/results/test_regex.out	2024-11-15 02:59:57.185143438 +0000
@@ -1010,4075 +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-15 02:29:59.985311000 +0000
+++ /tmp/cirrus-ci-build/build/testrun/regress-running/regress/results/privs_in_db.out	2024-11-15 02:36:11.162822000 +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-15 00:10:28....
+++ /tmp/cirrus-ci-build/build/testrun/injection_points/isolation/results/reindex_concurrently_upsert.out	2024-11-15 00:...
@@ -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 --strip-trailing-cr -U3 C:/cirrus/src/test/modules/injection_points/expected/reindex_concurrently_upsert_partitione...
--- C:/cirrus/src/test/modules/injection_points/expected/reindex_concurrently_upsert_partitioned.out	2024-11-15 00:10:45...
+++ C:/cirrus/build/testrun/injection_points/isolation/results/reindex_concurrently_upsert_partitioned.out	2024-11-15 00...
@@ -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,103 +66,15 @@
 	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/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-14 18:36:39.990798000 +0000
+++ /tmp/cirrus-ci-build/build/testrun/pg_stat_statements/regress/results/level_tracking.out	2024-11-14 18:39:31.9707580...
@@ -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-14 18:36:36.112270275 +0000
+++ /tmp/cirrus-ci-build/contrib/pg_stat_statements/results/level_tracking.out	2024-11-14 18:42:18.618566112 +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-14 18:36:37.908791426 +0000
+++ /tmp/cirrus-ci-build/build/testrun/pg_stat_statements/regress/results/level_tracking.out	2024-11-14 18:40:25.5377867...
@@ -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-14 18:36:56.108319400 +0000
+++ C:/cirrus/build/testrun/pg_stat_statements/regress/results/level_tracking.out	2024-11-14 18:43:18.449146200 +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/subselect.out /tmp/cirrus-ci-build/build/testrun/regress-running...
--- /tmp/cirrus-ci-build/src/test/regress/expected/subselect.out	2024-11-14 14:00:01.040500000 +0000
+++ /tmp/cirrus-ci-build/build/testrun/regress-running/regress/results/subselect.out	2024-11-14 14:06:24.017878000 +0000
@@ -671,11 +671,10 @@
   select min(unique1) from tenk1 as a
   where not exists (select 1 from tenk1 as b where b.unique2 = 10000)
 ) ss;
- min 
------
-   0
-(1 row)
-
+ERROR:  deadlock detected
+DETAIL:  Process 47392 waits for AccessShareLock on relation 44360 of database 16386; blocked by process 47399.
+Process 47399 waits for AccessExclusiveLock on relation 16676 of database 16386; blocked by process 47392.
+HINT:  See server log for query details.
 --
 -- Test that an IN implemented using a UniquePath does unique-ification
 -- with the right semantics, as per bug #4113.  (Unfortunately we have
@@ -1029,7 +1028,7 @@
...

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/subselect.out /tmp/cirrus-ci-build/src/bin/pg_upgrade/tmp_check/...
--- /tmp/cirrus-ci-build/src/test/regress/expected/subselect.out	2024-11-14 13:59:57.949832222 +0000
+++ /tmp/cirrus-ci-build/src/bin/pg_upgrade/tmp_check/results/subselect.out	2024-11-14 14:06:45.458509558 +0000
@@ -1023,15 +1023,10 @@
 explain (costs off)
 select count(*) from tenk1 t
 where (exists(select 1 from tenk1 k where k.unique1 = t.unique2) or ten < 0);
-                                QUERY PLAN                                
---------------------------------------------------------------------------
- Aggregate
-   ->  Seq Scan on tenk1 t
-         Filter: ((ANY (unique2 = (hashed SubPlan 2).col1)) OR (ten < 0))
-         SubPlan 2
-           ->  Index Only Scan using tenk1_unique1 on tenk1 k
-(5 rows)
-
+ERROR:  deadlock detected
+DETAIL:  Process 42966 waits for AccessShareLock on relation 25178 of database 16387; blocked by process 42977.
+Process 42977 waits for AccessExclusiveLock on relation 16421 of database 16387; blocked by process 42966.
+HINT:  See server log for query details.
...

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/select_distinct.out /tmp/cirrus-ci-build/build/testrun/pg_upgrad...
--- /tmp/cirrus-ci-build/src/test/regress/expected/select_distinct.out	2024-11-14 14:00:01.422439865 +0000
+++ /tmp/cirrus-ci-build/build/testrun/pg_upgrade/002_pg_upgrade/data/results/select_distinct.out	2024-11-14 14:05:24.68...
@@ -262,14 +262,10 @@
 -- Ensure we don't do parallel distinct with a parallel unsafe function
 EXPLAIN (COSTS OFF)
 SELECT DISTINCT distinct_func(1) FROM tenk1;
-                        QUERY PLAN                        
-----------------------------------------------------------
- Unique
-   ->  Sort
-         Sort Key: (distinct_func(1))
-         ->  Index Only Scan using tenk1_hundred on tenk1
-(4 rows)
-
+ERROR:  deadlock detected
+DETAIL:  Process 30614 waits for AccessShareLock on relation 25228 of database 16387; blocked by process 30622.
+Process 30622 waits for AccessExclusiveLock on relation 16421 of database 16387; blocked by process 30614.
+HINT:  See server log for query details.
 -- make the function parallel safe
...

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/union.out /tmp/cirrus-ci-build/build/testrun/recovery/027_stream...
--- /tmp/cirrus-ci-build/src/test/regress/expected/union.out	2024-11-14 14:00:01.442439866 +0000
+++ /tmp/cirrus-ci-build/build/testrun/recovery/027_stream_regress/data/results/union.out	2024-11-14 14:06:07.700973886 ...
@@ -1461,19 +1461,10 @@
 inner join tenk2 t2 on t1.tenthous = t2.tenthous and t2.thousand = 0
    union all
 (values(1)) limit 1;
-                       QUERY PLAN                       
---------------------------------------------------------
- Limit
-   ->  Append
-         ->  Nested Loop
-               Join Filter: (t1.tenthous = t2.tenthous)
-               ->  Seq Scan on tenk1 t1
-               ->  Materialize
-                     ->  Seq Scan on tenk2 t2
-                           Filter: (thousand = 0)
-         ->  Result
-(9 rows)
-
...

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/select_distinct.out /tmp/cirrus-ci-build/build/testrun/regress/r...
--- /tmp/cirrus-ci-build/src/test/regress/expected/select_distinct.out	2024-11-14 14:00:01.422439865 +0000
+++ /tmp/cirrus-ci-build/build/testrun/regress/regress/results/select_distinct.out	2024-11-14 14:05:19.797019776 +0000
@@ -246,14 +246,10 @@
 
 -- Ensure the parallel plan produces the correct results
 SELECT DISTINCT four FROM tenk1;
- four 
-------
-    0
-    1
-    2
-    3
-(4 rows)
-
+ERROR:  deadlock detected
+DETAIL:  Process 29966 waits for AccessShareLock on relation 25216 of database 16384; blocked by process 29964.
+Process 29964 waits for AccessExclusiveLock on relation 16418 of database 16384; blocked by process 29966.
+HINT:  See server log for query details.
 CREATE OR REPLACE FUNCTION distinct_func(a INT) RETURNS INT AS $$
...

diff -U3 /Users/admin/pgsql/src/test/regress/expected/subselect.out /Users/admin/pgsql/build/testrun/recovery/027_stream...
--- /Users/admin/pgsql/src/test/regress/expected/subselect.out	2024-11-14 13:59:12
+++ /Users/admin/pgsql/build/testrun/recovery/027_stream_regress/data/results/subselect.out	2024-11-14 14:02:12
@@ -1403,7 +1403,7 @@
    ->  Seq Scan on public.tenk1 b
          Output: b.unique1, b.unique2, b.two, b.four, b.ten, b.twenty, b.hundred, b.thousand, b.twothousand, b.fivethou...
    SubPlan 1
-     ->  Index Only Scan using tenk1_unique1 on public.tenk1 a
+     ->  Index Only Scan using idx_int4 on public.tenk1 a
            Output: a.unique1
 (10 rows)
 
diff -U3 /Users/admin/pgsql/src/test/regress/expected/join.out /Users/admin/pgsql/build/testrun/recovery/027_stream_regr...
--- /Users/admin/pgsql/src/test/regress/expected/join.out	2024-11-14 13:59:12
+++ /Users/admin/pgsql/build/testrun/recovery/027_stream_regress/data/results/join.out	2024-11-14 14:02:13
@@ -6540,7 +6540,7 @@
  Aggregate
    ->  Nested Loop
          ->  Nested Loop
-               ->  Index Only Scan using tenk1_unique1 on tenk1 a
...

diff --strip-trailing-cr -U3 C:/cirrus/src/test/regress/expected/join.out C:/cirrus/build/testrun/pg_upgrade/002_pg_upgr...
--- C:/cirrus/src/test/regress/expected/join.out	2024-11-14 14:00:17.172885400 +0000
+++ C:/cirrus/build/testrun/pg_upgrade/002_pg_upgrade/data/results/join.out	2024-11-14 14:03:10.991995100 +0000
@@ -2238,11 +2238,10 @@
   x.unique1 in (select a.f1 from int4_tbl a,float8_tbl b where a.f1=b.f1) and
   x.unique1 = 0 and
   x.unique1 in (select aa.f1 from int4_tbl aa,float8_tbl bb where aa.f1=bb.f1);
- count 
--------
-     1
-(1 row)
-
+ERROR:  deadlock detected
+DETAIL:  Process 3672 waits for AccessShareLock on relation 24994 of database 16387; blocked by process 4932.
+Process 4932 waits for AccessExclusiveLock on relation 16421 of database 16387; blocked by process 3672.
+HINT:  See server log for query details.
 -- try that with GEQO too
 begin;
 set geqo = on;

diff --strip-trailing-cr -U3 C:/cirrus/src/test/regress/expected/join.out C:/cirrus/build/testrun/recovery/027_stream_re...
--- C:/cirrus/src/test/regress/expected/join.out	2024-11-14 14:00:17.172885400 +0000
+++ C:/cirrus/build/testrun/recovery/027_stream_regress/data/results/join.out	2024-11-14 14:05:47.488124100 +0000
@@ -6540,7 +6540,7 @@
  Aggregate
    ->  Nested Loop
          ->  Nested Loop
-               ->  Index Only Scan using tenk1_unique1 on tenk1 a
+               ->  Index Only Scan using idx_int4 on tenk1 a
                ->  Values Scan on "*VALUES*"
          ->  Memoize
                Cache Key: "*VALUES*".column1
diff --strip-trailing-cr -U3 C:/cirrus/src/test/regress/expected/aggregates.out C:/cirrus/build/testrun/recovery/027_str...
--- C:/cirrus/src/test/regress/expected/aggregates.out	2024-11-14 14:00:17.055334000 +0000
+++ C:/cirrus/build/testrun/recovery/027_stream_regress/data/results/aggregates.out	2024-11-14 14:05:48.849953200 +0000
@@ -1110,10 +1110,29 @@
 DROP AGGREGATE my_int_max(int4);
 DROP OPERATOR CLASS my_int_ops USING btree CASCADE;
 NOTICE:  drop cascades to index idx_int4
+ERROR:  deadlock detected
...

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-14 13:45:57.624484000 +0000
+++ /tmp/cirrus-ci-build/build/testrun/pg_upgrade/002_pg_upgrade/data/results/brin.out	2024-11-14 13:48:08.258816000 +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-14 13:45:57.681445000 +0000
+++ /tmp/cirrus-ci-build/build/testrun/pg_upgrade/002_pg_upgrade/data/results/privileges.out	2024-11-14 13:48:08.2577680...
@@ -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-14 13:45:57.624484000 +0000
+++ /tmp/cirrus-ci-build/build/testrun/recovery/027_stream_regress/data/results/brin.out	2024-11-14 13:48:44.217386000 +...
@@ -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-14 13:45:57.624484000 +0000
+++ /tmp/cirrus-ci-build/build/testrun/regress/regress/results/brin.out	2024-11-14 13:48:07.172041000 +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-14 13:45:57.681445000 +0000
+++ /tmp/cirrus-ci-build/build/testrun/regress/regress/results/privileges.out	2024-11-14 13:48:07.170976000 +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-14 13:45:57.884570927 +0000
+++ /tmp/cirrus-ci-build/src/bin/pg_upgrade/tmp_check/results/brin.out	2024-11-14 13:52:18.150700014 +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/recovery/tmp_check/result...
--- /tmp/cirrus-ci-build/src/test/regress/expected/brin.out	2024-11-14 13:45:57.884570927 +0000
+++ /tmp/cirrus-ci-build/src/test/recovery/tmp_check/results/brin.out	2024-11-14 13:54:00.501741428 +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-14 13:45:57.884570927 +0000
+++ /tmp/cirrus-ci-build/src/test/regress/results/brin.out	2024-11-14 13:50:31.259547454 +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-14 13:45:56.147434490 +0000
+++ /tmp/cirrus-ci-build/build/testrun/pg_upgrade/002_pg_upgrade/data/results/brin.out	2024-11-14 13:51:03.151802345 +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-14 13:45:56.147434490 +0000
+++ /tmp/cirrus-ci-build/build/testrun/recovery/027_stream_regress/data/results/brin.out	2024-11-14 13:51:38.647889450 +...
@@ -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-14 13:45:56.147434490 +0000
+++ /tmp/cirrus-ci-build/build/testrun/regress/regress/results/brin.out	2024-11-14 13:50:56.191794198 +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-14 13:45:11
+++ /Users/admin/pgsql/build/testrun/pg_upgrade/002_pg_upgrade/data/results/brin.out	2024-11-14 13:48:01
@@ -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 /Users/admin/pgsql/src/test/regress/expected/privileges.out /Users/admin/pgsql/build/testrun/pg_upgrade/002_pg_...
--- /Users/admin/pgsql/src/test/regress/expected/privileges.out	2024-11-14 13:45:12
+++ /Users/admin/pgsql/build/testrun/pg_upgrade/002_pg_upgrade/data/results/privileges.out	2024-11-14 13:48:01
@@ -1846,1413 +1846,10 @@
 REINDEX TABLE sro_tab;
...

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-14 13:45:11
+++ /Users/admin/pgsql/build/testrun/recovery/027_stream_regress/data/results/brin.out	2024-11-14 13:48:35
@@ -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/regress/regress/results/...
--- /Users/admin/pgsql/src/test/regress/expected/brin.out	2024-11-14 13:45:11
+++ /Users/admin/pgsql/build/testrun/regress/regress/results/brin.out	2024-11-14 13:48:01
@@ -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/pg_upgrade/002_pg_upgr...
--- C:/cirrus/src/test/regress/expected/brin.out	2024-11-14 13:46:16.134529200 +0000
+++ C:/cirrus/build/testrun/pg_upgrade/002_pg_upgrade/data/results/brin.out	2024-11-14 13:49:36.273907700 +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-14 13:46:16.134529200 +0000
+++ C:/cirrus/build/testrun/recovery/027_stream_regress/data/results/brin.out	2024-11-14 13:51:47.218236800 +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-14 13:46:16.134529200 +0000
+++ C:/cirrus/build/testrun/regress/regress/results/brin.out	2024-11-14 13:49:26.052679900 +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/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-11-14 12:59:39.640706000 +0000
+++ /tmp/cirrus-ci-build/build/testrun/postgres_fdw-running/regress/results/postgres_fdw.out	2024-11-14 13:05:32.1761430...
@@ -12325,8 +12325,7 @@
   FROM postgres_fdw_get_connections(true);
  case 
 ------
-    1
-(1 row)
+(0 rows)
 
 -- After terminating the remote backend, since the connection is closed,
 -- "closed" should be TRUE, or NULL if the connection status check
@@ -12339,8 +12338,7 @@
   FROM postgres_fdw_get_connections(true);
  case 
 ------
-    1
-(1 row)
+(0 rows)
...

diff -U3 /Users/admin/pgsql/src/test/regress/expected/subselect.out /Users/admin/pgsql/build/testrun/pg_upgrade/002_pg_u...
--- /Users/admin/pgsql/src/test/regress/expected/subselect.out	2024-11-14 07:35:12
+++ /Users/admin/pgsql/build/testrun/pg_upgrade/002_pg_upgrade/data/results/subselect.out	2024-11-14 07:36:39
@@ -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/pg_upgrade/002_pg...
--- C:/cirrus/src/test/regress/expected/subselect.out	2024-11-14 07:36:30.492208900 +0000
+++ C:/cirrus/build/testrun/pg_upgrade/002_pg_upgrade/data/results/subselect.out	2024-11-14 07:39:08.028894900 +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/recovery/027_stre...
--- C:/cirrus/src/test/regress/expected/subselect.out	2024-11-14 07:36:30.492208900 +0000
+++ C:/cirrus/build/testrun/recovery/027_stream_regress/data/results/subselect.out	2024-11-14 07:41:20.685815700 +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/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-14 01:57:15.696402000 +0000
+++ /tmp/cirrus-ci-build/build/testrun/pg_upgrade/002_pg_upgrade/data/results/xml.out	2024-11-14 01:58:54.601189000 +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-14 01:57:15.696402000 +0000
+++ /tmp/cirrus-ci-build/build/testrun/recovery/027_stream_regress/data/results/xml.out	2024-11-14 01:59:49.038408000 +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-14 01:57:15.696402000 +0000
+++ /tmp/cirrus-ci-build/build/testrun/regress/regress/results/xml.out	2024-11-14 01:58:52.623905000 +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-14 01:57:11.902527594 +0000
+++ /tmp/cirrus-ci-build/src/bin/pg_upgrade/tmp_check/results/xml.out	2024-11-14 02:02:16.500834031 +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-14 01:57:11.902527594 +0000
+++ /tmp/cirrus-ci-build/src/test/regress/results/xml.out	2024-11-14 02:00:27.165132323 +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-14 01:57:10.317176307 +0000
+++ /tmp/cirrus-ci-build/build/testrun/pg_upgrade/002_pg_upgrade/data/results/xml.out	2024-11-14 01:59:27.750429047 +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-14 01:57:10.317176307 +0000
+++ /tmp/cirrus-ci-build/build/testrun/recovery/027_stream_regress/data/results/xml.out	2024-11-14 02:00:02.007318937 +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-14 01:57:10.317176307 +0000
+++ /tmp/cirrus-ci-build/build/testrun/regress/regress/results/xml.out	2024-11-14 01:59:20.246307256 +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-14 01:57:12
+++ /Users/admin/pgsql/build/testrun/pg_upgrade/002_pg_upgrade/data/results/xml.out	2024-11-14 01:58:57
@@ -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-14 01:57:12
+++ /Users/admin/pgsql/build/testrun/recovery/027_stream_regress/data/results/xml.out	2024-11-14 01:59:44
@@ -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-14 01:57:12
+++ /Users/admin/pgsql/build/testrun/regress/regress/results/xml.out	2024-11-14 01:59:01
@@ -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-13 23:55:26.557406000 +0000
+++ /tmp/cirrus-ci-build/build/testrun/pg_upgrade/002_pg_upgrade/data/results/indexing.out	2024-11-13 23:57:13.276744000...
@@ -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-13 23:55:26.557406000 +0000
+++ /tmp/cirrus-ci-build/build/testrun/recovery/027_stream_regress/data/results/indexing.out	2024-11-13 23:57:52.5703690...
@@ -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-13 23:55:26.557406000 +0000
+++ /tmp/cirrus-ci-build/build/testrun/regress/regress/results/indexing.out	2024-11-13 23:57:10.371085000 +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-13 23:55:24.783414713 +0000
+++ /tmp/cirrus-ci-build/src/bin/pg_upgrade/tmp_check/results/indexing.out	2024-11-14 00:00:59.232776182 +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-13 23:55:24.619875351 +0000
+++ /tmp/cirrus-ci-build/src/test/isolation/output_iso/results/partitioned-cic.out	2024-11-14 00:23:12.307166066 +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-13 23:55:24.783414713 +0000
+++ /tmp/cirrus-ci-build/src/test/recovery/tmp_check/results/indexing.out	2024-11-14 00:02:32.904566313 +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-13 23:55:24.783414713 +0000
+++ /tmp/cirrus-ci-build/src/test/regress/results/indexing.out	2024-11-13 23:59:09.208944798 +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-13 23:55:22.177606600 +0000
+++ /tmp/cirrus-ci-build/build/testrun/pg_upgrade/002_pg_upgrade/data/results/indexing.out	2024-11-13 23:58:39.150182772...
@@ -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-13 23:55:22.177606600 +0000
+++ /tmp/cirrus-ci-build/build/testrun/recovery/027_stream_regress/data/results/indexing.out	2024-11-13 23:59:10.0101256...
@@ -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-13 23:55:22.177606600 +0000
+++ /tmp/cirrus-ci-build/build/testrun/regress/regress/results/indexing.out	2024-11-13 23:58:31.186174491 +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/pg_upgrade/002_pg_...
--- C:/cirrus/src/test/regress/expected/indexing.out	2024-11-13 23:55:34.312606200 +0000
+++ C:/cirrus/build/testrun/pg_upgrade/002_pg_upgrade/data/results/indexing.out	2024-11-13 23:59:12.493271500 +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-13 23:55:34.312606200 +0000
+++ C:/cirrus/build/testrun/recovery/027_stream_regress/data/results/indexing.out	2024-11-14 00:01:17.077233000 +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-13 23:55:34.312606200 +0000
+++ C:/cirrus/build/testrun/regress/regress/results/indexing.out	2024-11-13 23:59:06.387312600 +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-13 22:18:28.878545269 +0000
+++ /tmp/cirrus-ci-build/build-32/testrun/pg_upgrade/002_pg_upgrade/data/results/jsonb_jsonpath.out	2024-11-13 22:24: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-13 22:18:28.878545269 +0000
+++ /tmp/cirrus-ci-build/build-32/testrun/recovery/027_stream_regress/data/results/jsonb_jsonpath.out	2024-11-13 22:25: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-13 22:18:28.878545269 +0000
+++ /tmp/cirrus-ci-build/build-32/testrun/regress/regress/results/jsonb_jsonpath.out	2024-11-13 22:24:33.334014135 +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-13 20:17:48.707397000 +0000
+++ /tmp/cirrus-ci-build/build/testrun/btree_gist/regress/results/partitions.out	2024-11-13 20:20:42.116751000 +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-13 20:17:48.709908000 +0000
+++ /tmp/cirrus-ci-build/build/testrun/btree_gist/regress/results/without_overlaps.out	2024-11-13 20:20:42.545224000 +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-13 20:17:47.031859364 +0000
+++ /tmp/cirrus-ci-build/build/testrun/btree_gist/regress/results/partitions.out	2024-11-13 20:23:11.145449780 +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-13 20:17:47.035888217 +0000
+++ /tmp/cirrus-ci-build/build/testrun/btree_gist/regress/results/without_overlaps.out	2024-11-13 20:23:11.357456420 +00...
@@ -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-13 20:17:53.643827600 +0000
+++ C:/cirrus/build/testrun/btree_gist/regress/results/partitions.out	2024-11-13 20:24:37.870982600 +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-13 20:17:53.663904000 +0000
+++ C:/cirrus/build/testrun/btree_gist/regress/results/without_overlaps.out	2024-11-13 20:24:39.389039600 +0000
@@ -9,7 +9,6 @@
   CONSTRAINT temporal_rng_pk PRIMARY KEY (id, valid_at WITHOUT OVERLAPS)
 );
...

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-11-13 17:51:26.916937000 +0000
+++ /tmp/cirrus-ci-build/build/testrun/postgres_fdw-running/regress/results/postgres_fdw.out	2024-11-13 17:56:50.7025340...
@@ -12325,8 +12325,7 @@
   FROM postgres_fdw_get_connections(true);
  case 
 ------
-    1
-(1 row)
+(0 rows)
 
 -- After terminating the remote backend, since the connection is closed,
 -- "closed" should be TRUE, or NULL if the connection status check
@@ -12339,8 +12338,7 @@
   FROM postgres_fdw_get_connections(true);
  case 
 ------
-    1
-(1 row)
+(0 rows)
...

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-13 16:44:11.31641500...
+++ /tmp/cirrus-ci-build/build/testrun/isolation/isolation/results/vacuum-extending-in-repetable-read.out	2024-11-13 16:...
@@ -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-13 16:44:10.14380578...
+++ /tmp/cirrus-ci-build/src/test/isolation/output_iso/results/vacuum-extending-in-repetable-read.out	2024-11-13 16:49: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-13 16:44:11.56408072...
+++ /tmp/cirrus-ci-build/build/testrun/isolation/isolation/results/vacuum-extending-in-repetable-read.out	2024-11-13 16:...
@@ -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-13 16:44:27.131512800 +0000
+++ C:/cirrus/build/testrun/isolation/isolation/results/vacuum-extending-in-repetable-read.out	2024-11-13 16:48:33.06306...
@@ -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-13 11:01:45.303441000 +0000
+++ /tmp/cirrus-ci-build/build/testrun/pg_upgrade/002_pg_upgrade/data/results/alter_table.out	2024-11-13 11:03:58.229316...
@@ -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        
+-------+------------+---------------+-------------+----------------------
+ 39546 |            |             0 |       39546 | pktable_pkey
+ 39541 |            |             0 |       39541 | pktable
+ 39548 |            |             0 |       39548 | fktable
+ 40032 |            |             0 |       40037 | foo
+ 40041 |            |             0 |       40041 | pg_toast_40032_index
+ 40040 |            |             0 |       40040 | pg_toast_40032
+ 40311 |            |             0 |       40311 | old_oids
+ 40328 |            |             0 |       40328 | pg_toast_40325
...

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-13 11:01:45.303441000 +0000
+++ /tmp/cirrus-ci-build/build/testrun/recovery/027_stream_regress/data/results/alter_table.out	2024-11-13 11:04:48.4065...
@@ -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        
+-------+------------+---------------+-------------+----------------------
+ 39471 |            |             0 |       39471 | pktable_pkey
+ 39466 |            |             0 |       39466 | pktable
+ 39473 |            |             0 |       39473 | fktable
+ 39990 |            |             0 |       39995 | foo
+ 39999 |            |             0 |       39999 | pg_toast_39990_index
+ 39998 |            |             0 |       39998 | pg_toast_39990
+ 40301 |            |             0 |       40301 | old_oids
+ 40318 |            |             0 |       40318 | pg_toast_40315
...

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-13 11:01:45.303441000 +0000
+++ /tmp/cirrus-ci-build/build/testrun/regress/regress/results/alter_table.out	2024-11-13 11:03:51.460948000 +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        
+-------+------------+---------------+-------------+----------------------
+ 39335 |            |             0 |       39335 | pktable_pkey
+ 39331 |            |             0 |       39331 | pktable
+ 39337 |            |             0 |       39337 | fktable
+ 40044 |            |             0 |       40049 | foo
+ 40053 |            |             0 |       40053 | pg_toast_40044_index
+ 40052 |            |             0 |       40052 | pg_toast_40044
+ 40269 |            |             0 |       40269 | old_oids
+ 40286 |            |             0 |       40286 | pg_toast_40283
...

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-13 11:01:45.562642878 +0000
+++ /tmp/cirrus-ci-build/src/bin/pg_upgrade/tmp_check/results/alter_table.out	2024-11-13 11:08:24.792149554 +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        
+-------+------------+---------------+-------------+----------------------
+ 39639 |            |             0 |       39639 | pktable_pkey
+ 39635 |            |             0 |       39635 | pktable
+ 39641 |            |             0 |       39641 | fktable
+ 40130 |            |             0 |       40135 | foo
+ 40139 |            |             0 |       40139 | pg_toast_40130_index
+ 40138 |            |             0 |       40138 | pg_toast_40130
+ 40350 |            |             0 |       40350 | old_oids
+ 40370 |            |             0 |       40370 | pg_toast_40367
...

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-13 11:01:45.562642878 +0000
+++ /tmp/cirrus-ci-build/src/test/regress/results/alter_table.out	2024-11-13 11:06:57.768151101 +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        
+-------+------------+---------------+-------------+----------------------
+ 39593 |            |             0 |       39593 | pktable_pkey
+ 39589 |            |             0 |       39589 | pktable
+ 39598 |            |             0 |       39598 | fktable
+ 40131 |            |             0 |       40136 | foo
+ 40140 |            |             0 |       40140 | pg_toast_40131_index
+ 40139 |            |             0 |       40139 | pg_toast_40131
+ 40354 |            |             0 |       40354 | old_oids
+ 40373 |            |             0 |       40373 | pg_toast_40370
...

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-13 11:01:42.479122661 +0000
+++ /tmp/cirrus-ci-build/build/testrun/pg_upgrade/002_pg_upgrade/data/results/alter_table.out	2024-11-13 11:07:04.262210...
@@ -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        
+-------+------------+---------------+-------------+----------------------
+ 39614 |            |             0 |       39614 | pg_toast_39609
+ 39615 |            |             0 |       39615 | pg_toast_39609_index
+ 39609 |            |             0 |       39609 | users
+ 39608 |            |             0 |       39608 | users_id_seq
+ 39914 |            |             0 |       39914 | foo
+ 40269 |            |             0 |       40269 | forc_test
+ 40645 |            |             0 |       40645 | pg_toast_40642
+ 40646 |            |             0 |       40646 | pg_toast_40642_index
...

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-13 11:01:42.479122661 +0000
+++ /tmp/cirrus-ci-build/build/testrun/recovery/027_stream_regress/data/results/alter_table.out	2024-11-13 11:07:40.8744...
@@ -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        
+-------+------------+---------------+-------------+----------------------
+ 39381 |            |             0 |       39381 | pktable_pkey
+ 39377 |            |             0 |       39377 | pktable
+ 39383 |            |             0 |       39383 | fktable
+ 39935 |            |             0 |       39944 | foo
+ 39948 |            |             0 |       39948 | pg_toast_39935_index
+ 39947 |            |             0 |       39947 | pg_toast_39935
+ 40179 |            |             0 |       40179 | old_oids
+ 40199 |            |             0 |       40199 | pg_toast_40196
...

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-13 11:01:42.479122661 +0000
+++ /tmp/cirrus-ci-build/build/testrun/regress/regress/results/alter_table.out	2024-11-13 11:06:57.830180626 +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        
+-------+------------+---------------+-------------+----------------------
+ 39724 |            |             0 |       39724 | users_id_seq
+ 39732 |            |             0 |       39732 | pg_toast_39727
+ 39733 |            |             0 |       39733 | pg_toast_39727_index
+ 39727 |            |             0 |       39727 | users
+ 40060 |            |             0 |       40060 | foo
+ 40229 |            |             0 |       40229 | forc_test
+ 39477 |            |             0 |       39477 | pktable_pkey
+ 39473 |            |             0 |       39473 | pktable
...

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-13 11:01:12
+++ /Users/admin/pgsql/build/testrun/pg_upgrade/002_pg_upgrade/data/results/alter_table.out	2024-11-13 11:03:27
@@ -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        
+-------+------------+---------------+-------------+----------------------
+ 39309 |            |             0 |       39309 | pktable_pkey
+ 39305 |            |             0 |       39305 | pktable
+ 39333 |            |             0 |       39333 | fktable
+ 40003 |            |             0 |       40008 | foo
+ 40012 |            |             0 |       40012 | pg_toast_40003_index
+ 40011 |            |             0 |       40011 | pg_toast_40003
+ 40217 |            |             0 |       40217 | old_oids
+ 40234 |            |             0 |       40234 | pg_toast_40231
...

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-13 11:01:12
+++ /Users/admin/pgsql/build/testrun/recovery/027_stream_regress/data/results/alter_table.out	2024-11-13 11:04:15
@@ -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        
+-------+------------+---------------+-------------+----------------------
+ 39019 |            |             0 |       39019 | pktable_pkey
+ 39015 |            |             0 |       39015 | pktable
+ 39024 |            |             0 |       39024 | fktable
+ 39946 |            |             0 |       39952 | foo
+ 39956 |            |             0 |       39956 | pg_toast_39946_index
+ 39955 |            |             0 |       39955 | pg_toast_39946
+ 40176 |            |             0 |       40176 | old_oids
+ 40194 |            |             0 |       40194 | pg_toast_40191
...

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-13 11:01:12
+++ /Users/admin/pgsql/build/testrun/regress/regress/results/alter_table.out	2024-11-13 11:03:30
@@ -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        
+-------+------------+---------------+-------------+----------------------
+ 39415 |            |             0 |       39415 | pktable_pkey
+ 39411 |            |             0 |       39411 | pktable
+ 39417 |            |             0 |       39417 | fktable
+ 40050 |            |             0 |       40055 | foo
+ 40059 |            |             0 |       40059 | pg_toast_40050_index
+ 40058 |            |             0 |       40058 | pg_toast_40050
+ 40309 |            |             0 |       40309 | old_oids
+ 40363 |            |             0 |       40363 | pg_toast_40360
...

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-13 11:01:58.666148600 +0000
+++ C:/cirrus/build/testrun/pg_upgrade/002_pg_upgrade/data/results/alter_table.out	2024-11-13 11:05:22.797071100 +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        
+-------+------------+---------------+-------------+----------------------
+ 39187 |            |             0 |       39187 | pktable_pkey
+ 39183 |            |             0 |       39183 | pktable
+ 39189 |            |             0 |       39189 | fktable
+ 39703 |            |             0 |       39710 | foo
+ 39714 |            |             0 |       39714 | pg_toast_39703_index
+ 39713 |            |             0 |       39713 | pg_toast_39703
+ 39958 |            |             0 |       39958 | pg_toast_39955
+ 39959 |            |             0 |       39959 | pg_toast_39955_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-13 11:01:58.666148600 +0000
+++ C:/cirrus/build/testrun/recovery/027_stream_regress/data/results/alter_table.out	2024-11-13 11:07:44.113027000 +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        
+-------+------------+---------------+-------------+----------------------
+ 39015 |            |             0 |       39015 | pktable_pkey
+ 39011 |            |             0 |       39011 | pktable
+ 39017 |            |             0 |       39017 | fktable
+ 39649 |            |             0 |       39655 | foo
+ 39659 |            |             0 |       39659 | pg_toast_39649_index
+ 39658 |            |             0 |       39658 | pg_toast_39649
+ 39925 |            |             0 |       39925 | old_oids
+ 39942 |            |             0 |       39942 | pg_toast_39939
...

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-13 11:01:58.666148600 +0000
+++ C:/cirrus/build/testrun/regress/regress/results/alter_table.out	2024-11-13 11:05:18.854687900 +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        
+-------+------------+---------------+-------------+----------------------
+ 38558 |            |             0 |       38558 | pktable_pkey
+ 38551 |            |             0 |       38551 | pktable
+ 38560 |            |             0 |       38560 | fktable
+ 39675 |            |             0 |       39680 | foo
+ 39684 |            |             0 |       39684 | pg_toast_39675_index
+ 39683 |            |             0 |       39683 | pg_toast_39675
+ 40028 |            |             0 |       40028 | old_oids
+ 40045 |            |             0 |       40045 | pg_toast_40042
...

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-13 10:33:50.374990700 +0000
+++ C:/cirrus/build/testrun/pg_upgrade/002_pg_upgrade/data/results/date.out	2024-11-13 10:36:05.310531500 +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-13 10:33:50.374990700 +0000
+++ C:/cirrus/build/testrun/recovery/027_stream_regress/data/results/date.out	2024-11-13 10:38:25.917638500 +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-13 10:33:50.374990700 +0000
+++ C:/cirrus/build/testrun/regress/regress/results/date.out	2024-11-13 10:35:58.569023200 +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 /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-13 06:27:12
+++ /Users/admin/pgsql/build/testrun/plperl/regress/results/plperl_setup.out	2024-11-13 06:30:42
@@ -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-13 05:35:06.505401000 +0000
+++ /tmp/cirrus-ci-build/build/testrun/plperl/regress/results/plperl_setup.out	2024-11-13 05:37:00.910655000 +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-13 05:35:06.792574652 +0000
+++ /tmp/cirrus-ci-build/src/pl/plperl/results/plperl_setup.out	2024-11-13 05:36:27.545462838 +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-13 05:35:05.167632645 +0000
+++ /tmp/cirrus-ci-build/build/testrun/plperl/regress/results/plperl_setup.out	2024-11-13 05:37:39.380616381 +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-13 05:35:10
+++ /Users/admin/pgsql/build/testrun/plperl/regress/results/plperl_setup.out	2024-11-13 05:38:00
@@ -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-13 05:35:15.359415600 +0000
+++ C:/cirrus/build/testrun/plperl/regress/results/plperl_setup.out	2024-11-13 05:40:44.928474800 +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/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-13 00:38:38.087906802 +0000
+++ /tmp/cirrus-ci-build/build/testrun/postgres_fdw/regress/results/query_cancel.out	2024-11-13 00:43:54.935259336 +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/partition_join.out /tmp/cirrus-ci-build/build/testrun/pg_upgrade...
--- /tmp/cirrus-ci-build/src/test/regress/expected/partition_join.out	2024-11-12 23:13:55.202020000 +0000
+++ /tmp/cirrus-ci-build/build/testrun/pg_upgrade/002_pg_upgrade/data/results/partition_join.out	2024-11-12 23:15:36.555...
@@ -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-12 23:13:55.202020000 +0000
+++ /tmp/cirrus-ci-build/build/testrun/recovery/027_stream_regress/data/results/partition_join.out	2024-11-12 23:16:19.6...
@@ -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-12 23:13:55.202020000 +0000
+++ /tmp/cirrus-ci-build/build/testrun/regress/regress/results/partition_join.out	2024-11-12 23:15:35.934158000 +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-12 23:14:56.990860553 +0000
+++ /tmp/cirrus-ci-build/src/bin/pg_upgrade/tmp_check/results/partition_join.out	2024-11-12 23:21:29.059328245 +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/recovery/tmp_ch...
--- /tmp/cirrus-ci-build/src/test/regress/expected/partition_join.out	2024-11-12 23:14:56.990860553 +0000
+++ /tmp/cirrus-ci-build/src/test/recovery/tmp_check/results/partition_join.out	2024-11-12 23:22:38.469905701 +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-12 23:14:56.990860553 +0000
+++ /tmp/cirrus-ci-build/src/test/regress/results/partition_join.out	2024-11-12 23:18:40.435976595 +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-12 23:13:53.885149994 +0000
+++ /tmp/cirrus-ci-build/build/testrun/pg_upgrade/002_pg_upgrade/data/results/partition_join.out	2024-11-12 23:16:43.807...
@@ -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-12 23:13:53.885149994 +0000
+++ /tmp/cirrus-ci-build/build/testrun/recovery/027_stream_regress/data/results/partition_join.out	2024-11-12 23:17:20.8...
@@ -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-12 23:13:53.885149994 +0000
+++ /tmp/cirrus-ci-build/build/testrun/regress/regress/results/partition_join.out	2024-11-12 23:16:36.447471802 +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-12 23:13:51
+++ /Users/admin/pgsql/build/testrun/pg_upgrade/002_pg_upgrade/data/results/partition_join.out	2024-11-12 23:15:57
@@ -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-12 23:13:51
+++ /Users/admin/pgsql/build/testrun/recovery/027_stream_regress/data/results/partition_join.out	2024-11-12 23:16:44
@@ -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-12 23:13:51
+++ /Users/admin/pgsql/build/testrun/regress/regress/results/partition_join.out	2024-11-12 23:16:00
@@ -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-12 23:14:15.567540400 +0000
+++ C:/cirrus/build/testrun/pg_upgrade/002_pg_upgrade/data/results/partition_join.out	2024-11-12 23:20:13.392952500 +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-12 23:14:15.567540400 +0000
+++ C:/cirrus/build/testrun/recovery/027_stream_regress/data/results/partition_join.out	2024-11-12 23:23:29.734748400 +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-12 23:14:15.567540400 +0000
+++ C:/cirrus/build/testrun/regress/regress/results/partition_join.out	2024-11-12 23:19:51.698619100 +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-12 21:06:54.879105614 +0000
+++ /tmp/cirrus-ci-build/build-32/testrun/citext/regress/results/citext.out	2024-11-12 21:16:35.209332840 +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-12 21:06:56.859105656 +0000
+++ /tmp/cirrus-ci-build/build-32/testrun/recovery/027_stream_regress/data/results/strings.out	2024-11-12 21:16:05.12136...
@@ -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-12 21:06:56.859105656 +0000
+++ /tmp/cirrus-ci-build/build-32/testrun/regress/regress/results/strings.out	2024-11-12 21:15:21.949424116 +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-12 21:06:56.715105653 +0000
+++ /tmp/cirrus-ci-build/build-32/testrun/test_regex/regress/results/test_regex.out	2024-11-12 21:16:57.397310050 +0000
@@ -1010,4075 +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-12 21:00:50.093838000 +0000
+++ /tmp/cirrus-ci-build/build/testrun/regress-running/regress/results/privs_in_db.out	2024-11-12 21:06:31.589989000 +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/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-11-12 14:42:29.313480000 +0000
+++ /tmp/cirrus-ci-build/build/testrun/postgres_fdw-running/regress/results/postgres_fdw.out	2024-11-12 14:47:25.2584860...
@@ -12325,8 +12325,7 @@
   FROM postgres_fdw_get_connections(true);
  case 
 ------
-    1
-(1 row)
+(0 rows)
 
 -- After terminating the remote backend, since the connection is closed,
 -- "closed" should be TRUE, or NULL if the connection status check
@@ -12339,8 +12338,7 @@
   FROM postgres_fdw_get_connections(true);
  case 
 ------
-    1
-(1 row)
+(0 rows)
...

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-12 14:26:31.740650000 +0000
+++ /tmp/cirrus-ci-build/build/testrun/pg_stat_statements/regress/results/level_tracking.out	2024-11-12 14:29:25.2972940...
@@ -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-12 14:26:26.040278090 +0000
+++ /tmp/cirrus-ci-build/contrib/pg_stat_statements/results/level_tracking.out	2024-11-12 14:31:17.112344115 +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-12 14:26:24.719493989 +0000
+++ /tmp/cirrus-ci-build/build/testrun/pg_stat_statements/regress/results/level_tracking.out	2024-11-12 14:30:25.4505217...
@@ -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-12 14:26:30
+++ /Users/admin/pgsql/build/testrun/pg_stat_statements/regress/results/level_tracking.out	2024-11-12 14:31:12
@@ -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-12 14:26:35.506376400 +0000
+++ C:/cirrus/build/testrun/pg_stat_statements/regress/results/level_tracking.out	2024-11-12 14:33:52.622120200 +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/subselect.out /tmp/cirrus-ci-build/build/testrun/pg_upgrade/002_...
--- /tmp/cirrus-ci-build/src/test/regress/expected/subselect.out	2024-11-12 10:00:07.998958000 +0000
+++ /tmp/cirrus-ci-build/build/testrun/pg_upgrade/002_pg_upgrade/data/results/subselect.out	2024-11-12 10:02:19.61608700...
@@ -1029,7 +1029,7 @@
    ->  Seq Scan on tenk1 t
          Filter: ((ANY (unique2 = (hashed SubPlan 2).col1)) OR (ten < 0))
          SubPlan 2
-           ->  Index Only Scan using tenk1_unique1 on tenk1 k
+           ->  Index Only Scan using idx_int4 on tenk1 k
 (5 rows)
 
 select count(*) from tenk1 t

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/subselect.out /tmp/cirrus-ci-build/build-32/testrun/recovery/027...
--- /tmp/cirrus-ci-build/src/test/regress/expected/subselect.out	2024-11-12 10:00:03.587129690 +0000
+++ /tmp/cirrus-ci-build/build-32/testrun/recovery/027_stream_regress/data/results/subselect.out	2024-11-12 10:08:50.889...
@@ -2009,17 +2009,10 @@
 -- Pull up direct-correlated ANY_SUBLINKs
 explain (costs off)
 select * from tenk1 A where hundred in (select hundred from tenk2 B where B.odd = A.odd);
-                         QUERY PLAN                         
-------------------------------------------------------------
- Hash Join
-   Hash Cond: ((a.odd = b.odd) AND (a.hundred = b.hundred))
-   ->  Seq Scan on tenk1 a
-   ->  Hash
-         ->  HashAggregate
-               Group Key: b.odd, b.hundred
-               ->  Seq Scan on tenk2 b
-(7 rows)
-
+ERROR:  deadlock detected
+DETAIL:  Process 76198 waits for AccessShareLock on relation 25584 of database 16384; blocked by process 76183.
...

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-12 09:59:00.160142000 +0000
+++ /tmp/cirrus-ci-build/build/testrun/pg_upgrade/002_pg_upgrade/data/results/brin.out	2024-11-12 10:01:09.385274000 +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-12 09:59:00.222350000 +0000
+++ /tmp/cirrus-ci-build/build/testrun/pg_upgrade/002_pg_upgrade/data/results/privileges.out	2024-11-12 10:01:09.3840920...
@@ -1842,1417 +1842,10 @@
 -- Do the same concurrently
...

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-12 09:59:00.160142000 +0000
+++ /tmp/cirrus-ci-build/build/testrun/recovery/027_stream_regress/data/results/brin.out	2024-11-12 10:01:42.089819000 +...
@@ -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/privileges.out /tmp/cirrus-ci-build/build/testrun/regress/regres...
--- /tmp/cirrus-ci-build/src/test/regress/expected/privileges.out	2024-11-12 09:59:00.222350000 +0000
+++ /tmp/cirrus-ci-build/build/testrun/regress/regress/results/privileges.out	2024-11-12 10:01:08.919437000 +0000
@@ -1842,1417 +1842,10 @@
 -- Do the same concurrently
 CREATE INDEX CONCURRENTLY sro_idx ON sro_tab ((sro_ifun(a) + sro_ifun(0)))
 	WHERE sro_ifun(a + 10) > sro_ifun(10);
--- REINDEX
-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 
...

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-12 09:58:56.105355663 +0000
+++ /tmp/cirrus-ci-build/src/bin/pg_upgrade/tmp_check/results/brin.out	2024-11-12 10:04:20.936461753 +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-12 09:58:56.105355663 +0000
+++ /tmp/cirrus-ci-build/src/test/regress/results/brin.out	2024-11-12 10:03:16.504473537 +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-12 09:58:57.712525792 +0000
+++ /tmp/cirrus-ci-build/build/testrun/pg_upgrade/002_pg_upgrade/data/results/brin.out	2024-11-12 10:03:50.147559089 +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-12 09:58:57.712525792 +0000
+++ /tmp/cirrus-ci-build/build/testrun/recovery/027_stream_regress/data/results/brin.out	2024-11-12 10:04:23.391537344 +...
@@ -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-12 09:58:57.712525792 +0000
+++ /tmp/cirrus-ci-build/build/testrun/regress/regress/results/brin.out	2024-11-12 10:03:44.767563205 +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-12 09:59:00
+++ /Users/admin/pgsql/build/testrun/pg_upgrade/002_pg_upgrade/data/results/brin.out	2024-11-12 10:03:34
@@ -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 /Users/admin/pgsql/src/test/regress/expected/privileges.out /Users/admin/pgsql/build/testrun/pg_upgrade/002_pg_...
--- /Users/admin/pgsql/src/test/regress/expected/privileges.out	2024-11-12 09:59:00
+++ /Users/admin/pgsql/build/testrun/pg_upgrade/002_pg_upgrade/data/results/privileges.out	2024-11-12 10:03:34
@@ -1876,1383 +1876,10 @@
 	WHERE sro_ifun(a + 10) > sro_ifun(10);
...

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-12 09:59:00
+++ /Users/admin/pgsql/build/testrun/recovery/027_stream_regress/data/results/brin.out	2024-11-12 10:04:56
@@ -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 /Users/admin/pgsql/src/test/regress/expected/privileges.out /Users/admin/pgsql/build/testrun/recovery/027_strea...
--- /Users/admin/pgsql/src/test/regress/expected/privileges.out	2024-11-12 09:59:00
+++ /Users/admin/pgsql/build/testrun/recovery/027_stream_regress/data/results/privileges.out	2024-11-12 10:04:56
@@ -1841,1418 +1841,11 @@
 DROP INDEX sro_idx;
...

diff -U3 /Users/admin/pgsql/src/test/regress/expected/brin.out /Users/admin/pgsql/build/testrun/regress/regress/results/...
--- /Users/admin/pgsql/src/test/regress/expected/brin.out	2024-11-12 09:59:00
+++ /Users/admin/pgsql/build/testrun/regress/regress/results/brin.out	2024-11-12 10:03:34
@@ -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 /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-12 09:59:00
+++ /Users/admin/pgsql/build/testrun/regress/regress/results/privileges.out	2024-11-12 10:03:34
@@ -1846,1413 +1846,10 @@
 REINDEX TABLE sro_tab;
...

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-12 09:59:13.986322500 +0000
+++ C:/cirrus/build/testrun/pg_upgrade/002_pg_upgrade/data/results/brin.out	2024-11-12 10:02:12.329059800 +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-12 09:59:13.986322500 +0000
+++ C:/cirrus/build/testrun/recovery/027_stream_regress/data/results/brin.out	2024-11-12 10:04:09.037533600 +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-12 09:59:13.986322500 +0000
+++ C:/cirrus/build/testrun/regress/regress/results/brin.out	2024-11-12 10:02:05.252863400 +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 --strip-trailing-cr -U3 C:/cirrus/src/test/regress/expected/privileges.out C:/cirrus/build/testrun/regress/regress/...
--- C:/cirrus/src/test/regress/expected/privileges.out	2024-11-12 09:59:14.117625200 +0000
+++ C:/cirrus/build/testrun/regress/regress/results/privileges.out	2024-11-12 10:02:05.252863400 +0000
@@ -1842,1417 +1842,10 @@
 -- Do the same concurrently
...

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/subselect.out /tmp/cirrus-ci-build/build/testrun/regress/regress...
--- /tmp/cirrus-ci-build/src/test/regress/expected/subselect.out	2024-11-12 04:53:36.516319000 +0000
+++ /tmp/cirrus-ci-build/build/testrun/regress/regress/results/subselect.out	2024-11-12 04:54:46.106647000 +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-12 04:53:46.956644600 +0000
+++ C:/cirrus/build/testrun/regress/regress/results/subselect.out	2024-11-12 04:56:12.390105000 +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/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-11 23:28:17.952799000 +0000
+++ /tmp/cirrus-ci-build/build/testrun/pg_upgrade/002_pg_upgrade/data/results/xml.out	2024-11-11 23:29:44.433792000 +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-11 23:28:17.952799000 +0000
+++ /tmp/cirrus-ci-build/build/testrun/recovery/027_stream_regress/data/results/xml.out	2024-11-11 23:30:36.947497000 +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-11 23:28:17.952799000 +0000
+++ /tmp/cirrus-ci-build/build/testrun/regress/regress/results/xml.out	2024-11-11 23:29:46.021717000 +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-11 23:28:17.619495037 +0000
+++ /tmp/cirrus-ci-build/src/bin/pg_upgrade/tmp_check/results/xml.out	2024-11-11 23:34:03.498769255 +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/recovery/tmp_check/results...
--- /tmp/cirrus-ci-build/src/test/regress/expected/xml.out	2024-11-11 23:28:17.619495037 +0000
+++ /tmp/cirrus-ci-build/src/test/recovery/tmp_check/results/xml.out	2024-11-11 23:35:20.374683044 +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-11 23:28:17.619495037 +0000
+++ /tmp/cirrus-ci-build/src/test/regress/results/xml.out	2024-11-11 23:31:35.599122210 +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-11 23:28:18.293109732 +0000
+++ /tmp/cirrus-ci-build/build/testrun/pg_upgrade/002_pg_upgrade/data/results/xml.out	2024-11-11 23:30:54.622963511 +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-11 23:28:18.293109732 +0000
+++ /tmp/cirrus-ci-build/build/testrun/recovery/027_stream_regress/data/results/xml.out	2024-11-11 23:31:37.402727388 +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-11 23:28:18.293109732 +0000
+++ /tmp/cirrus-ci-build/build/testrun/regress/regress/results/xml.out	2024-11-11 23:30:46.971003029 +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/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-11 21:06:53.471125002 +0000
+++ /tmp/cirrus-ci-build/build/testrun/postgres_fdw/regress/results/query_cancel.out	2024-11-11 21:13:38.191880031 +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/indexing.out /tmp/cirrus-ci-build/build/testrun/pg_upgrade/002_p...
--- /tmp/cirrus-ci-build/src/test/regress/expected/indexing.out	2024-11-11 20:54:26.522771000 +0000
+++ /tmp/cirrus-ci-build/build/testrun/pg_upgrade/002_pg_upgrade/data/results/indexing.out	2024-11-11 20:56:15.226197000...
@@ -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-11 20:54:26.522771000 +0000
+++ /tmp/cirrus-ci-build/build/testrun/recovery/027_stream_regress/data/results/indexing.out	2024-11-11 20:56:54.6116210...
@@ -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-11 20:54:26.522771000 +0000
+++ /tmp/cirrus-ci-build/build/testrun/regress/regress/results/indexing.out	2024-11-11 20:56:13.064312000 +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-11 20:54:22.348894372 +0000
+++ /tmp/cirrus-ci-build/src/bin/pg_upgrade/tmp_check/results/indexing.out	2024-11-11 21:01:00.075471785 +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-11 20:54:22.184480405 +0000
+++ /tmp/cirrus-ci-build/src/test/isolation/output_iso/results/partitioned-cic.out	2024-11-11 21:22:15.197186211 +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-11 20:54:22.348894372 +0000
+++ /tmp/cirrus-ci-build/src/test/recovery/tmp_check/results/indexing.out	2024-11-11 21:02:05.764208940 +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-11 20:54:22.348894372 +0000
+++ /tmp/cirrus-ci-build/src/test/regress/results/indexing.out	2024-11-11 20:58:23.530787431 +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-11 20:54:22.425608096 +0000
+++ /tmp/cirrus-ci-build/build/testrun/pg_upgrade/002_pg_upgrade/data/results/indexing.out	2024-11-11 20:57:47.495487846...
@@ -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-11 20:54:22.425608096 +0000
+++ /tmp/cirrus-ci-build/build/testrun/recovery/027_stream_regress/data/results/indexing.out	2024-11-11 20:58:16.9511102...
@@ -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-11 20:54:22.425608096 +0000
+++ /tmp/cirrus-ci-build/build/testrun/regress/regress/results/indexing.out	2024-11-11 20:57:41.839405395 +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-11 20:54:23
+++ /Users/admin/pgsql/build/testrun/pg_upgrade/002_pg_upgrade/data/results/indexing.out	2024-11-11 20:56:53
@@ -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-11 20:54:23
+++ /Users/admin/pgsql/build/testrun/recovery/027_stream_regress/data/results/indexing.out	2024-11-11 20:58:00
@@ -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-11 20:54:23
+++ /Users/admin/pgsql/build/testrun/regress/regress/results/indexing.out	2024-11-11 20:56: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 --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-11 20:54:53.327362400 +0000
+++ C:/cirrus/build/testrun/pg_upgrade/002_pg_upgrade/data/results/indexing.out	2024-11-11 20:58:43.785151700 +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-11 20:54:53.327362400 +0000
+++ C:/cirrus/build/testrun/recovery/027_stream_regress/data/results/indexing.out	2024-11-11 21:00:57.025545800 +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-11 20:54:53.327362400 +0000
+++ C:/cirrus/build/testrun/regress/regress/results/indexing.out	2024-11-11 20:58:36.741195200 +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-11 19:15:08.522425107 +0000
+++ /tmp/cirrus-ci-build/build-32/testrun/pg_upgrade/002_pg_upgrade/data/results/jsonb_jsonpath.out	2024-11-11 19:21:20....
@@ -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-11 19:15:08.522425107 +0000
+++ /tmp/cirrus-ci-build/build-32/testrun/recovery/027_stream_regress/data/results/jsonb_jsonpath.out	2024-11-11 19:21:5...
@@ -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-11 19:15:08.522425107 +0000
+++ /tmp/cirrus-ci-build/build-32/testrun/regress/regress/results/jsonb_jsonpath.out	2024-11-11 19:21:16.565038894 +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-11 17:03:55.087040000 +0000
+++ /tmp/cirrus-ci-build/build/testrun/btree_gist/regress/results/partitions.out	2024-11-11 17:07:05.142859000 +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-11 17:03:55.089831000 +0000
+++ /tmp/cirrus-ci-build/build/testrun/btree_gist/regress/results/without_overlaps.out	2024-11-11 17:07:05.502781000 +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/src/pl/plperl/expected/plperl_env.out /tmp/cirrus-ci-build/build/testrun/plperl/regress/re...
--- /tmp/cirrus-ci-build/src/pl/plperl/expected/plperl_env.out	2024-11-11 17:03:56.536252000 +0000
+++ /tmp/cirrus-ci-build/build/testrun/plperl/regress/results/plperl_env.out	2024-11-11 17:06:54.783161000 +0000
@@ -49,5 +49,5 @@
    }
 
 $$ LANGUAGE plperl;
-WARNING:  attempted alteration of $ENV{TEST_PLPERL_ENV_FOO} at line 12.
+WARNING:  attempted alteration of $ENV{TEST_PLPERL_ENV_FOO} at line 43.
 NOTICE:  environ unaffected

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-11 17:03:50.729864391 +0000
+++ /tmp/cirrus-ci-build/build/testrun/btree_gist/regress/results/partitions.out	2024-11-11 17:08:53.639451335 +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-11 17:03:50.733874321 +0000
+++ /tmp/cirrus-ci-build/build/testrun/btree_gist/regress/results/without_overlaps.out	2024-11-11 17:08:53.819451426 +00...
@@ -9,7 +9,6 @@
   CONSTRAINT temporal_rng_pk PRIMARY KEY (id, valid_at WITHOUT OVERLAPS)
 );
...

diff -U3 /tmp/cirrus-ci-build/src/pl/plperl/expected/plperl_env.out /tmp/cirrus-ci-build/build/testrun/plperl/regress/re...
--- /tmp/cirrus-ci-build/src/pl/plperl/expected/plperl_env.out	2024-11-11 17:03:52.373411140 +0000
+++ /tmp/cirrus-ci-build/build/testrun/plperl/regress/results/plperl_env.out	2024-11-11 17:08:43.739448543 +0000
@@ -49,5 +49,5 @@
    }
 
 $$ LANGUAGE plperl;
-WARNING:  attempted alteration of $ENV{TEST_PLPERL_ENV_FOO} at line 12.
+WARNING:  attempted alteration of $ENV{TEST_PLPERL_ENV_FOO} at line 43.
 NOTICE:  environ unaffected

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-11 17:04:03.535993700 +0000
+++ C:/cirrus/build/testrun/btree_gist/regress/results/partitions.out	2024-11-11 17:10:36.924249400 +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-11 17:04:03.548259000 +0000
+++ C:/cirrus/build/testrun/btree_gist/regress/results/without_overlaps.out	2024-11-11 17:10:38.706479800 +0000
@@ -9,7 +9,6 @@
   CONSTRAINT temporal_rng_pk PRIMARY KEY (id, valid_at WITHOUT OVERLAPS)
 );
...

diff --strip-trailing-cr -U3 C:/cirrus/src/pl/plperl/expected/plperl_env.out C:/cirrus/build/testrun/plperl/regress/resu...
--- C:/cirrus/src/pl/plperl/expected/plperl_env.out	2024-11-11 17:04:07.504654800 +0000
+++ C:/cirrus/build/testrun/plperl/regress/results/plperl_env.out	2024-11-11 17:09:47.367128700 +0000
@@ -49,5 +49,5 @@
    }
 
 $$ LANGUAGE plperl;
-WARNING:  attempted alteration of $ENV{TEST_PLPERL_ENV_FOO} at line 12.
+WARNING:  attempted alteration of $ENV{TEST_PLPERL_ENV_FOO} at line 43.
 NOTICE:  environ unaffected

diff -U3 /tmp/cirrus-ci-build/src/pl/plperl/expected/plperl_env.out /tmp/cirrus-ci-build/build/testrun/plperl/regress/re...
--- /tmp/cirrus-ci-build/src/pl/plperl/expected/plperl_env.out	2024-11-11 16:53:52.591046000 +0000
+++ /tmp/cirrus-ci-build/build/testrun/plperl/regress/results/plperl_env.out	2024-11-11 16:56:10.870599000 +0000
@@ -49,5 +49,5 @@
    }
 
 $$ LANGUAGE plperl;
-WARNING:  attempted alteration of $ENV{TEST_PLPERL_ENV_FOO} at line 12.
+WARNING:  attempted alteration of $ENV{TEST_PLPERL_ENV_FOO} at line 43.
 NOTICE:  environ unaffected

diff -U3 /tmp/cirrus-ci-build/src/pl/plperl/expected/plperl_env.out /tmp/cirrus-ci-build/build/testrun/plperl/regress/re...
--- /tmp/cirrus-ci-build/src/pl/plperl/expected/plperl_env.out	2024-11-11 16:53:50.133852331 +0000
+++ /tmp/cirrus-ci-build/build/testrun/plperl/regress/results/plperl_env.out	2024-11-11 16:58:28.670392594 +0000
@@ -49,5 +49,5 @@
    }
 
 $$ LANGUAGE plperl;
-WARNING:  attempted alteration of $ENV{TEST_PLPERL_ENV_FOO} at line 12.
+WARNING:  attempted alteration of $ENV{TEST_PLPERL_ENV_FOO} at line 43.
 NOTICE:  environ unaffected

diff --strip-trailing-cr -U3 C:/cirrus/src/pl/plperl/expected/plperl_env.out C:/cirrus/build/testrun/plperl/regress/resu...
--- C:/cirrus/src/pl/plperl/expected/plperl_env.out	2024-11-11 16:54:09.302421000 +0000
+++ C:/cirrus/build/testrun/plperl/regress/results/plperl_env.out	2024-11-11 16:59:57.641811100 +0000
@@ -49,5 +49,5 @@
    }
 
 $$ LANGUAGE plperl;
-WARNING:  attempted alteration of $ENV{TEST_PLPERL_ENV_FOO} at line 12.
+WARNING:  attempted alteration of $ENV{TEST_PLPERL_ENV_FOO} at line 43.
 NOTICE:  environ unaffected

diff -U3 /tmp/cirrus-ci-build/src/pl/plperl/expected/plperl_env.out /tmp/cirrus-ci-build/build/testrun/plperl/regress/re...
--- /tmp/cirrus-ci-build/src/pl/plperl/expected/plperl_env.out	2024-11-11 16:30:48.559197000 +0000
+++ /tmp/cirrus-ci-build/build/testrun/plperl/regress/results/plperl_env.out	2024-11-11 16:33:27.213492000 +0000
@@ -49,5 +49,5 @@
    }
 
 $$ LANGUAGE plperl;
-WARNING:  attempted alteration of $ENV{TEST_PLPERL_ENV_FOO} at line 12.
+WARNING:  attempted alteration of $ENV{TEST_PLPERL_ENV_FOO} at line 43.
 NOTICE:  environ unaffected

diff -U3 /tmp/cirrus-ci-build/src/pl/plperl/expected/plperl_env.out /tmp/cirrus-ci-build/build/testrun/plperl/regress/re...
--- /tmp/cirrus-ci-build/src/pl/plperl/expected/plperl_env.out	2024-11-11 16:30:47.457895840 +0000
+++ /tmp/cirrus-ci-build/build/testrun/plperl/regress/results/plperl_env.out	2024-11-11 16:36:12.080388134 +0000
@@ -49,5 +49,5 @@
    }
 
 $$ LANGUAGE plperl;
-WARNING:  attempted alteration of $ENV{TEST_PLPERL_ENV_FOO} at line 12.
+WARNING:  attempted alteration of $ENV{TEST_PLPERL_ENV_FOO} at line 43.
 NOTICE:  environ unaffected

diff -U3 /Users/admin/pgsql/src/pl/plperl/expected/plperl_env.out /Users/admin/pgsql/build/testrun/plperl/regress/result...
--- /Users/admin/pgsql/src/pl/plperl/expected/plperl_env.out	2024-11-11 16:30:44
+++ /Users/admin/pgsql/build/testrun/plperl/regress/results/plperl_env.out	2024-11-11 16:34:39
@@ -49,5 +49,5 @@
    }
 
 $$ LANGUAGE plperl;
-WARNING:  attempted alteration of $ENV{TEST_PLPERL_ENV_FOO} at line 12.
+WARNING:  attempted alteration of $ENV{TEST_PLPERL_ENV_FOO} at line 43.
 NOTICE:  environ unaffected

diff --strip-trailing-cr -U3 C:/cirrus/src/pl/plperl/expected/plperl_env.out C:/cirrus/build/testrun/plperl/regress/resu...
--- C:/cirrus/src/pl/plperl/expected/plperl_env.out	2024-11-11 16:31:05.074156500 +0000
+++ C:/cirrus/build/testrun/plperl/regress/results/plperl_env.out	2024-11-11 16:36:25.294936100 +0000
@@ -49,5 +49,5 @@
    }
 
 $$ LANGUAGE plperl;
-WARNING:  attempted alteration of $ENV{TEST_PLPERL_ENV_FOO} at line 12.
+WARNING:  attempted alteration of $ENV{TEST_PLPERL_ENV_FOO} at line 43.
 NOTICE:  environ unaffected

diff -U3 /tmp/cirrus-ci-build/src/pl/plperl/expected/plperl_env.out /tmp/cirrus-ci-build/build/testrun/plperl/regress/re...
--- /tmp/cirrus-ci-build/src/pl/plperl/expected/plperl_env.out	2024-11-11 16:16:12.801277000 +0000
+++ /tmp/cirrus-ci-build/build/testrun/plperl/regress/results/plperl_env.out	2024-11-11 16:18:06.781176000 +0000
@@ -49,5 +49,5 @@
    }
 
 $$ LANGUAGE plperl;
-WARNING:  attempted alteration of $ENV{TEST_PLPERL_ENV_FOO} at line 12.
+WARNING:  attempted alteration of $ENV{TEST_PLPERL_ENV_FOO} at line 43.
 NOTICE:  environ unaffected

diff -U3 /tmp/cirrus-ci-build/src/pl/plperl/expected/plperl_env.out /tmp/cirrus-ci-build/build/testrun/plperl/regress/re...
--- /tmp/cirrus-ci-build/src/pl/plperl/expected/plperl_env.out	2024-11-11 16:16:12.198921369 +0000
+++ /tmp/cirrus-ci-build/build/testrun/plperl/regress/results/plperl_env.out	2024-11-11 16:18:54.133973514 +0000
@@ -49,5 +49,5 @@
    }
 
 $$ LANGUAGE plperl;
-WARNING:  attempted alteration of $ENV{TEST_PLPERL_ENV_FOO} at line 12.
+WARNING:  attempted alteration of $ENV{TEST_PLPERL_ENV_FOO} at line 43.
 NOTICE:  environ unaffected

diff -U3 /Users/admin/pgsql/src/pl/plperl/expected/plperl_env.out /Users/admin/pgsql/build/testrun/plperl/regress/result...
--- /Users/admin/pgsql/src/pl/plperl/expected/plperl_env.out	2024-11-11 16:16:07
+++ /Users/admin/pgsql/build/testrun/plperl/regress/results/plperl_env.out	2024-11-11 16:19:22
@@ -49,5 +49,5 @@
    }
 
 $$ LANGUAGE plperl;
-WARNING:  attempted alteration of $ENV{TEST_PLPERL_ENV_FOO} at line 12.
+WARNING:  attempted alteration of $ENV{TEST_PLPERL_ENV_FOO} at line 43.
 NOTICE:  environ unaffected

diff --strip-trailing-cr -U3 C:/cirrus/src/pl/plperl/expected/plperl_env.out C:/cirrus/build/testrun/plperl/regress/resu...
--- C:/cirrus/src/pl/plperl/expected/plperl_env.out	2024-11-11 16:16:25.550076900 +0000
+++ C:/cirrus/build/testrun/plperl/regress/results/plperl_env.out	2024-11-11 16:22:30.057989000 +0000
@@ -49,5 +49,5 @@
    }
 
 $$ LANGUAGE plperl;
-WARNING:  attempted alteration of $ENV{TEST_PLPERL_ENV_FOO} at line 12.
+WARNING:  attempted alteration of $ENV{TEST_PLPERL_ENV_FOO} at line 43.
 NOTICE:  environ unaffected

diff -U3 /tmp/cirrus-ci-build/src/pl/plperl/expected/plperl_env.out /tmp/cirrus-ci-build/build/testrun/plperl/regress/re...
--- /tmp/cirrus-ci-build/src/pl/plperl/expected/plperl_env.out	2024-11-11 16:05:47.470929000 +0000
+++ /tmp/cirrus-ci-build/build/testrun/plperl/regress/results/plperl_env.out	2024-11-11 16:07:46.266131000 +0000
@@ -49,5 +49,5 @@
    }
 
 $$ LANGUAGE plperl;
-WARNING:  attempted alteration of $ENV{TEST_PLPERL_ENV_FOO} at line 12.
+WARNING:  attempted alteration of $ENV{TEST_PLPERL_ENV_FOO} at line 43.
 NOTICE:  environ unaffected

diff -U3 /tmp/cirrus-ci-build/src/pl/plperl/expected/plperl_env.out /tmp/cirrus-ci-build/build/testrun/plperl/regress/re...
--- /tmp/cirrus-ci-build/src/pl/plperl/expected/plperl_env.out	2024-11-11 16:05:43.372715490 +0000
+++ /tmp/cirrus-ci-build/build/testrun/plperl/regress/results/plperl_env.out	2024-11-11 16:08:25.029904617 +0000
@@ -49,5 +49,5 @@
    }
 
 $$ LANGUAGE plperl;
-WARNING:  attempted alteration of $ENV{TEST_PLPERL_ENV_FOO} at line 12.
+WARNING:  attempted alteration of $ENV{TEST_PLPERL_ENV_FOO} at line 43.
 NOTICE:  environ unaffected

diff -U3 /Users/admin/pgsql/src/pl/plperl/expected/plperl_env.out /Users/admin/pgsql/build/testrun/plperl/regress/result...
--- /Users/admin/pgsql/src/pl/plperl/expected/plperl_env.out	2024-11-11 16:04:18
+++ /Users/admin/pgsql/build/testrun/plperl/regress/results/plperl_env.out	2024-11-11 16:07:29
@@ -49,5 +49,5 @@
    }
 
 $$ LANGUAGE plperl;
-WARNING:  attempted alteration of $ENV{TEST_PLPERL_ENV_FOO} at line 12.
+WARNING:  attempted alteration of $ENV{TEST_PLPERL_ENV_FOO} at line 43.
 NOTICE:  environ unaffected

diff --strip-trailing-cr -U3 C:/cirrus/src/pl/plperl/expected/plperl_env.out C:/cirrus/build/testrun/plperl/regress/resu...
--- C:/cirrus/src/pl/plperl/expected/plperl_env.out	2024-11-11 16:06:09.625333200 +0000
+++ C:/cirrus/build/testrun/plperl/regress/results/plperl_env.out	2024-11-11 16:11:59.120994300 +0000
@@ -49,5 +49,5 @@
    }
 
 $$ LANGUAGE plperl;
-WARNING:  attempted alteration of $ENV{TEST_PLPERL_ENV_FOO} at line 12.
+WARNING:  attempted alteration of $ENV{TEST_PLPERL_ENV_FOO} at line 43.
 NOTICE:  environ unaffected

diff -U3 /tmp/cirrus-ci-build/src/pl/plperl/expected/plperl_env.out /tmp/cirrus-ci-build/build/testrun/plperl/regress/re...
--- /tmp/cirrus-ci-build/src/pl/plperl/expected/plperl_env.out	2024-11-11 15:52:39.145698000 +0000
+++ /tmp/cirrus-ci-build/build/testrun/plperl/regress/results/plperl_env.out	2024-11-11 15:55:45.216473000 +0000
@@ -49,5 +49,5 @@
    }
 
 $$ LANGUAGE plperl;
-WARNING:  attempted alteration of $ENV{TEST_PLPERL_ENV_FOO} at line 12.
+WARNING:  attempted alteration of $ENV{TEST_PLPERL_ENV_FOO} at line 43.
 NOTICE:  environ unaffected

diff -U3 /tmp/cirrus-ci-build/src/pl/plperl/expected/plperl_env.out /tmp/cirrus-ci-build/build/testrun/plperl/regress/re...
--- /tmp/cirrus-ci-build/src/pl/plperl/expected/plperl_env.out	2024-11-11 15:52:33.237486408 +0000
+++ /tmp/cirrus-ci-build/build/testrun/plperl/regress/results/plperl_env.out	2024-11-11 15:58:33.035605220 +0000
@@ -49,5 +49,5 @@
    }
 
 $$ LANGUAGE plperl;
-WARNING:  attempted alteration of $ENV{TEST_PLPERL_ENV_FOO} at line 12.
+WARNING:  attempted alteration of $ENV{TEST_PLPERL_ENV_FOO} at line 43.
 NOTICE:  environ unaffected

diff -U3 /Users/admin/pgsql/src/pl/plperl/expected/plperl_env.out /Users/admin/pgsql/build/testrun/plperl/regress/result...
--- /Users/admin/pgsql/src/pl/plperl/expected/plperl_env.out	2024-11-11 15:52:32
+++ /Users/admin/pgsql/build/testrun/plperl/regress/results/plperl_env.out	2024-11-11 15:56:25
@@ -49,5 +49,5 @@
    }
 
 $$ LANGUAGE plperl;
-WARNING:  attempted alteration of $ENV{TEST_PLPERL_ENV_FOO} at line 12.
+WARNING:  attempted alteration of $ENV{TEST_PLPERL_ENV_FOO} at line 43.
 NOTICE:  environ unaffected

diff --strip-trailing-cr -U3 C:/cirrus/src/pl/plperl/expected/plperl_env.out C:/cirrus/build/testrun/plperl/regress/resu...
--- C:/cirrus/src/pl/plperl/expected/plperl_env.out	2024-11-11 15:52:49.057736300 +0000
+++ C:/cirrus/build/testrun/plperl/regress/results/plperl_env.out	2024-11-11 15:58:03.555106200 +0000
@@ -49,5 +49,5 @@
    }
 
 $$ LANGUAGE plperl;
-WARNING:  attempted alteration of $ENV{TEST_PLPERL_ENV_FOO} at line 12.
+WARNING:  attempted alteration of $ENV{TEST_PLPERL_ENV_FOO} at line 43.
 NOTICE:  environ unaffected

diff -U3 /tmp/cirrus-ci-build/src/pl/plperl/expected/plperl_env.out /tmp/cirrus-ci-build/build/testrun/plperl/regress/re...
--- /tmp/cirrus-ci-build/src/pl/plperl/expected/plperl_env.out	2024-11-11 15:38:56.332536000 +0000
+++ /tmp/cirrus-ci-build/build/testrun/plperl/regress/results/plperl_env.out	2024-11-11 15:42:05.129307000 +0000
@@ -49,5 +49,5 @@
    }
 
 $$ LANGUAGE plperl;
-WARNING:  attempted alteration of $ENV{TEST_PLPERL_ENV_FOO} at line 12.
+WARNING:  attempted alteration of $ENV{TEST_PLPERL_ENV_FOO} at line 43.
 NOTICE:  environ unaffected

diff -U3 /tmp/cirrus-ci-build/src/pl/plperl/expected/plperl_env.out /tmp/cirrus-ci-build/build/testrun/plperl/regress/re...
--- /tmp/cirrus-ci-build/src/pl/plperl/expected/plperl_env.out	2024-11-11 15:38:53.515181480 +0000
+++ /tmp/cirrus-ci-build/build/testrun/plperl/regress/results/plperl_env.out	2024-11-11 15:44:59.872808940 +0000
@@ -49,5 +49,5 @@
    }
 
 $$ LANGUAGE plperl;
-WARNING:  attempted alteration of $ENV{TEST_PLPERL_ENV_FOO} at line 12.
+WARNING:  attempted alteration of $ENV{TEST_PLPERL_ENV_FOO} at line 43.
 NOTICE:  environ unaffected

diff --strip-trailing-cr -U3 C:/cirrus/src/pl/plperl/expected/plperl_env.out C:/cirrus/build/testrun/plperl/regress/resu...
--- C:/cirrus/src/pl/plperl/expected/plperl_env.out	2024-11-11 15:39:13.483057000 +0000
+++ C:/cirrus/build/testrun/plperl/regress/results/plperl_env.out	2024-11-11 15:45:31.252939200 +0000
@@ -49,5 +49,5 @@
    }
 
 $$ LANGUAGE plperl;
-WARNING:  attempted alteration of $ENV{TEST_PLPERL_ENV_FOO} at line 12.
+WARNING:  attempted alteration of $ENV{TEST_PLPERL_ENV_FOO} at line 43.
 NOTICE:  environ unaffected

diff -U3 /tmp/cirrus-ci-build/src/pl/plperl/expected/plperl_env.out /tmp/cirrus-ci-build/build/testrun/plperl/regress/re...
--- /tmp/cirrus-ci-build/src/pl/plperl/expected/plperl_env.out	2024-11-11 15:29:13.189384000 +0000
+++ /tmp/cirrus-ci-build/build/testrun/plperl/regress/results/plperl_env.out	2024-11-11 15:31:06.743528000 +0000
@@ -49,5 +49,5 @@
    }
 
 $$ LANGUAGE plperl;
-WARNING:  attempted alteration of $ENV{TEST_PLPERL_ENV_FOO} at line 12.
+WARNING:  attempted alteration of $ENV{TEST_PLPERL_ENV_FOO} at line 43.
 NOTICE:  environ unaffected

diff -U3 /tmp/cirrus-ci-build/src/pl/plperl/expected/plperl_env.out /tmp/cirrus-ci-build/build/testrun/plperl/regress/re...
--- /tmp/cirrus-ci-build/src/pl/plperl/expected/plperl_env.out	2024-11-11 15:29:10.214895545 +0000
+++ /tmp/cirrus-ci-build/build/testrun/plperl/regress/results/plperl_env.out	2024-11-11 15:31:48.719328561 +0000
@@ -49,5 +49,5 @@
    }
 
 $$ LANGUAGE plperl;
-WARNING:  attempted alteration of $ENV{TEST_PLPERL_ENV_FOO} at line 12.
+WARNING:  attempted alteration of $ENV{TEST_PLPERL_ENV_FOO} at line 43.
 NOTICE:  environ unaffected

diff --strip-trailing-cr -U3 C:/cirrus/src/pl/plperl/expected/plperl_env.out C:/cirrus/build/testrun/plperl/regress/resu...
--- C:/cirrus/src/pl/plperl/expected/plperl_env.out	2024-11-11 15:29:24.715233700 +0000
+++ C:/cirrus/build/testrun/plperl/regress/results/plperl_env.out	2024-11-11 15:34:53.599964900 +0000
@@ -49,5 +49,5 @@
    }
 
 $$ LANGUAGE plperl;
-WARNING:  attempted alteration of $ENV{TEST_PLPERL_ENV_FOO} at line 12.
+WARNING:  attempted alteration of $ENV{TEST_PLPERL_ENV_FOO} at line 43.
 NOTICE:  environ unaffected

diff -U3 /tmp/cirrus-ci-build/src/pl/plperl/expected/plperl_env.out /tmp/cirrus-ci-build/build/testrun/plperl/regress/re...
--- /tmp/cirrus-ci-build/src/pl/plperl/expected/plperl_env.out	2024-11-11 15:15:14.043715000 +0000
+++ /tmp/cirrus-ci-build/build/testrun/plperl/regress/results/plperl_env.out	2024-11-11 15:17:04.617309000 +0000
@@ -49,5 +49,5 @@
    }
 
 $$ LANGUAGE plperl;
-WARNING:  attempted alteration of $ENV{TEST_PLPERL_ENV_FOO} at line 12.
+WARNING:  attempted alteration of $ENV{TEST_PLPERL_ENV_FOO} at line 43.
 NOTICE:  environ unaffected

diff -U3 /tmp/cirrus-ci-build/src/pl/plperl/expected/plperl_env.out /tmp/cirrus-ci-build/build/testrun/plperl/regress/re...
--- /tmp/cirrus-ci-build/src/pl/plperl/expected/plperl_env.out	2024-11-11 15:15:14.490009538 +0000
+++ /tmp/cirrus-ci-build/build/testrun/plperl/regress/results/plperl_env.out	2024-11-11 15:18:03.136325694 +0000
@@ -49,5 +49,5 @@
    }
 
 $$ LANGUAGE plperl;
-WARNING:  attempted alteration of $ENV{TEST_PLPERL_ENV_FOO} at line 12.
+WARNING:  attempted alteration of $ENV{TEST_PLPERL_ENV_FOO} at line 43.
 NOTICE:  environ unaffected

diff -U3 /Users/admin/pgsql/src/pl/plperl/expected/plperl_env.out /Users/admin/pgsql/build/testrun/plperl/regress/result...
--- /Users/admin/pgsql/src/pl/plperl/expected/plperl_env.out	2024-11-11 15:15:12
+++ /Users/admin/pgsql/build/testrun/plperl/regress/results/plperl_env.out	2024-11-11 15:18:37
@@ -49,5 +49,5 @@
    }
 
 $$ LANGUAGE plperl;
-WARNING:  attempted alteration of $ENV{TEST_PLPERL_ENV_FOO} at line 12.
+WARNING:  attempted alteration of $ENV{TEST_PLPERL_ENV_FOO} at line 43.
 NOTICE:  environ unaffected

diff --strip-trailing-cr -U3 C:/cirrus/src/pl/plperl/expected/plperl_env.out C:/cirrus/build/testrun/plperl/regress/resu...
--- C:/cirrus/src/pl/plperl/expected/plperl_env.out	2024-11-11 15:15:24.128057400 +0000
+++ C:/cirrus/build/testrun/plperl/regress/results/plperl_env.out	2024-11-11 15:21:12.946951500 +0000
@@ -49,5 +49,5 @@
    }
 
 $$ LANGUAGE plperl;
-WARNING:  attempted alteration of $ENV{TEST_PLPERL_ENV_FOO} at line 12.
+WARNING:  attempted alteration of $ENV{TEST_PLPERL_ENV_FOO} at line 43.
 NOTICE:  environ unaffected

diff -U3 /tmp/cirrus-ci-build/src/pl/plperl/expected/plperl_env.out /tmp/cirrus-ci-build/build/testrun/plperl/regress/re...
--- /tmp/cirrus-ci-build/src/pl/plperl/expected/plperl_env.out	2024-11-11 15:11:28.757638000 +0000
+++ /tmp/cirrus-ci-build/build/testrun/plperl/regress/results/plperl_env.out	2024-11-11 15:13:35.597585000 +0000
@@ -49,5 +49,5 @@
    }
 
 $$ LANGUAGE plperl;
-WARNING:  attempted alteration of $ENV{TEST_PLPERL_ENV_FOO} at line 12.
+WARNING:  attempted alteration of $ENV{TEST_PLPERL_ENV_FOO} at line 43.
 NOTICE:  environ unaffected

diff -U3 /tmp/cirrus-ci-build/src/pl/plperl/expected/plperl_env.out /tmp/cirrus-ci-build/build/testrun/plperl/regress/re...
--- /tmp/cirrus-ci-build/src/pl/plperl/expected/plperl_env.out	2024-11-11 15:11:24.422464088 +0000
+++ /tmp/cirrus-ci-build/build/testrun/plperl/regress/results/plperl_env.out	2024-11-11 15:14:38.667723078 +0000
@@ -49,5 +49,5 @@
    }
 
 $$ LANGUAGE plperl;
-WARNING:  attempted alteration of $ENV{TEST_PLPERL_ENV_FOO} at line 12.
+WARNING:  attempted alteration of $ENV{TEST_PLPERL_ENV_FOO} at line 43.
 NOTICE:  environ unaffected

diff --strip-trailing-cr -U3 C:/cirrus/src/pl/plperl/expected/plperl_env.out C:/cirrus/build/testrun/plperl/regress/resu...
--- C:/cirrus/src/pl/plperl/expected/plperl_env.out	2024-11-11 15:11:44.008037800 +0000
+++ C:/cirrus/build/testrun/plperl/regress/results/plperl_env.out	2024-11-11 15:17:30.089807200 +0000
@@ -49,5 +49,5 @@
    }
 
 $$ LANGUAGE plperl;
-WARNING:  attempted alteration of $ENV{TEST_PLPERL_ENV_FOO} at line 12.
+WARNING:  attempted alteration of $ENV{TEST_PLPERL_ENV_FOO} at line 43.
 NOTICE:  environ unaffected

diff -U3 /tmp/cirrus-ci-build/src/pl/plperl/expected/plperl_env.out /tmp/cirrus-ci-build/build/testrun/plperl/regress/re...
--- /tmp/cirrus-ci-build/src/pl/plperl/expected/plperl_env.out	2024-11-11 14:54:41.164262000 +0000
+++ /tmp/cirrus-ci-build/build/testrun/plperl/regress/results/plperl_env.out	2024-11-11 14:56:42.191943000 +0000
@@ -49,5 +49,5 @@
    }
 
 $$ LANGUAGE plperl;
-WARNING:  attempted alteration of $ENV{TEST_PLPERL_ENV_FOO} at line 12.
+WARNING:  attempted alteration of $ENV{TEST_PLPERL_ENV_FOO} at line 43.
 NOTICE:  environ unaffected

diff -U3 /tmp/cirrus-ci-build/src/pl/plperl/expected/plperl_env.out /tmp/cirrus-ci-build/build/testrun/plperl/regress/re...
--- /tmp/cirrus-ci-build/src/pl/plperl/expected/plperl_env.out	2024-11-11 14:54:44.348125192 +0000
+++ /tmp/cirrus-ci-build/build/testrun/plperl/regress/results/plperl_env.out	2024-11-11 14:57:34.963638437 +0000
@@ -49,5 +49,5 @@
    }
 
 $$ LANGUAGE plperl;
-WARNING:  attempted alteration of $ENV{TEST_PLPERL_ENV_FOO} at line 12.
+WARNING:  attempted alteration of $ENV{TEST_PLPERL_ENV_FOO} at line 43.
 NOTICE:  environ unaffected

diff -U3 /Users/admin/pgsql/src/pl/plperl/expected/plperl_env.out /Users/admin/pgsql/build/testrun/plperl/regress/result...
--- /Users/admin/pgsql/src/pl/plperl/expected/plperl_env.out	2024-11-11 14:54:36
+++ /Users/admin/pgsql/build/testrun/plperl/regress/results/plperl_env.out	2024-11-11 14:57:48
@@ -49,5 +49,5 @@
    }
 
 $$ LANGUAGE plperl;
-WARNING:  attempted alteration of $ENV{TEST_PLPERL_ENV_FOO} at line 12.
+WARNING:  attempted alteration of $ENV{TEST_PLPERL_ENV_FOO} at line 43.
 NOTICE:  environ unaffected

diff --strip-trailing-cr -U3 C:/cirrus/src/pl/plperl/expected/plperl_env.out C:/cirrus/build/testrun/plperl/regress/resu...
--- C:/cirrus/src/pl/plperl/expected/plperl_env.out	2024-11-11 14:54:54.466634000 +0000
+++ C:/cirrus/build/testrun/plperl/regress/results/plperl_env.out	2024-11-11 15:00:47.483586700 +0000
@@ -49,5 +49,5 @@
    }
 
 $$ LANGUAGE plperl;
-WARNING:  attempted alteration of $ENV{TEST_PLPERL_ENV_FOO} at line 12.
+WARNING:  attempted alteration of $ENV{TEST_PLPERL_ENV_FOO} at line 43.
 NOTICE:  environ unaffected

diff -U3 /tmp/cirrus-ci-build/src/pl/plperl/expected/plperl_env.out /tmp/cirrus-ci-build/build/testrun/plperl/regress/re...
--- /tmp/cirrus-ci-build/src/pl/plperl/expected/plperl_env.out	2024-11-11 14:51:40.014541000 +0000
+++ /tmp/cirrus-ci-build/build/testrun/plperl/regress/results/plperl_env.out	2024-11-11 14:53:44.668749000 +0000
@@ -49,5 +49,5 @@
    }
 
 $$ LANGUAGE plperl;
-WARNING:  attempted alteration of $ENV{TEST_PLPERL_ENV_FOO} at line 12.
+WARNING:  attempted alteration of $ENV{TEST_PLPERL_ENV_FOO} at line 43.
 NOTICE:  environ unaffected

diff -U3 /tmp/cirrus-ci-build/src/pl/plperl/expected/plperl_env.out /tmp/cirrus-ci-build/build/testrun/plperl/regress/re...
--- /tmp/cirrus-ci-build/src/pl/plperl/expected/plperl_env.out	2024-11-11 14:51:40.187360423 +0000
+++ /tmp/cirrus-ci-build/build/testrun/plperl/regress/results/plperl_env.out	2024-11-11 14:54:24.340110343 +0000
@@ -49,5 +49,5 @@
    }
 
 $$ LANGUAGE plperl;
-WARNING:  attempted alteration of $ENV{TEST_PLPERL_ENV_FOO} at line 12.
+WARNING:  attempted alteration of $ENV{TEST_PLPERL_ENV_FOO} at line 43.
 NOTICE:  environ unaffected

diff --strip-trailing-cr -U3 C:/cirrus/src/pl/plperl/expected/plperl_env.out C:/cirrus/build/testrun/plperl/regress/resu...
--- C:/cirrus/src/pl/plperl/expected/plperl_env.out	2024-11-11 14:51:51.151577300 +0000
+++ C:/cirrus/build/testrun/plperl/regress/results/plperl_env.out	2024-11-11 14:57:30.209535700 +0000
@@ -49,5 +49,5 @@
    }
 
 $$ LANGUAGE plperl;
-WARNING:  attempted alteration of $ENV{TEST_PLPERL_ENV_FOO} at line 12.
+WARNING:  attempted alteration of $ENV{TEST_PLPERL_ENV_FOO} at line 43.
 NOTICE:  environ unaffected

diff -U3 /tmp/cirrus-ci-build/src/pl/plperl/expected/plperl_env.out /tmp/cirrus-ci-build/build/testrun/plperl/regress/re...
--- /tmp/cirrus-ci-build/src/pl/plperl/expected/plperl_env.out	2024-11-11 14:36:49.480058000 +0000
+++ /tmp/cirrus-ci-build/build/testrun/plperl/regress/results/plperl_env.out	2024-11-11 14:38:56.049196000 +0000
@@ -49,5 +49,5 @@
    }
 
 $$ LANGUAGE plperl;
-WARNING:  attempted alteration of $ENV{TEST_PLPERL_ENV_FOO} at line 12.
+WARNING:  attempted alteration of $ENV{TEST_PLPERL_ENV_FOO} at line 43.
 NOTICE:  environ unaffected

diff -U3 /tmp/cirrus-ci-build/src/pl/plperl/expected/plperl_env.out /tmp/cirrus-ci-build/build/testrun/plperl/regress/re...
--- /tmp/cirrus-ci-build/src/pl/plperl/expected/plperl_env.out	2024-11-11 14:36:47.942445070 +0000
+++ /tmp/cirrus-ci-build/build/testrun/plperl/regress/results/plperl_env.out	2024-11-11 14:40:23.993052037 +0000
@@ -49,5 +49,5 @@
    }
 
 $$ LANGUAGE plperl;
-WARNING:  attempted alteration of $ENV{TEST_PLPERL_ENV_FOO} at line 12.
+WARNING:  attempted alteration of $ENV{TEST_PLPERL_ENV_FOO} at line 43.
 NOTICE:  environ unaffected

diff --strip-trailing-cr -U3 C:/cirrus/src/pl/plperl/expected/plperl_env.out C:/cirrus/build/testrun/plperl/regress/resu...
--- C:/cirrus/src/pl/plperl/expected/plperl_env.out	2024-11-11 14:37:04.586366400 +0000
+++ C:/cirrus/build/testrun/plperl/regress/results/plperl_env.out	2024-11-11 14:43:01.548411000 +0000
@@ -49,5 +49,5 @@
    }
 
 $$ LANGUAGE plperl;
-WARNING:  attempted alteration of $ENV{TEST_PLPERL_ENV_FOO} at line 12.
+WARNING:  attempted alteration of $ENV{TEST_PLPERL_ENV_FOO} at line 43.
 NOTICE:  environ unaffected

diff -U3 /tmp/cirrus-ci-build/src/pl/plperl/expected/plperl_env.out /tmp/cirrus-ci-build/build/testrun/plperl/regress/re...
--- /tmp/cirrus-ci-build/src/pl/plperl/expected/plperl_env.out	2024-11-11 14:29:17.749484000 +0000
+++ /tmp/cirrus-ci-build/build/testrun/plperl/regress/results/plperl_env.out	2024-11-11 14:31:20.696985000 +0000
@@ -49,5 +49,5 @@
    }
 
 $$ LANGUAGE plperl;
-WARNING:  attempted alteration of $ENV{TEST_PLPERL_ENV_FOO} at line 12.
+WARNING:  attempted alteration of $ENV{TEST_PLPERL_ENV_FOO} at line 43.
 NOTICE:  environ unaffected

diff -U3 /tmp/cirrus-ci-build/src/pl/plperl/expected/plperl_env.out /tmp/cirrus-ci-build/build/testrun/plperl/regress/re...
--- /tmp/cirrus-ci-build/src/pl/plperl/expected/plperl_env.out	2024-11-11 14:29:15.767154632 +0000
+++ /tmp/cirrus-ci-build/build/testrun/plperl/regress/results/plperl_env.out	2024-11-11 14:32:01.274028009 +0000
@@ -49,5 +49,5 @@
    }
 
 $$ LANGUAGE plperl;
-WARNING:  attempted alteration of $ENV{TEST_PLPERL_ENV_FOO} at line 12.
+WARNING:  attempted alteration of $ENV{TEST_PLPERL_ENV_FOO} at line 43.
 NOTICE:  environ unaffected

diff --strip-trailing-cr -U3 C:/cirrus/src/pl/plperl/expected/plperl_env.out C:/cirrus/build/testrun/plperl/regress/resu...
--- C:/cirrus/src/pl/plperl/expected/plperl_env.out	2024-11-11 14:29:27.147648400 +0000
+++ C:/cirrus/build/testrun/plperl/regress/results/plperl_env.out	2024-11-11 14:35:21.076570600 +0000
@@ -49,5 +49,5 @@
    }
 
 $$ LANGUAGE plperl;
-WARNING:  attempted alteration of $ENV{TEST_PLPERL_ENV_FOO} at line 12.
+WARNING:  attempted alteration of $ENV{TEST_PLPERL_ENV_FOO} at line 43.
 NOTICE:  environ unaffected

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-11 08:51:22.035488000 +0000
+++ /tmp/cirrus-ci-build/build/testrun/pg_upgrade/002_pg_upgrade/data/results/alter_table.out	2024-11-11 08:53:53.745408...
@@ -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        
+-------+------------+---------------+-------------+----------------------
+ 39722 |            |             0 |       39722 | users_id_seq
+ 39728 |            |             0 |       39728 | pg_toast_39723
+ 39729 |            |             0 |       39729 | pg_toast_39723_index
+ 39723 |            |             0 |       39723 | users
+ 39830 |            |             0 |       39830 | foo
+ 39900 |            |             0 |       39900 | forc_test
+ 40351 |            |             0 |       40351 | pg_toast_40348
+ 40352 |            |             0 |       40352 | pg_toast_40348_index
...

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-11 08:51:22.035488000 +0000
+++ /tmp/cirrus-ci-build/build/testrun/recovery/027_stream_regress/data/results/alter_table.out	2024-11-11 08:54:38.2508...
@@ -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        
+-------+------------+---------------+-------------+----------------------
+ 39480 |            |             0 |       39480 | pktable_pkey
+ 39476 |            |             0 |       39476 | pktable
+ 39482 |            |             0 |       39482 | fktable
+ 39954 |            |             0 |       39954 | pg_toast_39945_index
+ 39953 |            |             0 |       39953 | pg_toast_39945
+ 39945 |            |             0 |       39950 | foo
+ 40166 |            |             0 |       40166 | 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-11 08:51:22.035488000 +0000
+++ /tmp/cirrus-ci-build/build/testrun/regress/regress/results/alter_table.out	2024-11-11 08:53:48.802042000 +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        
+-------+------------+---------------+-------------+----------------------
+ 39657 |            |             0 |       39657 | users_id_seq
+ 39663 |            |             0 |       39663 | pg_toast_39658
+ 39664 |            |             0 |       39664 | pg_toast_39658_index
+ 39658 |            |             0 |       39658 | users
+ 39789 |            |             0 |       39789 | foo
+ 40108 |            |             0 |       40108 | forc_test
+ 40565 |            |             0 |       40565 | pg_toast_40562
+ 40566 |            |             0 |       40566 | pg_toast_40562_index
...

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-11 08:51:15.376370889 +0000
+++ /tmp/cirrus-ci-build/src/bin/pg_upgrade/tmp_check/results/alter_table.out	2024-11-11 08:58:41.099701665 +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        
+-------+------------+---------------+-------------+----------------------
+ 39547 |            |             0 |       39547 | pktable_pkey
+ 39540 |            |             0 |       39540 | pktable
+ 39550 |            |             0 |       39550 | fktable
+ 40128 |            |             0 |       40133 | foo
+ 40137 |            |             0 |       40137 | pg_toast_40128_index
+ 40136 |            |             0 |       40136 | pg_toast_40128
+ 40354 |            |             0 |       40354 | old_oids
+ 40372 |            |             0 |       40372 | pg_toast_40369
...

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-11 08:51:15.376370889 +0000
+++ /tmp/cirrus-ci-build/src/test/recovery/tmp_check/results/alter_table.out	2024-11-11 08:59:50.507634778 +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        
+-------+------------+---------------+-------------+----------------------
+ 39559 |            |             0 |       39559 | pktable_pkey
+ 39555 |            |             0 |       39555 | pktable
+ 39562 |            |             0 |       39562 | fktable
+ 40083 |            |             0 |       40088 | foo
+ 40092 |            |             0 |       40092 | pg_toast_40083_index
+ 40091 |            |             0 |       40091 | pg_toast_40083
+ 40362 |            |             0 |       40362 | old_oids
+ 40379 |            |             0 |       40379 | pg_toast_40376
...

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-11 08:51:15.376370889 +0000
+++ /tmp/cirrus-ci-build/src/test/regress/results/alter_table.out	2024-11-11 08:56:12.059777300 +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        
+-------+------------+---------------+-------------+----------------------
+ 39643 |            |             0 |       39643 | pg_toast_39634_index
+ 39634 |            |             0 |       39634 | users
+ 39632 |            |             0 |       39632 | users_id_seq
+ 39642 |            |             0 |       39642 | pg_toast_39634
+ 39878 |            |             0 |       39878 | foo
+ 40066 |            |             0 |       40066 | forc_test
+ 39537 |            |             0 |       39537 | pktable_pkey
+ 39533 |            |             0 |       39533 | pktable
...

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-11 08:51:16.809441093 +0000
+++ /tmp/cirrus-ci-build/build/testrun/pg_upgrade/002_pg_upgrade/data/results/alter_table.out	2024-11-11 08:56:20.496299...
@@ -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        
+-------+------------+---------------+-------------+----------------------
+ 39651 |            |             0 |       39651 | pg_toast_39643
+ 39652 |            |             0 |       39652 | pg_toast_39643_index
+ 39643 |            |             0 |       39643 | users
+ 39642 |            |             0 |       39642 | users_id_seq
+ 39981 |            |             0 |       39981 | foo
+ 40236 |            |             0 |       40236 | forc_test
+ 40581 |            |             0 |       40581 | pg_toast_40578
+ 40582 |            |             0 |       40582 | pg_toast_40578_index
...

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-11 08:51:16.809441093 +0000
+++ /tmp/cirrus-ci-build/build/testrun/recovery/027_stream_regress/data/results/alter_table.out	2024-11-11 08:56:54.1090...
@@ -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        
+-------+------------+---------------+-------------+----------------------
+ 39496 |            |             0 |       39496 | users_id_seq
+ 39502 |            |             0 |       39502 | pg_toast_39497
+ 39503 |            |             0 |       39503 | pg_toast_39497_index
+ 39497 |            |             0 |       39497 | users
+ 39761 |            |             0 |       39761 | foo
+ 40089 |            |             0 |       40089 | forc_test
+ 40493 |            |             0 |       40493 | pg_toast_40490
+ 40494 |            |             0 |       40494 | pg_toast_40490_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-11 08:51:16.809441093 +0000
+++ /tmp/cirrus-ci-build/build/testrun/regress/regress/results/alter_table.out	2024-11-11 08:56:13.524194721 +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        
+-------+------------+---------------+-------------+----------------------
+ 39699 |            |             0 |       39699 | users_id_seq
+ 39705 |            |             0 |       39705 | pg_toast_39700
+ 39706 |            |             0 |       39706 | pg_toast_39700_index
+ 39700 |            |             0 |       39700 | users
+ 39957 |            |             0 |       39957 | foo
+ 40237 |            |             0 |       40237 | forc_test
+ 40609 |            |             0 |       40609 | pg_toast_40606
+ 40610 |            |             0 |       40610 | pg_toast_40606_index
...

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-11 08:51:19
+++ /Users/admin/pgsql/build/testrun/pg_upgrade/002_pg_upgrade/data/results/alter_table.out	2024-11-11 08:53:58
@@ -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        
+-------+------------+---------------+-------------+----------------------
+ 39552 |            |             0 |       39552 | foo
+ 39884 |            |             0 |       39884 | forc_test
+ 39420 |            |             0 |       39420 | users_id_seq
+ 39426 |            |             0 |       39426 | pg_toast_39421
+ 39427 |            |             0 |       39427 | pg_toast_39421_index
+ 39421 |            |             0 |       39421 | users
+ 40298 |            |             0 |       40298 | pg_toast_40295
+ 40299 |            |             0 |       40299 | pg_toast_40295_index
...

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-11 08:51:19
+++ /Users/admin/pgsql/build/testrun/recovery/027_stream_regress/data/results/alter_table.out	2024-11-11 08:55:26
@@ -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        
+-------+------------+---------------+-------------+----------------------
+ 39338 |            |             0 |       39338 | pktable_pkey
+ 39334 |            |             0 |       39334 | pktable
+ 39340 |            |             0 |       39340 | fktable
+ 39945 |            |             0 |       39945 | pg_toast_39936
+ 39936 |            |             0 |       39942 | foo
+ 39946 |            |             0 |       39946 | pg_toast_39936_index
+ 40160 |            |             0 |       40160 | old_oids
+ 40180 |            |             0 |       40180 | pg_toast_40177
...

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-11 08:51:19
+++ /Users/admin/pgsql/build/testrun/regress/regress/results/alter_table.out	2024-11-11 08:53:59
@@ -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        
+-------+------------+---------------+-------------+----------------------
+ 38951 |            |             0 |       38951 | pktable_pkey
+ 38945 |            |             0 |       38945 | pktable
+ 38954 |            |             0 |       38954 | fktable
+ 39990 |            |             0 |       39995 | foo
+ 39999 |            |             0 |       39999 | pg_toast_39990_index
+ 39998 |            |             0 |       39998 | pg_toast_39990
+ 40191 |            |             0 |       40191 | old_oids
+ 40208 |            |             0 |       40208 | pg_toast_40205
...

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-11 08:51:27.166547000 +0000
+++ C:/cirrus/build/testrun/pg_upgrade/002_pg_upgrade/data/results/alter_table.out	2024-11-11 08:55:07.391651600 +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        
+-------+------------+---------------+-------------+----------------------
+ 39004 |            |             0 |       39004 | pktable_pkey
+ 39000 |            |             0 |       39000 | pktable
+ 39006 |            |             0 |       39006 | fktable
+ 39586 |            |             0 |       39591 | foo
+ 39595 |            |             0 |       39595 | pg_toast_39586_index
+ 39594 |            |             0 |       39594 | pg_toast_39586
+ 39854 |            |             0 |       39854 | old_oids
+ 39890 |            |             0 |       39890 | pg_toast_39887
...

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-11 08:51:27.166547000 +0000
+++ C:/cirrus/build/testrun/recovery/027_stream_regress/data/results/alter_table.out	2024-11-11 08:57:22.570461300 +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        
+-------+------------+---------------+-------------+----------------------
+ 38709 |            |             0 |       38709 | pktable_pkey
+ 38705 |            |             0 |       38705 | pktable
+ 38712 |            |             0 |       38712 | fktable
+ 39609 |            |             0 |       39618 | foo
+ 39622 |            |             0 |       39622 | pg_toast_39609_index
+ 39621 |            |             0 |       39621 | pg_toast_39609
+ 39843 |            |             0 |       39843 | old_oids
+ 39861 |            |             0 |       39861 | pg_toast_39858
...

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-11 08:51:27.166547000 +0000
+++ C:/cirrus/build/testrun/regress/regress/results/alter_table.out	2024-11-11 08:54:53.978057400 +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        
+-------+------------+---------------+-------------+----------------------
+ 37878 |            |             0 |       37878 | pktable_pkey
+ 37873 |            |             0 |       37873 | pktable
+ 37887 |            |             0 |       37887 | fktable
+ 38925 |            |             0 |       38925 | users_id_seq
+ 38950 |            |             0 |       38950 | pg_toast_38933
+ 38959 |            |             0 |       38959 | pg_toast_38933_index
+ 38933 |            |             0 |       38933 | users
+ 39197 |            |             0 |       39197 | foo
...

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-11 08:02:42.075880400 +0000
+++ C:/cirrus/build/testrun/pg_upgrade/002_pg_upgrade/data/results/date.out	2024-11-11 08:04:57.799744500 +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-11 08:02:42.075880400 +0000
+++ C:/cirrus/build/testrun/recovery/027_stream_regress/data/results/date.out	2024-11-11 08:07:25.400485500 +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-11 08:02:42.075880400 +0000
+++ C:/cirrus/build/testrun/regress/regress/results/date.out	2024-11-11 08:04:49.963257500 +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/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-11 04:07:07.877195000 +0000
+++ /tmp/cirrus-ci-build/build/testrun/plperl/regress/results/plperl_setup.out	2024-11-11 04:09:04.224315000 +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-11 04:07:06.806202170 +0000
+++ /tmp/cirrus-ci-build/src/pl/plperl/results/plperl_setup.out	2024-11-11 04:08:29.773112226 +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-11 04:07:08.157031026 +0000
+++ /tmp/cirrus-ci-build/build/testrun/plperl/regress/results/plperl_setup.out	2024-11-11 04:09:45.642369861 +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 --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-11 04:07:19.408498600 +0000
+++ C:/cirrus/build/testrun/plperl/regress/results/plperl_setup.out	2024-11-11 04:12:07.826129800 +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-10 21:39:20.742034000 +0000
+++ /tmp/cirrus-ci-build/build/testrun/pg_upgrade/002_pg_upgrade/data/results/partition_join.out	2024-11-10 21:41:12.434...
@@ -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-10 21:39:20.742034000 +0000
+++ /tmp/cirrus-ci-build/build/testrun/recovery/027_stream_regress/data/results/partition_join.out	2024-11-10 21:42:06.3...
@@ -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-10 21:39:20.742034000 +0000
+++ /tmp/cirrus-ci-build/build/testrun/regress/regress/results/partition_join.out	2024-11-10 21:41:09.991811000 +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-10 21:39:16.987911971 +0000
+++ /tmp/cirrus-ci-build/src/bin/pg_upgrade/tmp_check/results/partition_join.out	2024-11-10 21:44:16.631643778 +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/recovery/tmp_ch...
--- /tmp/cirrus-ci-build/src/test/regress/expected/partition_join.out	2024-11-10 21:39:16.987911971 +0000
+++ /tmp/cirrus-ci-build/src/test/recovery/tmp_check/results/partition_join.out	2024-11-10 21:45:51.435301854 +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-10 21:39:16.987911971 +0000
+++ /tmp/cirrus-ci-build/src/test/regress/results/partition_join.out	2024-11-10 21:42:21.312432947 +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-10 21:39:18.542313877 +0000
+++ /tmp/cirrus-ci-build/build/testrun/pg_upgrade/002_pg_upgrade/data/results/partition_join.out	2024-11-10 21:41:44.632...
@@ -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-10 21:39:18.542313877 +0000
+++ /tmp/cirrus-ci-build/build/testrun/recovery/027_stream_regress/data/results/partition_join.out	2024-11-10 21:42:18.6...
@@ -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-10 21:39:18.542313877 +0000
+++ /tmp/cirrus-ci-build/build/testrun/regress/regress/results/partition_join.out	2024-11-10 21:41:40.616576734 +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 --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-10 21:39:29.793857000 +0000
+++ C:/cirrus/build/testrun/pg_upgrade/002_pg_upgrade/data/results/partition_join.out	2024-11-10 21:43:37.893302300 +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-10 21:39:29.793857000 +0000
+++ C:/cirrus/build/testrun/recovery/027_stream_regress/data/results/partition_join.out	2024-11-10 21:46:02.050038200 +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-10 21:39:29.793857000 +0000
+++ C:/cirrus/build/testrun/regress/regress/results/partition_join.out	2024-11-10 21:43:30.845938300 +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-10 19:21:10.622419671 +0000
+++ /tmp/cirrus-ci-build/build-32/testrun/citext/regress/results/citext.out	2024-11-10 19:29:41.177370650 +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-10 19:21:12.554419711 +0000
+++ /tmp/cirrus-ci-build/build-32/testrun/recovery/027_stream_regress/data/results/strings.out	2024-11-10 19:29:16.08140...
@@ -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-10 19:21:12.554419711 +0000
+++ /tmp/cirrus-ci-build/build-32/testrun/regress/regress/results/strings.out	2024-11-10 19:28:36.981444825 +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-10 19:21:12.414419708 +0000
+++ /tmp/cirrus-ci-build/build-32/testrun/test_regex/regress/results/test_regex.out	2024-11-10 19:30:00.337345814 +0000
@@ -1010,4075 +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-10 19:09:04.224508000 +0000
+++ /tmp/cirrus-ci-build/build/testrun/regress-running/regress/results/privs_in_db.out	2024-11-10 19:15:25.222070000 +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/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-10 17:09:12.82561500...
+++ /tmp/cirrus-ci-build/build/testrun/isolation/isolation/results/vacuum-extending-in-repetable-read.out	2024-11-10 17:...
@@ -9,9 +9,10 @@
     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)
+relname                   |tuples_deleted|dead_tuples|tuples_frozen
+--------------------------+--------------+-----------+-------------
+test_vacuum_stat_isolation|             0|          0|            0
+(1 row)
 
 step s1_begin_repeatable_read: 
   BEGIN transaction ISOLATION LEVEL REPEATABLE READ;
@@ -22,7 +23,8 @@
   100
 (1 row)
...

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/vacuum_tables_and_db_statistics.out /tmp/cirrus-ci-build/build/t...
--- /tmp/cirrus-ci-build/src/test/regress/expected/vacuum_tables_and_db_statistics.out	2024-11-10 17:09:13.000321000 +00...
+++ /tmp/cirrus-ci-build/build/testrun/pg_upgrade/002_pg_upgrade/data/results/vacuum_tables_and_db_statistics.out	2024-1...
@@ -186,7 +186,7 @@
 
 SELECT pages_frozen AS pf, pages_all_visible AS pv, rev_all_frozen_pages AS hafp,rev_all_visible_pages AS havp
 FROM pg_stat_get_vacuum_tables, pg_stat_all_tables WHERE pg_stat_get_vacuum_tables.relname = 'vestat' and pg_stat_get_v...
-UPDATE vestat SET x = x + 1001;
+UPDATE vestat SET x = x+1001;
 VACUUM (PARALLEL 0, BUFFER_USAGE_LIMIT 128) vestat;
 SELECT pages_frozen > :pf AS pages_frozen,pages_all_visible > :pv AS pages_all_visible,rev_all_frozen_pages > :hafp AS ...
 FROM pg_stat_get_vacuum_tables, pg_stat_all_tables WHERE pg_stat_get_vacuum_tables.relname = 'vestat' and pg_stat_get_v...

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/vacuum_tables_and_db_statistics.out /tmp/cirrus-ci-build/build/t...
--- /tmp/cirrus-ci-build/src/test/regress/expected/vacuum_tables_and_db_statistics.out	2024-11-10 17:09:13.000321000 +00...
+++ /tmp/cirrus-ci-build/build/testrun/recovery/027_stream_regress/data/results/vacuum_tables_and_db_statistics.out	2024...
@@ -186,7 +186,7 @@
 
 SELECT pages_frozen AS pf, pages_all_visible AS pv, rev_all_frozen_pages AS hafp,rev_all_visible_pages AS havp
 FROM pg_stat_get_vacuum_tables, pg_stat_all_tables WHERE pg_stat_get_vacuum_tables.relname = 'vestat' and pg_stat_get_v...
-UPDATE vestat SET x = x + 1001;
+UPDATE vestat SET x = x+1001;
 VACUUM (PARALLEL 0, BUFFER_USAGE_LIMIT 128) vestat;
 SELECT pages_frozen > :pf AS pages_frozen,pages_all_visible > :pv AS pages_all_visible,rev_all_frozen_pages > :hafp AS ...
 FROM pg_stat_get_vacuum_tables, pg_stat_all_tables WHERE pg_stat_get_vacuum_tables.relname = 'vestat' and pg_stat_get_v...

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/vacuum_tables_and_db_statistics.out /tmp/cirrus-ci-build/build/t...
--- /tmp/cirrus-ci-build/src/test/regress/expected/vacuum_tables_and_db_statistics.out	2024-11-10 17:09:13.000321000 +00...
+++ /tmp/cirrus-ci-build/build/testrun/regress/regress/results/vacuum_tables_and_db_statistics.out	2024-11-10 17:12:08.7...
@@ -186,7 +186,7 @@
 
 SELECT pages_frozen AS pf, pages_all_visible AS pv, rev_all_frozen_pages AS hafp,rev_all_visible_pages AS havp
 FROM pg_stat_get_vacuum_tables, pg_stat_all_tables WHERE pg_stat_get_vacuum_tables.relname = 'vestat' and pg_stat_get_v...
-UPDATE vestat SET x = x + 1001;
+UPDATE vestat SET x = x+1001;
 VACUUM (PARALLEL 0, BUFFER_USAGE_LIMIT 128) vestat;
 SELECT pages_frozen > :pf AS pages_frozen,pages_all_visible > :pv AS pages_all_visible,rev_all_frozen_pages > :hafp AS ...
 FROM pg_stat_get_vacuum_tables, pg_stat_all_tables WHERE pg_stat_get_vacuum_tables.relname = 'vestat' and pg_stat_get_v...

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/vacuum_tables_and_db_statistics.out /tmp/cirrus-ci-build/src/bin...
--- /tmp/cirrus-ci-build/src/test/regress/expected/vacuum_tables_and_db_statistics.out	2024-11-10 17:09:13.014258472 +00...
+++ /tmp/cirrus-ci-build/src/bin/pg_upgrade/tmp_check/results/vacuum_tables_and_db_statistics.out	2024-11-10 17:17:08.34...
@@ -186,7 +186,7 @@
 
 SELECT pages_frozen AS pf, pages_all_visible AS pv, rev_all_frozen_pages AS hafp,rev_all_visible_pages AS havp
 FROM pg_stat_get_vacuum_tables, pg_stat_all_tables WHERE pg_stat_get_vacuum_tables.relname = 'vestat' and pg_stat_get_v...
-UPDATE vestat SET x = x + 1001;
+UPDATE vestat SET x = x+1001;
 VACUUM (PARALLEL 0, BUFFER_USAGE_LIMIT 128) vestat;
 SELECT pages_frozen > :pf AS pages_frozen,pages_all_visible > :pv AS pages_all_visible,rev_all_frozen_pages > :hafp AS ...
 FROM pg_stat_get_vacuum_tables, pg_stat_all_tables WHERE pg_stat_get_vacuum_tables.relname = 'vestat' and pg_stat_get_v...

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-10 17:09:12.79186513...
+++ /tmp/cirrus-ci-build/src/test/isolation/output_iso/results/vacuum-extending-in-repetable-read.out	2024-11-10 17:14:5...
@@ -9,9 +9,10 @@
     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)
+relname                   |tuples_deleted|dead_tuples|tuples_frozen
+--------------------------+--------------+-----------+-------------
+test_vacuum_stat_isolation|             0|          0|            0
+(1 row)
 
 step s1_begin_repeatable_read: 
   BEGIN transaction ISOLATION LEVEL REPEATABLE READ;
@@ -22,7 +23,8 @@
   100
 (1 row)
...

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/vacuum_tables_and_db_statistics.out /tmp/cirrus-ci-build/src/tes...
--- /tmp/cirrus-ci-build/src/test/regress/expected/vacuum_tables_and_db_statistics.out	2024-11-10 17:09:13.014258472 +00...
+++ /tmp/cirrus-ci-build/src/test/regress/results/vacuum_tables_and_db_statistics.out	2024-11-10 17:15:29.152313144 +000...
@@ -186,7 +186,7 @@
 
 SELECT pages_frozen AS pf, pages_all_visible AS pv, rev_all_frozen_pages AS hafp,rev_all_visible_pages AS havp
 FROM pg_stat_get_vacuum_tables, pg_stat_all_tables WHERE pg_stat_get_vacuum_tables.relname = 'vestat' and pg_stat_get_v...
-UPDATE vestat SET x = x + 1001;
+UPDATE vestat SET x = x+1001;
 VACUUM (PARALLEL 0, BUFFER_USAGE_LIMIT 128) vestat;
 SELECT pages_frozen > :pf AS pages_frozen,pages_all_visible > :pv AS pages_all_visible,rev_all_frozen_pages > :hafp AS ...
 FROM pg_stat_get_vacuum_tables, pg_stat_all_tables WHERE pg_stat_get_vacuum_tables.relname = 'vestat' and pg_stat_get_v...

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-10 17:09:13.06187880...
+++ /tmp/cirrus-ci-build/build/testrun/isolation/isolation/results/vacuum-extending-in-repetable-read.out	2024-11-10 17:...
@@ -9,9 +9,10 @@
     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)
+relname                   |tuples_deleted|dead_tuples|tuples_frozen
+--------------------------+--------------+-----------+-------------
+test_vacuum_stat_isolation|             0|          0|            0
+(1 row)
 
 step s1_begin_repeatable_read: 
   BEGIN transaction ISOLATION LEVEL REPEATABLE READ;
@@ -22,7 +23,8 @@
   100
 (1 row)
...

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/vacuum_tables_and_db_statistics.out /tmp/cirrus-ci-build/build/t...
--- /tmp/cirrus-ci-build/src/test/regress/expected/vacuum_tables_and_db_statistics.out	2024-11-10 17:09:13.273878807 +00...
+++ /tmp/cirrus-ci-build/build/testrun/pg_upgrade/002_pg_upgrade/data/results/vacuum_tables_and_db_statistics.out	2024-1...
@@ -186,7 +186,7 @@
 
 SELECT pages_frozen AS pf, pages_all_visible AS pv, rev_all_frozen_pages AS hafp,rev_all_visible_pages AS havp
 FROM pg_stat_get_vacuum_tables, pg_stat_all_tables WHERE pg_stat_get_vacuum_tables.relname = 'vestat' and pg_stat_get_v...
-UPDATE vestat SET x = x + 1001;
+UPDATE vestat SET x = x+1001;
 VACUUM (PARALLEL 0, BUFFER_USAGE_LIMIT 128) vestat;
 SELECT pages_frozen > :pf AS pages_frozen,pages_all_visible > :pv AS pages_all_visible,rev_all_frozen_pages > :hafp AS ...
 FROM pg_stat_get_vacuum_tables, pg_stat_all_tables WHERE pg_stat_get_vacuum_tables.relname = 'vestat' and pg_stat_get_v...

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/vacuum_tables_and_db_statistics.out /tmp/cirrus-ci-build/build/t...
--- /tmp/cirrus-ci-build/src/test/regress/expected/vacuum_tables_and_db_statistics.out	2024-11-10 17:09:13.273878807 +00...
+++ /tmp/cirrus-ci-build/build/testrun/recovery/027_stream_regress/data/results/vacuum_tables_and_db_statistics.out	2024...
@@ -186,7 +186,7 @@
 
 SELECT pages_frozen AS pf, pages_all_visible AS pv, rev_all_frozen_pages AS hafp,rev_all_visible_pages AS havp
 FROM pg_stat_get_vacuum_tables, pg_stat_all_tables WHERE pg_stat_get_vacuum_tables.relname = 'vestat' and pg_stat_get_v...
-UPDATE vestat SET x = x + 1001;
+UPDATE vestat SET x = x+1001;
 VACUUM (PARALLEL 0, BUFFER_USAGE_LIMIT 128) vestat;
 SELECT pages_frozen > :pf AS pages_frozen,pages_all_visible > :pv AS pages_all_visible,rev_all_frozen_pages > :hafp AS ...
 FROM pg_stat_get_vacuum_tables, pg_stat_all_tables WHERE pg_stat_get_vacuum_tables.relname = 'vestat' and pg_stat_get_v...

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/vacuum_tables_and_db_statistics.out /tmp/cirrus-ci-build/build/t...
--- /tmp/cirrus-ci-build/src/test/regress/expected/vacuum_tables_and_db_statistics.out	2024-11-10 17:09:13.273878807 +00...
+++ /tmp/cirrus-ci-build/build/testrun/regress/regress/results/vacuum_tables_and_db_statistics.out	2024-11-10 17:15:01.2...
@@ -186,7 +186,7 @@
 
 SELECT pages_frozen AS pf, pages_all_visible AS pv, rev_all_frozen_pages AS hafp,rev_all_visible_pages AS havp
 FROM pg_stat_get_vacuum_tables, pg_stat_all_tables WHERE pg_stat_get_vacuum_tables.relname = 'vestat' and pg_stat_get_v...
-UPDATE vestat SET x = x + 1001;
+UPDATE vestat SET x = x+1001;
 VACUUM (PARALLEL 0, BUFFER_USAGE_LIMIT 128) vestat;
 SELECT pages_frozen > :pf AS pages_frozen,pages_all_visible > :pv AS pages_all_visible,rev_all_frozen_pages > :hafp AS ...
 FROM pg_stat_get_vacuum_tables, pg_stat_all_tables WHERE pg_stat_get_vacuum_tables.relname = 'vestat' and pg_stat_get_v...

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-10 17:09:12
+++ /Users/admin/pgsql/build/testrun/isolation/isolation/results/vacuum-extending-in-repetable-read.out	2024-11-10 17:12...
@@ -9,9 +9,10 @@
     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)
+relname                   |tuples_deleted|dead_tuples|tuples_frozen
+--------------------------+--------------+-----------+-------------
+test_vacuum_stat_isolation|             0|          0|            0
+(1 row)
 
 step s1_begin_repeatable_read: 
   BEGIN transaction ISOLATION LEVEL REPEATABLE READ;
@@ -22,7 +23,8 @@
   100
 (1 row)
...

diff -U3 /Users/admin/pgsql/src/test/regress/expected/vacuum_tables_and_db_statistics.out /Users/admin/pgsql/build/testr...
--- /Users/admin/pgsql/src/test/regress/expected/vacuum_tables_and_db_statistics.out	2024-11-10 17:09:12
+++ /Users/admin/pgsql/build/testrun/pg_upgrade/002_pg_upgrade/data/results/vacuum_tables_and_db_statistics.out	2024-11-...
@@ -186,7 +186,7 @@
 
 SELECT pages_frozen AS pf, pages_all_visible AS pv, rev_all_frozen_pages AS hafp,rev_all_visible_pages AS havp
 FROM pg_stat_get_vacuum_tables, pg_stat_all_tables WHERE pg_stat_get_vacuum_tables.relname = 'vestat' and pg_stat_get_v...
-UPDATE vestat SET x = x + 1001;
+UPDATE vestat SET x = x+1001;
 VACUUM (PARALLEL 0, BUFFER_USAGE_LIMIT 128) vestat;
 SELECT pages_frozen > :pf AS pages_frozen,pages_all_visible > :pv AS pages_all_visible,rev_all_frozen_pages > :hafp AS ...
 FROM pg_stat_get_vacuum_tables, pg_stat_all_tables WHERE pg_stat_get_vacuum_tables.relname = 'vestat' and pg_stat_get_v...

diff -U3 /Users/admin/pgsql/src/test/regress/expected/vacuum_tables_and_db_statistics.out /Users/admin/pgsql/build/testr...
--- /Users/admin/pgsql/src/test/regress/expected/vacuum_tables_and_db_statistics.out	2024-11-10 17:09:12
+++ /Users/admin/pgsql/build/testrun/recovery/027_stream_regress/data/results/vacuum_tables_and_db_statistics.out	2024-1...
@@ -186,7 +186,7 @@
 
 SELECT pages_frozen AS pf, pages_all_visible AS pv, rev_all_frozen_pages AS hafp,rev_all_visible_pages AS havp
 FROM pg_stat_get_vacuum_tables, pg_stat_all_tables WHERE pg_stat_get_vacuum_tables.relname = 'vestat' and pg_stat_get_v...
-UPDATE vestat SET x = x + 1001;
+UPDATE vestat SET x = x+1001;
 VACUUM (PARALLEL 0, BUFFER_USAGE_LIMIT 128) vestat;
 SELECT pages_frozen > :pf AS pages_frozen,pages_all_visible > :pv AS pages_all_visible,rev_all_frozen_pages > :hafp AS ...
 FROM pg_stat_get_vacuum_tables, pg_stat_all_tables WHERE pg_stat_get_vacuum_tables.relname = 'vestat' and pg_stat_get_v...

diff -U3 /Users/admin/pgsql/src/test/regress/expected/vacuum_tables_and_db_statistics.out /Users/admin/pgsql/build/testr...
--- /Users/admin/pgsql/src/test/regress/expected/vacuum_tables_and_db_statistics.out	2024-11-10 17:09:12
+++ /Users/admin/pgsql/build/testrun/regress/regress/results/vacuum_tables_and_db_statistics.out	2024-11-10 17:12:23
@@ -186,7 +186,7 @@
 
 SELECT pages_frozen AS pf, pages_all_visible AS pv, rev_all_frozen_pages AS hafp,rev_all_visible_pages AS havp
 FROM pg_stat_get_vacuum_tables, pg_stat_all_tables WHERE pg_stat_get_vacuum_tables.relname = 'vestat' and pg_stat_get_v...
-UPDATE vestat SET x = x + 1001;
+UPDATE vestat SET x = x+1001;
 VACUUM (PARALLEL 0, BUFFER_USAGE_LIMIT 128) vestat;
 SELECT pages_frozen > :pf AS pages_frozen,pages_all_visible > :pv AS pages_all_visible,rev_all_frozen_pages > :hafp AS ...
 FROM pg_stat_get_vacuum_tables, pg_stat_all_tables WHERE pg_stat_get_vacuum_tables.relname = 'vestat' and pg_stat_get_v...

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-10 17:09:29.328368500 +0000
+++ C:/cirrus/build/testrun/isolation/isolation/results/vacuum-extending-in-repetable-read.out	2024-11-10 17:13:39.28100...
@@ -9,9 +9,10 @@
     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)
+relname                   |tuples_deleted|dead_tuples|tuples_frozen
+--------------------------+--------------+-----------+-------------
+test_vacuum_stat_isolation|             0|          0|            0
+(1 row)
 
 step s1_begin_repeatable_read: 
   BEGIN transaction ISOLATION LEVEL REPEATABLE READ;
@@ -22,7 +23,8 @@
   100
 (1 row)
...

diff --strip-trailing-cr -U3 C:/cirrus/src/test/regress/expected/vacuum_tables_and_db_statistics.out C:/cirrus/build/tes...
--- C:/cirrus/src/test/regress/expected/vacuum_tables_and_db_statistics.out	2024-11-10 17:09:29.970977700 +0000
+++ C:/cirrus/build/testrun/pg_upgrade/002_pg_upgrade/data/results/vacuum_tables_and_db_statistics.out	2024-11-10 17:13:...
@@ -186,7 +186,7 @@
 
 SELECT pages_frozen AS pf, pages_all_visible AS pv, rev_all_frozen_pages AS hafp,rev_all_visible_pages AS havp
 FROM pg_stat_get_vacuum_tables, pg_stat_all_tables WHERE pg_stat_get_vacuum_tables.relname = 'vestat' and pg_stat_get_v...
-UPDATE vestat SET x = x + 1001;
+UPDATE vestat SET x = x+1001;
 VACUUM (PARALLEL 0, BUFFER_USAGE_LIMIT 128) vestat;
 SELECT pages_frozen > :pf AS pages_frozen,pages_all_visible > :pv AS pages_all_visible,rev_all_frozen_pages > :hafp AS ...
 FROM pg_stat_get_vacuum_tables, pg_stat_all_tables WHERE pg_stat_get_vacuum_tables.relname = 'vestat' and pg_stat_get_v...

diff --strip-trailing-cr -U3 C:/cirrus/src/test/regress/expected/vacuum_index_statistics.out C:/cirrus/build/testrun/rec...
--- C:/cirrus/src/test/regress/expected/vacuum_index_statistics.out	2024-11-10 17:09:29.968993000 +0000
+++ C:/cirrus/build/testrun/recovery/027_stream_regress/data/results/vacuum_index_statistics.out	2024-11-10 17:15:57.540...
@@ -54,7 +54,7 @@
 WHERE vt.relname = 'vestat_pkey' AND vt.relid = c.oid;
    relname   | relpages | pages_deleted | tuples_deleted 
 -------------+----------+---------------+----------------
- vestat_pkey | t        | t             | t
+ vestat_pkey | t        | t             | f
 (1 row)
 
 SELECT vt.relname,relpages AS irp,pages_deleted AS ipd,tuples_deleted AS itd
@@ -67,7 +67,7 @@
 FROM pg_stat_get_vacuum_indexes WHERE relname = 'vestat_pkey';
  diwr | diwb 
 ------+------
- t    | t
+ f    | f
 (1 row)
 
...

diff --strip-trailing-cr -U3 C:/cirrus/src/test/regress/expected/vacuum_tables_and_db_statistics.out C:/cirrus/build/tes...
--- C:/cirrus/src/test/regress/expected/vacuum_tables_and_db_statistics.out	2024-11-10 17:09:29.970977700 +0000
+++ C:/cirrus/build/testrun/regress/regress/results/vacuum_tables_and_db_statistics.out	2024-11-10 17:13:22.788571800 +0...
@@ -186,7 +186,7 @@
 
 SELECT pages_frozen AS pf, pages_all_visible AS pv, rev_all_frozen_pages AS hafp,rev_all_visible_pages AS havp
 FROM pg_stat_get_vacuum_tables, pg_stat_all_tables WHERE pg_stat_get_vacuum_tables.relname = 'vestat' and pg_stat_get_v...
-UPDATE vestat SET x = x + 1001;
+UPDATE vestat SET x = x+1001;
 VACUUM (PARALLEL 0, BUFFER_USAGE_LIMIT 128) vestat;
 SELECT pages_frozen > :pf AS pages_frozen,pages_all_visible > :pv AS pages_all_visible,rev_all_frozen_pages > :hafp AS ...
 FROM pg_stat_get_vacuum_tables, pg_stat_all_tables WHERE pg_stat_get_vacuum_tables.relname = 'vestat' and pg_stat_get_v...

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-10 12:43:57.166367000 +0000
+++ /tmp/cirrus-ci-build/build/testrun/pg_stat_statements/regress/results/level_tracking.out	2024-11-10 12:46:41.7785860...
@@ -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-10 12:43:55.477927311 +0000
+++ /tmp/cirrus-ci-build/contrib/pg_stat_statements/results/level_tracking.out	2024-11-10 12:48:18.669166896 +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-10 12:43:51.372850915 +0000
+++ /tmp/cirrus-ci-build/build/testrun/pg_stat_statements/regress/results/level_tracking.out	2024-11-10 12:48:59.3200716...
@@ -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-10 12:43:58
+++ /Users/admin/pgsql/build/testrun/pg_stat_statements/regress/results/level_tracking.out	2024-11-10 12:47:48
@@ -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-10 12:44:05.779376300 +0000
+++ C:/cirrus/build/testrun/pg_stat_statements/regress/results/level_tracking.out	2024-11-10 12:50:22.560113400 +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/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-10 09:54:14.522364000 +0000
+++ /tmp/cirrus-ci-build/build/testrun/pg_upgrade/002_pg_upgrade/data/results/xml.out	2024-11-10 09:56:55.590934000 +000...
@@ -2192,7 +2192,7 @@
 SELECT j, pg_typeof(j) FROM xmlcast('11:11:11.5'::time with time zone AS xml) t(j);
        j       | pg_typeof 
 ---------------+-----------
- 11:11:11.5-07 | xml
+ 11:11:11.5-08 | xml
 (1 row)
 
 -- Convert an XML string to bytea and back to xml

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-10 09:54:14.522364000 +0000
+++ /tmp/cirrus-ci-build/build/testrun/recovery/027_stream_regress/data/results/xml.out	2024-11-10 09:57:54.514848000 +0...
@@ -2192,7 +2192,7 @@
 SELECT j, pg_typeof(j) FROM xmlcast('11:11:11.5'::time with time zone AS xml) t(j);
        j       | pg_typeof 
 ---------------+-----------
- 11:11:11.5-07 | xml
+ 11:11:11.5-08 | xml
 (1 row)
 
 -- Convert an XML string to bytea and back to xml

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-10 09:54:14.522364000 +0000
+++ /tmp/cirrus-ci-build/build/testrun/regress/regress/results/xml.out	2024-11-10 09:56:58.641886000 +0000
@@ -2192,7 +2192,7 @@
 SELECT j, pg_typeof(j) FROM xmlcast('11:11:11.5'::time with time zone AS xml) t(j);
        j       | pg_typeof 
 ---------------+-----------
- 11:11:11.5-07 | xml
+ 11:11:11.5-08 | xml
 (1 row)
 
 -- Convert an XML string to bytea and back to xml

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-10 09:54:10.801758454 +0000
+++ /tmp/cirrus-ci-build/src/bin/pg_upgrade/tmp_check/results/xml.out	2024-11-10 10:02:50.520437763 +0000
@@ -2192,7 +2192,7 @@
 SELECT j, pg_typeof(j) FROM xmlcast('11:11:11.5'::time with time zone AS xml) t(j);
        j       | pg_typeof 
 ---------------+-----------
- 11:11:11.5-07 | xml
+ 11:11:11.5-08 | xml
 (1 row)
 
 -- Convert an XML string to bytea and back to xml

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/xml.out /tmp/cirrus-ci-build/src/test/recovery/tmp_check/results...
--- /tmp/cirrus-ci-build/src/test/regress/expected/xml.out	2024-11-10 09:54:10.801758454 +0000
+++ /tmp/cirrus-ci-build/src/test/recovery/tmp_check/results/xml.out	2024-11-10 10:03:56.284351607 +0000
@@ -2192,7 +2192,7 @@
 SELECT j, pg_typeof(j) FROM xmlcast('11:11:11.5'::time with time zone AS xml) t(j);
        j       | pg_typeof 
 ---------------+-----------
- 11:11:11.5-07 | xml
+ 11:11:11.5-08 | xml
 (1 row)
 
 -- Convert an XML string to bytea and back to xml

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-10 09:54:10.801758454 +0000
+++ /tmp/cirrus-ci-build/src/test/regress/results/xml.out	2024-11-10 10:00:04.296687394 +0000
@@ -2192,7 +2192,7 @@
 SELECT j, pg_typeof(j) FROM xmlcast('11:11:11.5'::time with time zone AS xml) t(j);
        j       | pg_typeof 
 ---------------+-----------
- 11:11:11.5-07 | xml
+ 11:11:11.5-08 | xml
 (1 row)
 
 -- Convert an XML string to bytea and back to xml

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-10 09:54:10.822396141 +0000
+++ /tmp/cirrus-ci-build/build/testrun/pg_upgrade/002_pg_upgrade/data/results/xml.out	2024-11-10 09:59:50.986178545 +000...
@@ -2192,7 +2192,7 @@
 SELECT j, pg_typeof(j) FROM xmlcast('11:11:11.5'::time with time zone AS xml) t(j);
        j       | pg_typeof 
 ---------------+-----------
- 11:11:11.5-07 | xml
+ 11:11:11.5-08 | xml
 (1 row)
 
 -- Convert an XML string to bytea and back to xml

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-10 09:54:10.822396141 +0000
+++ /tmp/cirrus-ci-build/build/testrun/recovery/027_stream_regress/data/results/xml.out	2024-11-10 10:00:27.913937320 +0...
@@ -2192,7 +2192,7 @@
 SELECT j, pg_typeof(j) FROM xmlcast('11:11:11.5'::time with time zone AS xml) t(j);
        j       | pg_typeof 
 ---------------+-----------
- 11:11:11.5-07 | xml
+ 11:11:11.5-08 | xml
 (1 row)
 
 -- Convert an XML string to bytea and back to xml

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-10 09:54:10.822396141 +0000
+++ /tmp/cirrus-ci-build/build/testrun/regress/regress/results/xml.out	2024-11-10 09:59:40.430238470 +0000
@@ -2192,7 +2192,7 @@
 SELECT j, pg_typeof(j) FROM xmlcast('11:11:11.5'::time with time zone AS xml) t(j);
        j       | pg_typeof 
 ---------------+-----------
- 11:11:11.5-07 | xml
+ 11:11:11.5-08 | xml
 (1 row)
 
 -- Convert an XML string to bytea and back to xml

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-10 09:54:10
+++ /Users/admin/pgsql/build/testrun/pg_upgrade/002_pg_upgrade/data/results/xml.out	2024-11-10 09:57:20
@@ -2192,7 +2192,7 @@
 SELECT j, pg_typeof(j) FROM xmlcast('11:11:11.5'::time with time zone AS xml) t(j);
        j       | pg_typeof 
 ---------------+-----------
- 11:11:11.5-07 | xml
+ 11:11:11.5-08 | xml
 (1 row)
 
 -- Convert an XML string to bytea and back to xml

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-10 09:54:10
+++ /Users/admin/pgsql/build/testrun/recovery/027_stream_regress/data/results/xml.out	2024-11-10 09:58:31
@@ -2192,7 +2192,7 @@
 SELECT j, pg_typeof(j) FROM xmlcast('11:11:11.5'::time with time zone AS xml) t(j);
        j       | pg_typeof 
 ---------------+-----------
- 11:11:11.5-07 | xml
+ 11:11:11.5-08 | xml
 (1 row)
 
 -- Convert an XML string to bytea and back to xml

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-10 09:54:10
+++ /Users/admin/pgsql/build/testrun/regress/regress/results/xml.out	2024-11-10 09:57:21
@@ -2192,7 +2192,7 @@
 SELECT j, pg_typeof(j) FROM xmlcast('11:11:11.5'::time with time zone AS xml) t(j);
        j       | pg_typeof 
 ---------------+-----------
- 11:11:11.5-07 | xml
+ 11:11:11.5-08 | xml
 (1 row)
 
 -- Convert an XML string to bytea and back to xml

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/join.out /tmp/cirrus-ci-build/build/testrun/pg_upgrade/002_pg_up...
--- /tmp/cirrus-ci-build/src/test/regress/expected/join.out	2024-11-10 08:02:03.796753000 +0000
+++ /tmp/cirrus-ci-build/build/testrun/pg_upgrade/002_pg_upgrade/data/results/join.out	2024-11-10 08:04:08.815159000 +00...
@@ -2800,19 +2800,10 @@
   left join
   (select * from tenk1 y order by y.unique2) y
   on x.thousand = y.unique2 and x.twothousand = y.hundred and x.fivethous = y.unique2;
-                                    QUERY PLAN                                    
-----------------------------------------------------------------------------------
- Aggregate
-   ->  Merge Left Join
-         Merge Cond: (x.thousand = y.unique2)
-         Join Filter: ((x.twothousand = y.hundred) AND (x.fivethous = y.unique2))
-         ->  Sort
-               Sort Key: x.thousand, x.twothousand, x.fivethous
-               ->  Seq Scan on tenk1 x
-         ->  Materialize
-               ->  Index Scan using tenk1_unique2 on tenk1 y
-(9 rows)
-
...

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/select_distinct.out /tmp/cirrus-ci-build/src/bin/pg_upgrade/tmp_...
--- /tmp/cirrus-ci-build/src/test/regress/expected/select_distinct.out	2024-11-10 08:02:03.281456243 +0000
+++ /tmp/cirrus-ci-build/src/bin/pg_upgrade/tmp_check/results/select_distinct.out	2024-11-10 08:09:41.059513964 +0000
@@ -334,13 +334,10 @@
 -- Ensure we get a plan with a Limit 1 when the SELECT list contains constants
 EXPLAIN (COSTS OFF)
 SELECT DISTINCT four,1,2,3 FROM tenk1 WHERE four = 0;
-         QUERY PLAN         
-----------------------------
- Limit
-   ->  Seq Scan on tenk1
-         Filter: (four = 0)
-(3 rows)
-
+ERROR:  deadlock detected
+DETAIL:  Process 44282 waits for AccessShareLock on relation 25202 of database 16387; blocked by process 44274.
+Process 44274 waits for AccessExclusiveLock on relation 16421 of database 16387; blocked by process 44282.
+HINT:  See server log for query details.
 -- Ensure we only get 1 row
 SELECT DISTINCT four,1,2,3 FROM tenk1 WHERE four = 0;
...

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/subselect.out /tmp/cirrus-ci-build/src/test/recovery/tmp_check/r...
--- /tmp/cirrus-ci-build/src/test/regress/expected/subselect.out	2024-11-10 08:02:03.293412598 +0000
+++ /tmp/cirrus-ci-build/src/test/recovery/tmp_check/results/subselect.out	2024-11-10 08:11:27.907509634 +0000
@@ -1403,7 +1403,7 @@
    ->  Seq Scan on public.tenk1 b
          Output: b.unique1, b.unique2, b.two, b.four, b.ten, b.twenty, b.hundred, b.thousand, b.twothousand, b.fivethou...
    SubPlan 1
-     ->  Index Only Scan using tenk1_unique1 on public.tenk1 a
+     ->  Index Only Scan using idx_int4 on public.tenk1 a
            Output: a.unique1
 (10 rows)
 
diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/join.out /tmp/cirrus-ci-build/src/test/recovery/tmp_check/result...
--- /tmp/cirrus-ci-build/src/test/regress/expected/join.out	2024-11-10 08:02:03.241601727 +0000
+++ /tmp/cirrus-ci-build/src/test/recovery/tmp_check/results/join.out	2024-11-10 08:11:29.711508488 +0000
@@ -6540,7 +6540,7 @@
  Aggregate
    ->  Nested Loop
          ->  Nested Loop
-               ->  Index Only Scan using tenk1_unique1 on tenk1 a
...

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/select_distinct.out /tmp/cirrus-ci-build/build/testrun/pg_upgrad...
--- /tmp/cirrus-ci-build/src/test/regress/expected/select_distinct.out	2024-11-10 08:02:03.615108454 +0000
+++ /tmp/cirrus-ci-build/build/testrun/pg_upgrade/002_pg_upgrade/data/results/select_distinct.out	2024-11-10 08:07:09.55...
@@ -262,14 +262,10 @@
 -- Ensure we don't do parallel distinct with a parallel unsafe function
 EXPLAIN (COSTS OFF)
 SELECT DISTINCT distinct_func(1) FROM tenk1;
-                        QUERY PLAN                        
-----------------------------------------------------------
- Unique
-   ->  Sort
-         Sort Key: (distinct_func(1))
-         ->  Index Only Scan using tenk1_hundred on tenk1
-(4 rows)
-
+ERROR:  deadlock detected
+DETAIL:  Process 30386 waits for AccessShareLock on relation 25247 of database 16387; blocked by process 30391.
+Process 30391 waits for AccessExclusiveLock on relation 16421 of database 16387; blocked by process 30386.
+HINT:  See server log for query details.
 -- make the function parallel safe
...

diff --strip-trailing-cr -U3 C:/cirrus/src/test/regress/expected/subselect.out C:/cirrus/build/testrun/pg_upgrade/002_pg...
--- C:/cirrus/src/test/regress/expected/subselect.out	2024-11-10 08:02:20.631503100 +0000
+++ C:/cirrus/build/testrun/pg_upgrade/002_pg_upgrade/data/results/subselect.out	2024-11-10 08:05:01.715057700 +0000
@@ -1029,7 +1029,7 @@
    ->  Seq Scan on tenk1 t
          Filter: ((ANY (unique2 = (hashed SubPlan 2).col1)) OR (ten < 0))
          SubPlan 2
-           ->  Index Only Scan using tenk1_unique1 on tenk1 k
+           ->  Index Only Scan using idx_int4 on tenk1 k
 (5 rows)
 
 select count(*) from tenk1 t
@@ -1403,7 +1403,7 @@
    ->  Seq Scan on public.tenk1 b
          Output: b.unique1, b.unique2, b.two, b.four, b.ten, b.twenty, b.hundred, b.thousand, b.twothousand, b.fivethou...
    SubPlan 1
-     ->  Index Only Scan using tenk1_unique1 on public.tenk1 a
+     ->  Index Only Scan using idx_int4 on public.tenk1 a
            Output: a.unique1
 (10 rows)
...

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-10 07:53:06.038786000 +0000
+++ /tmp/cirrus-ci-build/build/testrun/pg_upgrade/002_pg_upgrade/data/results/brin.out	2024-11-10 07:55:17.142577000 +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-10 07:53:06.096332000 +0000
+++ /tmp/cirrus-ci-build/build/testrun/pg_upgrade/002_pg_upgrade/data/results/privileges.out	2024-11-10 07:55:17.1319480...
@@ -1775,1417 +1775,10 @@
 -- Do the same concurrently
...

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-10 07:53:06.038786000 +0000
+++ /tmp/cirrus-ci-build/build/testrun/recovery/027_stream_regress/data/results/brin.out	2024-11-10 07:55:54.972530000 +...
@@ -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-10 07:53:06.038786000 +0000
+++ /tmp/cirrus-ci-build/build/testrun/regress/regress/results/brin.out	2024-11-10 07:55:15.262823000 +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-10 07:53:06.096332000 +0000
+++ /tmp/cirrus-ci-build/build/testrun/regress/regress/results/privileges.out	2024-11-10 07:55:15.261904000 +0000
@@ -1775,1417 +1775,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-10 07:53:04.224218732 +0000
+++ /tmp/cirrus-ci-build/src/bin/pg_upgrade/tmp_check/results/brin.out	2024-11-10 07:59:06.088129501 +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-10 07:53:04.224218732 +0000
+++ /tmp/cirrus-ci-build/src/test/regress/results/brin.out	2024-11-10 07:57:29.163710068 +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-10 07:53:01.201820173 +0000
+++ /tmp/cirrus-ci-build/build/testrun/pg_upgrade/002_pg_upgrade/data/results/brin.out	2024-11-10 07:57:52.922207520 +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-10 07:53:01.201820173 +0000
+++ /tmp/cirrus-ci-build/build/testrun/recovery/027_stream_regress/data/results/brin.out	2024-11-10 07:58:27.078108610 +...
@@ -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-10 07:53:01.201820173 +0000
+++ /tmp/cirrus-ci-build/build/testrun/regress/regress/results/brin.out	2024-11-10 07:57:49.802213573 +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/pg_upgrade/002_pg_upgr...
--- C:/cirrus/src/test/regress/expected/brin.out	2024-11-10 07:53:18.123967700 +0000
+++ C:/cirrus/build/testrun/pg_upgrade/002_pg_upgrade/data/results/brin.out	2024-11-10 07:56:18.420091300 +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-10 07:53:18.123967700 +0000
+++ C:/cirrus/build/testrun/recovery/027_stream_regress/data/results/brin.out	2024-11-10 07:58:17.661468100 +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-10 07:53:18.123967700 +0000
+++ C:/cirrus/build/testrun/regress/regress/results/brin.out	2024-11-10 07:56:15.481609500 +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/subselect.out /Users/admin/pgsql/build/testrun/pg_upgrade/002_pg_u...
--- /Users/admin/pgsql/src/test/regress/expected/subselect.out	2024-11-10 02:51:14
+++ /Users/admin/pgsql/build/testrun/pg_upgrade/002_pg_upgrade/data/results/subselect.out	2024-11-10 02:53:44
@@ -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/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-09 21:57:12.549768000 +0000
+++ /tmp/cirrus-ci-build/build/testrun/pg_upgrade/002_pg_upgrade/data/results/xml.out	2024-11-09 21:58:51.403910000 +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-09 21:57:12.549768000 +0000
+++ /tmp/cirrus-ci-build/build/testrun/recovery/027_stream_regress/data/results/xml.out	2024-11-09 21:59:43.540228000 +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-09 21:57:12.549768000 +0000
+++ /tmp/cirrus-ci-build/build/testrun/regress/regress/results/xml.out	2024-11-09 21:58:52.800626000 +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-09 21:57:12.974168536 +0000
+++ /tmp/cirrus-ci-build/src/bin/pg_upgrade/tmp_check/results/xml.out	2024-11-09 22:02:31.739350138 +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/recovery/tmp_check/results...
--- /tmp/cirrus-ci-build/src/test/regress/expected/xml.out	2024-11-09 21:57:12.974168536 +0000
+++ /tmp/cirrus-ci-build/src/test/recovery/tmp_check/results/xml.out	2024-11-09 22:04:17.212986173 +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-09 21:57:12.974168536 +0000
+++ /tmp/cirrus-ci-build/src/test/regress/results/xml.out	2024-11-09 22:00:30.711794919 +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-09 21:57:12.724009014 +0000
+++ /tmp/cirrus-ci-build/build/testrun/pg_upgrade/002_pg_upgrade/data/results/xml.out	2024-11-09 21:59:35.623384226 +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-09 21:57:12.724009014 +0000
+++ /tmp/cirrus-ci-build/build/testrun/recovery/027_stream_regress/data/results/xml.out	2024-11-09 22:00:16.967427007 +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-09 21:57:12.724009014 +0000
+++ /tmp/cirrus-ci-build/build/testrun/regress/regress/results/xml.out	2024-11-09 21:59:36.487384319 +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/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-09 20:47:15.186437553 +0000
+++ /tmp/cirrus-ci-build/build/testrun/postgres_fdw/regress/results/query_cancel.out	2024-11-09 20:50:34.849877964 +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/indexing.out /tmp/cirrus-ci-build/build/testrun/pg_upgrade/002_p...
--- /tmp/cirrus-ci-build/src/test/regress/expected/indexing.out	2024-11-09 19:12:28.889216000 +0000
+++ /tmp/cirrus-ci-build/build/testrun/pg_upgrade/002_pg_upgrade/data/results/indexing.out	2024-11-09 19:14:17.887887000...
@@ -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-09 19:12:28.889216000 +0000
+++ /tmp/cirrus-ci-build/build/testrun/recovery/027_stream_regress/data/results/indexing.out	2024-11-09 19:14:58.5699290...
@@ -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-09 19:12:28.889216000 +0000
+++ /tmp/cirrus-ci-build/build/testrun/regress/regress/results/indexing.out	2024-11-09 19:14:14.688476000 +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-09 19:12:23.883327927 +0000
+++ /tmp/cirrus-ci-build/src/bin/pg_upgrade/tmp_check/results/indexing.out	2024-11-09 19:17:49.282121860 +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-09 19:12:23.723327924 +0000
+++ /tmp/cirrus-ci-build/src/test/isolation/output_iso/results/partitioned-cic.out	2024-11-09 19:39:53.209187541 +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/regress/results/index...
--- /tmp/cirrus-ci-build/src/test/regress/expected/indexing.out	2024-11-09 19:12:23.883327927 +0000
+++ /tmp/cirrus-ci-build/src/test/regress/results/indexing.out	2024-11-09 19:16:00.358426173 +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-09 19:12:25.676623372 +0000
+++ /tmp/cirrus-ci-build/build/testrun/pg_upgrade/002_pg_upgrade/data/results/indexing.out	2024-11-09 19:15:27.199152836...
@@ -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-09 19:12:25.676623372 +0000
+++ /tmp/cirrus-ci-build/build/testrun/recovery/027_stream_regress/data/results/indexing.out	2024-11-09 19:15:57.7991343...
@@ -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-09 19:12:25.676623372 +0000
+++ /tmp/cirrus-ci-build/build/testrun/regress/regress/results/indexing.out	2024-11-09 19:15:21.527156634 +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-09 19:12:24
+++ /Users/admin/pgsql/build/testrun/pg_upgrade/002_pg_upgrade/data/results/indexing.out	2024-11-09 19:14:49
@@ -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-09 19:12:24
+++ /Users/admin/pgsql/build/testrun/recovery/027_stream_regress/data/results/indexing.out	2024-11-09 19:15:58
@@ -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-09 19:12:24
+++ /Users/admin/pgsql/build/testrun/regress/regress/results/indexing.out	2024-11-09 19:14:48
@@ -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-09 19:12:33.497034000 +0000
+++ C:/cirrus/build/testrun/pg_upgrade/002_pg_upgrade/data/results/indexing.out	2024-11-09 19:16:26.528500800 +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-09 19:12:33.497034000 +0000
+++ C:/cirrus/build/testrun/recovery/027_stream_regress/data/results/indexing.out	2024-11-09 19:18:26.643279400 +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-09 19:12:33.497034000 +0000
+++ C:/cirrus/build/testrun/regress/regress/results/indexing.out	2024-11-09 19:16:14.326351800 +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/stats.out /tmp/cirrus-ci-build/build/testrun/pg_upgrade/002_pg_u...
--- /tmp/cirrus-ci-build/src/test/regress/expected/stats.out	2024-11-09 18:03:51.534786000 +0000
+++ /tmp/cirrus-ci-build/build/testrun/pg_upgrade/002_pg_upgrade/data/results/stats.out	2024-11-09 18:05:57.796880000 +0...
@@ -673,7 +673,7 @@
 FROM pg_stat_all_tables WHERE relid = 'test_last_scan'::regclass;
  seq_scan | seq_ok | idx_scan | idx_ok 
 ----------+--------+----------+--------
-        2 | t      |        1 | t
+        2 | t      |        2 | t
 (1 row)
 
 -- fetch timestamps from before the next test
@@ -716,7 +716,7 @@
 FROM pg_stat_all_tables WHERE relid = 'test_last_scan'::regclass;
  seq_scan | seq_ok | idx_scan | idx_ok 
 ----------+--------+----------+--------
-        2 | t      |        2 | t
+        2 | t      |        4 | t
 (1 row)
 
...

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/stats.out /tmp/cirrus-ci-build/build/testrun/recovery/027_stream...
--- /tmp/cirrus-ci-build/src/test/regress/expected/stats.out	2024-11-09 18:03:51.534786000 +0000
+++ /tmp/cirrus-ci-build/build/testrun/recovery/027_stream_regress/data/results/stats.out	2024-11-09 18:06:46.278818000 ...
@@ -673,7 +673,7 @@
 FROM pg_stat_all_tables WHERE relid = 'test_last_scan'::regclass;
  seq_scan | seq_ok | idx_scan | idx_ok 
 ----------+--------+----------+--------
-        2 | t      |        1 | t
+        2 | t      |        2 | t
 (1 row)
 
 -- fetch timestamps from before the next test
@@ -716,7 +716,7 @@
 FROM pg_stat_all_tables WHERE relid = 'test_last_scan'::regclass;
  seq_scan | seq_ok | idx_scan | idx_ok 
 ----------+--------+----------+--------
-        2 | t      |        2 | t
+        2 | t      |        4 | t
 (1 row)
 
...

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/stats.out /tmp/cirrus-ci-build/build/testrun/regress/regress/res...
--- /tmp/cirrus-ci-build/src/test/regress/expected/stats.out	2024-11-09 18:03:51.534786000 +0000
+++ /tmp/cirrus-ci-build/build/testrun/regress/regress/results/stats.out	2024-11-09 18:06:01.961391000 +0000
@@ -673,7 +673,7 @@
 FROM pg_stat_all_tables WHERE relid = 'test_last_scan'::regclass;
  seq_scan | seq_ok | idx_scan | idx_ok 
 ----------+--------+----------+--------
-        2 | t      |        1 | t
+        2 | t      |        2 | t
 (1 row)
 
 -- fetch timestamps from before the next test
@@ -716,7 +716,7 @@
 FROM pg_stat_all_tables WHERE relid = 'test_last_scan'::regclass;
  seq_scan | seq_ok | idx_scan | idx_ok 
 ----------+--------+----------+--------
-        2 | t      |        2 | t
+        2 | t      |        4 | t
 (1 row)
 
...

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/stats.out /tmp/cirrus-ci-build/src/bin/pg_upgrade/tmp_check/resu...
--- /tmp/cirrus-ci-build/src/test/regress/expected/stats.out	2024-11-09 18:03:44.828968707 +0000
+++ /tmp/cirrus-ci-build/src/bin/pg_upgrade/tmp_check/results/stats.out	2024-11-09 18:10:40.655971357 +0000
@@ -673,7 +673,7 @@
 FROM pg_stat_all_tables WHERE relid = 'test_last_scan'::regclass;
  seq_scan | seq_ok | idx_scan | idx_ok 
 ----------+--------+----------+--------
-        2 | t      |        1 | t
+        2 | t      |        2 | t
 (1 row)
 
 -- fetch timestamps from before the next test
@@ -716,7 +716,7 @@
 FROM pg_stat_all_tables WHERE relid = 'test_last_scan'::regclass;
  seq_scan | seq_ok | idx_scan | idx_ok 
 ----------+--------+----------+--------
-        2 | t      |        2 | t
+        2 | t      |        4 | t
 (1 row)
 
...

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/stats.out /tmp/cirrus-ci-build/src/test/recovery/tmp_check/resul...
--- /tmp/cirrus-ci-build/src/test/regress/expected/stats.out	2024-11-09 18:03:44.828968707 +0000
+++ /tmp/cirrus-ci-build/src/test/recovery/tmp_check/results/stats.out	2024-11-09 18:11:43.060882061 +0000
@@ -673,7 +673,7 @@
 FROM pg_stat_all_tables WHERE relid = 'test_last_scan'::regclass;
  seq_scan | seq_ok | idx_scan | idx_ok 
 ----------+--------+----------+--------
-        2 | t      |        1 | t
+        2 | t      |        2 | t
 (1 row)
 
 -- fetch timestamps from before the next test
@@ -716,7 +716,7 @@
 FROM pg_stat_all_tables WHERE relid = 'test_last_scan'::regclass;
  seq_scan | seq_ok | idx_scan | idx_ok 
 ----------+--------+----------+--------
-        2 | t      |        2 | t
+        2 | t      |        4 | t
 (1 row)
 
...

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/stats.out /tmp/cirrus-ci-build/src/test/regress/results/stats.ou...
--- /tmp/cirrus-ci-build/src/test/regress/expected/stats.out	2024-11-09 18:03:44.828968707 +0000
+++ /tmp/cirrus-ci-build/src/test/regress/results/stats.out	2024-11-09 18:08:07.349378013 +0000
@@ -673,7 +673,7 @@
 FROM pg_stat_all_tables WHERE relid = 'test_last_scan'::regclass;
  seq_scan | seq_ok | idx_scan | idx_ok 
 ----------+--------+----------+--------
-        2 | t      |        1 | t
+        2 | t      |        2 | t
 (1 row)
 
 -- fetch timestamps from before the next test
@@ -716,7 +716,7 @@
 FROM pg_stat_all_tables WHERE relid = 'test_last_scan'::regclass;
  seq_scan | seq_ok | idx_scan | idx_ok 
 ----------+--------+----------+--------
-        2 | t      |        2 | t
+        2 | t      |        4 | t
 (1 row)
 
...

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/stats.out /tmp/cirrus-ci-build/build/testrun/pg_upgrade/002_pg_u...
--- /tmp/cirrus-ci-build/src/test/regress/expected/stats.out	2024-11-09 18:03:47.251347043 +0000
+++ /tmp/cirrus-ci-build/build/testrun/pg_upgrade/002_pg_upgrade/data/results/stats.out	2024-11-09 18:07:50.905568475 +0...
@@ -673,7 +673,7 @@
 FROM pg_stat_all_tables WHERE relid = 'test_last_scan'::regclass;
  seq_scan | seq_ok | idx_scan | idx_ok 
 ----------+--------+----------+--------
-        2 | t      |        1 | t
+        2 | t      |        2 | t
 (1 row)
 
 -- fetch timestamps from before the next test
@@ -716,7 +716,7 @@
 FROM pg_stat_all_tables WHERE relid = 'test_last_scan'::regclass;
  seq_scan | seq_ok | idx_scan | idx_ok 
 ----------+--------+----------+--------
-        2 | t      |        2 | t
+        2 | t      |        4 | t
 (1 row)
 
...

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/stats.out /tmp/cirrus-ci-build/build/testrun/recovery/027_stream...
--- /tmp/cirrus-ci-build/src/test/regress/expected/stats.out	2024-11-09 18:03:47.251347043 +0000
+++ /tmp/cirrus-ci-build/build/testrun/recovery/027_stream_regress/data/results/stats.out	2024-11-09 18:08:23.245150400 ...
@@ -673,7 +673,7 @@
 FROM pg_stat_all_tables WHERE relid = 'test_last_scan'::regclass;
  seq_scan | seq_ok | idx_scan | idx_ok 
 ----------+--------+----------+--------
-        2 | t      |        1 | t
+        2 | t      |        2 | t
 (1 row)
 
 -- fetch timestamps from before the next test
@@ -716,7 +716,7 @@
 FROM pg_stat_all_tables WHERE relid = 'test_last_scan'::regclass;
  seq_scan | seq_ok | idx_scan | idx_ok 
 ----------+--------+----------+--------
-        2 | t      |        2 | t
+        2 | t      |        4 | t
 (1 row)
 
...

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/stats.out /tmp/cirrus-ci-build/build/testrun/regress/regress/res...
--- /tmp/cirrus-ci-build/src/test/regress/expected/stats.out	2024-11-09 18:03:47.251347043 +0000
+++ /tmp/cirrus-ci-build/build/testrun/regress/regress/results/stats.out	2024-11-09 18:07:45.137764561 +0000
@@ -673,7 +673,7 @@
 FROM pg_stat_all_tables WHERE relid = 'test_last_scan'::regclass;
  seq_scan | seq_ok | idx_scan | idx_ok 
 ----------+--------+----------+--------
-        2 | t      |        1 | t
+        2 | t      |        2 | t
 (1 row)
 
 -- fetch timestamps from before the next test
@@ -716,7 +716,7 @@
 FROM pg_stat_all_tables WHERE relid = 'test_last_scan'::regclass;
  seq_scan | seq_ok | idx_scan | idx_ok 
 ----------+--------+----------+--------
-        2 | t      |        2 | t
+        2 | t      |        4 | t
 (1 row)
 
...

diff -U3 /Users/admin/pgsql/src/test/regress/expected/stats.out /Users/admin/pgsql/build/testrun/pg_upgrade/002_pg_upgra...
--- /Users/admin/pgsql/src/test/regress/expected/stats.out	2024-11-09 18:03:42
+++ /Users/admin/pgsql/build/testrun/pg_upgrade/002_pg_upgrade/data/results/stats.out	2024-11-09 18:06:23
@@ -673,7 +673,7 @@
 FROM pg_stat_all_tables WHERE relid = 'test_last_scan'::regclass;
  seq_scan | seq_ok | idx_scan | idx_ok 
 ----------+--------+----------+--------
-        2 | t      |        1 | t
+        2 | t      |        2 | t
 (1 row)
 
 -- fetch timestamps from before the next test
@@ -716,7 +716,7 @@
 FROM pg_stat_all_tables WHERE relid = 'test_last_scan'::regclass;
  seq_scan | seq_ok | idx_scan | idx_ok 
 ----------+--------+----------+--------
-        2 | t      |        2 | t
+        2 | t      |        4 | t
 (1 row)
 
...

diff -U3 /Users/admin/pgsql/src/test/regress/expected/stats.out /Users/admin/pgsql/build/testrun/recovery/027_stream_reg...
--- /Users/admin/pgsql/src/test/regress/expected/stats.out	2024-11-09 18:03:42
+++ /Users/admin/pgsql/build/testrun/recovery/027_stream_regress/data/results/stats.out	2024-11-09 18:07:33
@@ -673,7 +673,7 @@
 FROM pg_stat_all_tables WHERE relid = 'test_last_scan'::regclass;
  seq_scan | seq_ok | idx_scan | idx_ok 
 ----------+--------+----------+--------
-        2 | t      |        1 | t
+        2 | t      |        2 | t
 (1 row)
 
 -- fetch timestamps from before the next test
@@ -716,7 +716,7 @@
 FROM pg_stat_all_tables WHERE relid = 'test_last_scan'::regclass;
  seq_scan | seq_ok | idx_scan | idx_ok 
 ----------+--------+----------+--------
-        2 | t      |        2 | t
+        2 | t      |        4 | t
 (1 row)
 
...

diff -U3 /Users/admin/pgsql/src/test/regress/expected/stats.out /Users/admin/pgsql/build/testrun/regress/regress/results...
--- /Users/admin/pgsql/src/test/regress/expected/stats.out	2024-11-09 18:03:42
+++ /Users/admin/pgsql/build/testrun/regress/regress/results/stats.out	2024-11-09 18:06:23
@@ -673,7 +673,7 @@
 FROM pg_stat_all_tables WHERE relid = 'test_last_scan'::regclass;
  seq_scan | seq_ok | idx_scan | idx_ok 
 ----------+--------+----------+--------
-        2 | t      |        1 | t
+        2 | t      |        2 | t
 (1 row)
 
 -- fetch timestamps from before the next test
@@ -716,7 +716,7 @@
 FROM pg_stat_all_tables WHERE relid = 'test_last_scan'::regclass;
  seq_scan | seq_ok | idx_scan | idx_ok 
 ----------+--------+----------+--------
-        2 | t      |        2 | t
+        2 | t      |        4 | t
 (1 row)
 
...

diff --strip-trailing-cr -U3 C:/cirrus/src/test/regress/expected/stats.out C:/cirrus/build/testrun/pg_upgrade/002_pg_upg...
--- C:/cirrus/src/test/regress/expected/stats.out	2024-11-09 18:03:55.914659000 +0000
+++ C:/cirrus/build/testrun/pg_upgrade/002_pg_upgrade/data/results/stats.out	2024-11-09 18:07:45.106484600 +0000
@@ -673,7 +673,7 @@
 FROM pg_stat_all_tables WHERE relid = 'test_last_scan'::regclass;
  seq_scan | seq_ok | idx_scan | idx_ok 
 ----------+--------+----------+--------
-        2 | t      |        1 | t
+        2 | t      |        2 | t
 (1 row)
 
 -- fetch timestamps from before the next test
@@ -716,7 +716,7 @@
 FROM pg_stat_all_tables WHERE relid = 'test_last_scan'::regclass;
  seq_scan | seq_ok | idx_scan | idx_ok 
 ----------+--------+----------+--------
-        2 | t      |        2 | t
+        2 | t      |        4 | t
 (1 row)
 
...

diff --strip-trailing-cr -U3 C:/cirrus/src/test/regress/expected/stats.out C:/cirrus/build/testrun/recovery/027_stream_r...
--- C:/cirrus/src/test/regress/expected/stats.out	2024-11-09 18:03:55.914659000 +0000
+++ C:/cirrus/build/testrun/recovery/027_stream_regress/data/results/stats.out	2024-11-09 18:10:03.419939600 +0000
@@ -673,7 +673,7 @@
 FROM pg_stat_all_tables WHERE relid = 'test_last_scan'::regclass;
  seq_scan | seq_ok | idx_scan | idx_ok 
 ----------+--------+----------+--------
-        2 | t      |        1 | t
+        2 | t      |        2 | t
 (1 row)
 
 -- fetch timestamps from before the next test
@@ -716,7 +716,7 @@
 FROM pg_stat_all_tables WHERE relid = 'test_last_scan'::regclass;
  seq_scan | seq_ok | idx_scan | idx_ok 
 ----------+--------+----------+--------
-        2 | t      |        2 | t
+        2 | t      |        4 | t
 (1 row)
 
...

diff --strip-trailing-cr -U3 C:/cirrus/src/test/regress/expected/stats.out C:/cirrus/build/testrun/regress/regress/resul...
--- C:/cirrus/src/test/regress/expected/stats.out	2024-11-09 18:03:55.914659000 +0000
+++ C:/cirrus/build/testrun/regress/regress/results/stats.out	2024-11-09 18:07:40.203654200 +0000
@@ -673,7 +673,7 @@
 FROM pg_stat_all_tables WHERE relid = 'test_last_scan'::regclass;
  seq_scan | seq_ok | idx_scan | idx_ok 
 ----------+--------+----------+--------
-        2 | t      |        1 | t
+        2 | t      |        2 | t
 (1 row)
 
 -- fetch timestamps from before the next test
@@ -716,7 +716,7 @@
 FROM pg_stat_all_tables WHERE relid = 'test_last_scan'::regclass;
  seq_scan | seq_ok | idx_scan | idx_ok 
 ----------+--------+----------+--------
-        2 | t      |        2 | t
+        2 | t      |        4 | t
 (1 row)
 
...

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-09 17:24:14.117092148 +0000
+++ /tmp/cirrus-ci-build/build-32/testrun/pg_upgrade/002_pg_upgrade/data/results/jsonb_jsonpath.out	2024-11-09 17:30:56....
@@ -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-09 17:24:14.117092148 +0000
+++ /tmp/cirrus-ci-build/build-32/testrun/recovery/027_stream_regress/data/results/jsonb_jsonpath.out	2024-11-09 17:31:3...
@@ -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-09 17:24:14.117092148 +0000
+++ /tmp/cirrus-ci-build/build-32/testrun/regress/regress/results/jsonb_jsonpath.out	2024-11-09 17:30:46.160122068 +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/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-09 07:22:17.532100000 +0000
+++ /tmp/cirrus-ci-build/build/testrun/pg_upgrade/002_pg_upgrade/data/results/alter_table.out	2024-11-09 07:24:02.362627...
@@ -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        
+-------+------------+---------------+-------------+----------------------
+ 39515 |            |             0 |       39515 | pktable_pkey
+ 39511 |            |             0 |       39511 | pktable
+ 39517 |            |             0 |       39517 | fktable
+ 40039 |            |             0 |       40044 | foo
+ 40048 |            |             0 |       40048 | pg_toast_40039_index
+ 40047 |            |             0 |       40047 | pg_toast_40039
+ 40255 |            |             0 |       40255 | old_oids
+ 40273 |            |             0 |       40273 | pg_toast_40270
...

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-09 07:22:17.532100000 +0000
+++ /tmp/cirrus-ci-build/build/testrun/recovery/027_stream_regress/data/results/alter_table.out	2024-11-09 07:25:05.6291...
@@ -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        
+-------+------------+---------------+-------------+----------------------
+ 39583 |            |             0 |       39583 | fktable
+ 39581 |            |             0 |       39581 | pktable_pkey
+ 39577 |            |             0 |       39577 | pktable
+ 40092 |            |             0 |       40097 | foo
+ 40101 |            |             0 |       40101 | pg_toast_40092_index
+ 40100 |            |             0 |       40100 | pg_toast_40092
+ 40293 |            |             0 |       40293 | old_oids
+ 40310 |            |             0 |       40310 | pg_toast_40307
...

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-09 07:22:17.532100000 +0000
+++ /tmp/cirrus-ci-build/build/testrun/regress/regress/results/alter_table.out	2024-11-09 07:24:05.198783000 +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        
+-------+------------+---------------+-------------+----------------------
+ 39320 |            |             0 |       39320 | pktable_pkey
+ 39314 |            |             0 |       39314 | pktable
+ 39322 |            |             0 |       39322 | fktable
+ 40040 |            |             0 |       40045 | foo
+ 40049 |            |             0 |       40049 | pg_toast_40040_index
+ 40048 |            |             0 |       40048 | pg_toast_40040
+ 40270 |            |             0 |       40270 | old_oids
+ 40287 |            |             0 |       40287 | pg_toast_40284
...

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-09 07:22:11.193565861 +0000
+++ /tmp/cirrus-ci-build/src/bin/pg_upgrade/tmp_check/results/alter_table.out	2024-11-09 07:27:20.289580505 +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        
+-------+------------+---------------+-------------+----------------------
+ 39537 |            |             0 |       39537 | users_id_seq
+ 39556 |            |             0 |       39556 | pg_toast_39545
+ 39557 |            |             0 |       39557 | pg_toast_39545_index
+ 39545 |            |             0 |       39545 | users
+ 39815 |            |             0 |       39815 | foo
+ 40137 |            |             0 |       40137 | forc_test
+ 40763 |            |             0 |       40763 | pg_toast_40760
+ 40764 |            |             0 |       40764 | pg_toast_40760_index
...

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-09 07:22:11.193565861 +0000
+++ /tmp/cirrus-ci-build/src/test/recovery/tmp_check/results/alter_table.out	2024-11-09 07:29:00.063623310 +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        
+-------+------------+---------------+-------------+----------------------
+ 39539 |            |             0 |       39539 | pktable_pkey
+ 39533 |            |             0 |       39533 | pktable
+ 39542 |            |             0 |       39542 | fktable
+ 40066 |            |             0 |       40072 | foo
+ 40076 |            |             0 |       40076 | pg_toast_40066_index
+ 40075 |            |             0 |       40075 | pg_toast_40066
+ 40288 |            |             0 |       40288 | old_oids
+ 40306 |            |             0 |       40306 | pg_toast_40303
...

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-09 07:22:11.193565861 +0000
+++ /tmp/cirrus-ci-build/src/test/regress/results/alter_table.out	2024-11-09 07:25:20.181976733 +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        
+-------+------------+---------------+-------------+----------------------
+ 39592 |            |             0 |       39592 | pktable_pkey
+ 39588 |            |             0 |       39588 | pktable
+ 39594 |            |             0 |       39594 | fktable
+ 40129 |            |             0 |       40135 | foo
+ 40139 |            |             0 |       40139 | pg_toast_40129_index
+ 40138 |            |             0 |       40138 | pg_toast_40129
+ 40351 |            |             0 |       40351 | old_oids
+ 40369 |            |             0 |       40369 | pg_toast_40366
...

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-09 07:22:09.844564866 +0000
+++ /tmp/cirrus-ci-build/build/testrun/pg_upgrade/002_pg_upgrade/data/results/alter_table.out	2024-11-09 07:24:45.763797...
@@ -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        
+-------+------------+---------------+-------------+----------------------
+ 39645 |            |             0 |       39645 | pg_toast_39640
+ 39646 |            |             0 |       39646 | pg_toast_39640_index
+ 39640 |            |             0 |       39640 | users
+ 39639 |            |             0 |       39639 | users_id_seq
+ 39873 |            |             0 |       39873 | foo
+ 40163 |            |             0 |       40163 | forc_test
+ 40540 |            |             0 |       40540 | pg_toast_40537
+ 40541 |            |             0 |       40541 | pg_toast_40537_index
...

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-09 07:22:09.844564866 +0000
+++ /tmp/cirrus-ci-build/build/testrun/recovery/027_stream_regress/data/results/alter_table.out	2024-11-09 07:25:20.2197...
@@ -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        
+-------+------------+---------------+-------------+----------------------
+ 39441 |            |             0 |       39441 | pktable_pkey
+ 39437 |            |             0 |       39437 | pktable
+ 39445 |            |             0 |       39445 | fktable
+ 39939 |            |             0 |       39945 | foo
+ 39949 |            |             0 |       39949 | pg_toast_39939_index
+ 39948 |            |             0 |       39948 | pg_toast_39939
+ 40168 |            |             0 |       40168 | old_oids
+ 40186 |            |             0 |       40186 | pg_toast_40183
...

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-09 07:22:09.844564866 +0000
+++ /tmp/cirrus-ci-build/build/testrun/regress/regress/results/alter_table.out	2024-11-09 07:24:37.859804633 +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        
+-------+------------+---------------+-------------+----------------------
+ 39663 |            |             0 |       39663 | users_id_seq
+ 39669 |            |             0 |       39669 | pg_toast_39664
+ 39670 |            |             0 |       39670 | pg_toast_39664_index
+ 39664 |            |             0 |       39664 | users
+ 39870 |            |             0 |       39870 | foo
+ 40146 |            |             0 |       40146 | forc_test
+ 39455 |            |             0 |       39455 | pktable_pkey
+ 39451 |            |             0 |       39451 | pktable
...

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-09 07:22:07
+++ /Users/admin/pgsql/build/testrun/pg_upgrade/002_pg_upgrade/data/results/alter_table.out	2024-11-09 07:24:26
@@ -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        
+-------+------------+---------------+-------------+----------------------
+ 38986 |            |             0 |       38986 | pktable_pkey
+ 38979 |            |             0 |       38979 | pktable
+ 38990 |            |             0 |       38990 | fktable
+ 39979 |            |             0 |       39985 | foo
+ 39989 |            |             0 |       39989 | pg_toast_39979_index
+ 39988 |            |             0 |       39988 | pg_toast_39979
+ 40227 |            |             0 |       40227 | old_oids
+ 40252 |            |             0 |       40252 | pg_toast_40248
...

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-09 07:22:07
+++ /Users/admin/pgsql/build/testrun/recovery/027_stream_regress/data/results/alter_table.out	2024-11-09 07:25:38
@@ -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        
+-------+------------+---------------+-------------+----------------------
+ 39327 |            |             0 |       39327 | pktable_pkey
+ 39323 |            |             0 |       39323 | pktable
+ 39330 |            |             0 |       39330 | fktable
+ 39943 |            |             0 |       39949 | foo
+ 39953 |            |             0 |       39953 | pg_toast_39943_index
+ 39952 |            |             0 |       39952 | pg_toast_39943
+ 40175 |            |             0 |       40175 | old_oids
+ 40192 |            |             0 |       40192 | pg_toast_40189
...

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-09 07:22:07
+++ /Users/admin/pgsql/build/testrun/regress/regress/results/alter_table.out	2024-11-09 07:24:22
@@ -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        
+-------+------------+---------------+-------------+----------------------
+ 39494 |            |             0 |       39494 | pktable_pkey
+ 39490 |            |             0 |       39490 | pktable
+ 39514 |            |             0 |       39514 | fktable
+ 40051 |            |             0 |       40060 | foo
+ 40064 |            |             0 |       40064 | pg_toast_40051_index
+ 40063 |            |             0 |       40063 | pg_toast_40051
+ 40301 |            |             0 |       40301 | old_oids
+ 40325 |            |             0 |       40325 | pg_toast_40322
...

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-09 07:22:31.309600800 +0000
+++ C:/cirrus/build/testrun/pg_upgrade/002_pg_upgrade/data/results/alter_table.out	2024-11-09 07:26:24.741722400 +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        
+-------+------------+---------------+-------------+----------------------
+ 38724 |            |             0 |       38724 | pktable_pkey
+ 38717 |            |             0 |       38717 | pktable
+ 38731 |            |             0 |       38731 | fktable
+ 39590 |            |             0 |       39598 | foo
+ 39602 |            |             0 |       39602 | pg_toast_39590_index
+ 39601 |            |             0 |       39601 | pg_toast_39590
+ 39819 |            |             0 |       39819 | old_oids
+ 39837 |            |             0 |       39837 | pg_toast_39834
...

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-09 07:22:31.309600800 +0000
+++ C:/cirrus/build/testrun/recovery/027_stream_regress/data/results/alter_table.out	2024-11-09 07:29:07.975765800 +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        
+-------+------------+---------------+-------------+----------------------
+ 39017 |            |             0 |       39017 | pktable_pkey
+ 39013 |            |             0 |       39013 | pktable
+ 39020 |            |             0 |       39020 | fktable
+ 39642 |            |             0 |       39647 | foo
+ 39651 |            |             0 |       39651 | pg_toast_39642_index
+ 39650 |            |             0 |       39650 | pg_toast_39642
+ 39913 |            |             0 |       39913 | old_oids
+ 39930 |            |             0 |       39930 | pg_toast_39927
...

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-09 07:22:31.309600800 +0000
+++ C:/cirrus/build/testrun/regress/regress/results/alter_table.out	2024-11-09 07:26:17.383804700 +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        
+-------+------------+---------------+-------------+----------------------
+ 38664 |            |             0 |       38664 | pktable_pkey
+ 38660 |            |             0 |       38660 | pktable
+ 38666 |            |             0 |       38666 | fktable
+ 39683 |            |             0 |       39705 | foo
+ 39711 |            |             0 |       39711 | pg_toast_39683_index
+ 39710 |            |             0 |       39710 | pg_toast_39683
+ 39996 |            |             0 |       39996 | pg_toast_39993
+ 39997 |            |             0 |       39997 | pg_toast_39993_index
...

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-09 06:40:37.752481600 +0000
+++ C:/cirrus/build/testrun/pg_upgrade/002_pg_upgrade/data/results/date.out	2024-11-09 06:42:39.646282700 +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-09 06:40:37.752481600 +0000
+++ C:/cirrus/build/testrun/recovery/027_stream_regress/data/results/date.out	2024-11-09 06:44:48.209080200 +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-09 06:40:37.752481600 +0000
+++ C:/cirrus/build/testrun/regress/regress/results/date.out	2024-11-09 06:42:34.672551500 +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/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-09 04:40:15.258184000 +0000
+++ /tmp/cirrus-ci-build/build/testrun/pg_upgrade/002_pg_upgrade/data/results/copy2.out	2024-11-09 04:41:55.441431000 +0...
@@ -139,7 +139,7 @@
 LINE 1: COPY x from stdin (log_verbosity unsupported);
                            ^
 COPY x from stdin with (reject_limit 1);
-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
 COPY x from stdin with (on_error ignore, reject_limit 0);
 ERROR:  REJECT_LIMIT (0) must be greater than zero
 -- too many columns in column list: should fail

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-09 04:40:15.258184000 +0000
+++ /tmp/cirrus-ci-build/build/testrun/recovery/027_stream_regress/data/results/copy2.out	2024-11-09 04:42:45.980107000 ...
@@ -139,7 +139,7 @@
 LINE 1: COPY x from stdin (log_verbosity unsupported);
                            ^
 COPY x from stdin with (reject_limit 1);
-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
 COPY x from stdin with (on_error ignore, reject_limit 0);
 ERROR:  REJECT_LIMIT (0) must be greater than zero
 -- too many columns in column list: should fail

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-09 04:40:15.258184000 +0000
+++ /tmp/cirrus-ci-build/build/testrun/regress/regress/results/copy2.out	2024-11-09 04:41:51.827630000 +0000
@@ -139,7 +139,7 @@
 LINE 1: COPY x from stdin (log_verbosity unsupported);
                            ^
 COPY x from stdin with (reject_limit 1);
-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
 COPY x from stdin with (on_error ignore, reject_limit 0);
 ERROR:  REJECT_LIMIT (0) must be greater than zero
 -- too many columns in column list: should fail

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-09 04:40:12.419352132 +0000
+++ /tmp/cirrus-ci-build/src/bin/pg_upgrade/tmp_check/results/copy2.out	2024-11-09 04:46:25.590871738 +0000
@@ -139,7 +139,7 @@
 LINE 1: COPY x from stdin (log_verbosity unsupported);
                            ^
 COPY x from stdin with (reject_limit 1);
-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
 COPY x from stdin with (on_error ignore, reject_limit 0);
 ERROR:  REJECT_LIMIT (0) must be greater than zero
 -- too many columns in column list: should fail

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-09 04:40:12.419352132 +0000
+++ /tmp/cirrus-ci-build/src/test/recovery/tmp_check/results/copy2.out	2024-11-09 04:48:02.954213455 +0000
@@ -139,7 +139,7 @@
 LINE 1: COPY x from stdin (log_verbosity unsupported);
                            ^
 COPY x from stdin with (reject_limit 1);
-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
 COPY x from stdin with (on_error ignore, reject_limit 0);
 ERROR:  REJECT_LIMIT (0) must be greater than zero
 -- too many columns in column list: should fail

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-09 04:40:12.419352132 +0000
+++ /tmp/cirrus-ci-build/src/test/regress/results/copy2.out	2024-11-09 04:43:26.667146004 +0000
@@ -139,7 +139,7 @@
 LINE 1: COPY x from stdin (log_verbosity unsupported);
                            ^
 COPY x from stdin with (reject_limit 1);
-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
 COPY x from stdin with (on_error ignore, reject_limit 0);
 ERROR:  REJECT_LIMIT (0) must be greater than zero
 -- too many columns in column list: should fail

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-09 04:40:10.697928446 +0000
+++ /tmp/cirrus-ci-build/build/testrun/pg_upgrade/002_pg_upgrade/data/results/copy2.out	2024-11-09 04:42:36.702862442 +0...
@@ -139,7 +139,7 @@
 LINE 1: COPY x from stdin (log_verbosity unsupported);
                            ^
 COPY x from stdin with (reject_limit 1);
-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
 COPY x from stdin with (on_error ignore, reject_limit 0);
 ERROR:  REJECT_LIMIT (0) must be greater than zero
 -- too many columns in column list: should fail

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-09 04:40:10.697928446 +0000
+++ /tmp/cirrus-ci-build/build/testrun/recovery/027_stream_regress/data/results/copy2.out	2024-11-09 04:43:13.146737263 ...
@@ -139,7 +139,7 @@
 LINE 1: COPY x from stdin (log_verbosity unsupported);
                            ^
 COPY x from stdin with (reject_limit 1);
-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
 COPY x from stdin with (on_error ignore, reject_limit 0);
 ERROR:  REJECT_LIMIT (0) must be greater than zero
 -- too many columns in column list: should fail

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-09 04:40:10.697928446 +0000
+++ /tmp/cirrus-ci-build/build/testrun/regress/regress/results/copy2.out	2024-11-09 04:42:30.686882672 +0000
@@ -139,7 +139,7 @@
 LINE 1: COPY x from stdin (log_verbosity unsupported);
                            ^
 COPY x from stdin with (reject_limit 1);
-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
 COPY x from stdin with (on_error ignore, reject_limit 0);
 ERROR:  REJECT_LIMIT (0) must be greater than zero
 -- too many columns in column list: should fail

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-09 04:40:09
+++ /Users/admin/pgsql/build/testrun/pg_upgrade/002_pg_upgrade/data/results/copy2.out	2024-11-09 04:42:24
@@ -139,7 +139,7 @@
 LINE 1: COPY x from stdin (log_verbosity unsupported);
                            ^
 COPY x from stdin with (reject_limit 1);
-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
 COPY x from stdin with (on_error ignore, reject_limit 0);
 ERROR:  REJECT_LIMIT (0) must be greater than zero
 -- too many columns in column list: should fail

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-09 04:40:09
+++ /Users/admin/pgsql/build/testrun/recovery/027_stream_regress/data/results/copy2.out	2024-11-09 04:43:41
@@ -139,7 +139,7 @@
 LINE 1: COPY x from stdin (log_verbosity unsupported);
                            ^
 COPY x from stdin with (reject_limit 1);
-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
 COPY x from stdin with (on_error ignore, reject_limit 0);
 ERROR:  REJECT_LIMIT (0) must be greater than zero
 -- too many columns in column list: should fail

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-09 04:40:09
+++ /Users/admin/pgsql/build/testrun/regress/regress/results/copy2.out	2024-11-09 04:42:22
@@ -139,7 +139,7 @@
 LINE 1: COPY x from stdin (log_verbosity unsupported);
                            ^
 COPY x from stdin with (reject_limit 1);
-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
 COPY x from stdin with (on_error ignore, reject_limit 0);
 ERROR:  REJECT_LIMIT (0) must be greater than zero
 -- too many columns in column list: should fail

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-09 04:40:30.976198800 +0000
+++ C:/cirrus/build/testrun/pg_upgrade/002_pg_upgrade/data/results/copy2.out	2024-11-09 04:44:22.696530300 +0000
@@ -139,7 +139,7 @@
 LINE 1: COPY x from stdin (log_verbosity unsupported);
                            ^
 COPY x from stdin with (reject_limit 1);
-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
 COPY x from stdin with (on_error ignore, reject_limit 0);
 ERROR:  REJECT_LIMIT (0) must be greater than zero
 -- too many columns in column list: should fail

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-09 04:40:30.976198800 +0000
+++ C:/cirrus/build/testrun/recovery/027_stream_regress/data/results/copy2.out	2024-11-09 04:46:51.898739700 +0000
@@ -139,7 +139,7 @@
 LINE 1: COPY x from stdin (log_verbosity unsupported);
                            ^
 COPY x from stdin with (reject_limit 1);
-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
 COPY x from stdin with (on_error ignore, reject_limit 0);
 ERROR:  REJECT_LIMIT (0) must be greater than zero
 -- too many columns in column list: should fail

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-09 04:40:30.976198800 +0000
+++ C:/cirrus/build/testrun/regress/regress/results/copy2.out	2024-11-09 04:44:18.976815400 +0000
@@ -139,7 +139,7 @@
 LINE 1: COPY x from stdin (log_verbosity unsupported);
                            ^
 COPY x from stdin with (reject_limit 1);
-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
 COPY x from stdin with (on_error ignore, reject_limit 0);
 ERROR:  REJECT_LIMIT (0) must be greater than zero
 -- too many columns in column list: should fail

diff --strip-trailing-cr -U3 C:/cirrus/src/test/regress/expected/stats.out C:/cirrus/build/testrun/recovery/027_stream_r...
--- C:/cirrus/src/test/regress/expected/stats.out	2024-11-09 03:40:12.984011000 +0000
+++ C:/cirrus/build/testrun/recovery/027_stream_regress/data/results/stats.out	2024-11-09 03:46:33.110596100 +0000
@@ -846,7 +846,7 @@
 FROM pg_stat_all_tables WHERE relid = 'test_parallel_scan'::regclass;
  parallel_seq_scan | parallel_idx_scan 
 -------------------+-------------------
-                 3 |                 2
+                 1 |                 1
 (1 row)
 
 SELECT last_parallel_seq_scan AS test_last_seq, last_parallel_idx_scan AS test_last_idx
@@ -895,7 +895,7 @@
 FROM pg_stat_all_tables WHERE relid = 'test_parallel_scan'::regclass;
  parallel_seq_scan | seq_ok | parallel_idx_scan | idx_ok 
 -------------------+--------+-------------------+--------
-                 6 | t      |                 2 | t
+                 2 | t      |                 1 | t
 (1 row)
 
...

diff --strip-trailing-cr -U3 C:/cirrus/src/test/regress/expected/stats.out C:/cirrus/build/testrun/regress/regress/resul...
--- C:/cirrus/src/test/regress/expected/stats.out	2024-11-09 03:40:12.984011000 +0000
+++ C:/cirrus/build/testrun/regress/regress/results/stats.out	2024-11-09 03:44:00.420172600 +0000
@@ -846,7 +846,7 @@
 FROM pg_stat_all_tables WHERE relid = 'test_parallel_scan'::regclass;
  parallel_seq_scan | parallel_idx_scan 
 -------------------+-------------------
-                 3 |                 2
+                 2 |                 2
 (1 row)
 
 SELECT last_parallel_seq_scan AS test_last_seq, last_parallel_idx_scan AS test_last_idx
@@ -895,7 +895,7 @@
 FROM pg_stat_all_tables WHERE relid = 'test_parallel_scan'::regclass;
  parallel_seq_scan | seq_ok | parallel_idx_scan | idx_ok 
 -------------------+--------+-------------------+--------
-                 6 | t      |                 2 | t
+                 5 | t      |                 2 | t
 (1 row)
 
...

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-09 03:14:28.831142266 +0000
+++ /tmp/cirrus-ci-build/build/testrun/postgres_fdw/regress/results/query_cancel.out	2024-11-09 03:19:37.454037471 +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/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-09 02:55:10.555019000 +0000
+++ /tmp/cirrus-ci-build/build/testrun/plperl/regress/results/plperl_setup.out	2024-11-09 02:56:57.682792000 +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-09 02:55:19.597765153 +0000
+++ /tmp/cirrus-ci-build/src/pl/plperl/results/plperl_setup.out	2024-11-09 02:56:40.081183425 +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-09 02:55:06.574664976 +0000
+++ /tmp/cirrus-ci-build/build/testrun/plperl/regress/results/plperl_setup.out	2024-11-09 02:57:49.370339624 +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-09 02:55:10
+++ /Users/admin/pgsql/build/testrun/plperl/regress/results/plperl_setup.out	2024-11-09 02:58:15
@@ -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-09 02:55:24.869116100 +0000
+++ C:/cirrus/build/testrun/plperl/regress/results/plperl_setup.out	2024-11-09 03:00:59.377977800 +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-08 19:52:12.348286000 +0000
+++ /tmp/cirrus-ci-build/build/testrun/pg_upgrade/002_pg_upgrade/data/results/partition_join.out	2024-11-08 19:54:13.058...
@@ -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-08 19:52:12.348286000 +0000
+++ /tmp/cirrus-ci-build/build/testrun/recovery/027_stream_regress/data/results/partition_join.out	2024-11-08 19:55:12.3...
@@ -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-08 19:52:12.348286000 +0000
+++ /tmp/cirrus-ci-build/build/testrun/regress/regress/results/partition_join.out	2024-11-08 19:54:09.777322000 +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-08 19:52:12.288563442 +0000
+++ /tmp/cirrus-ci-build/src/bin/pg_upgrade/tmp_check/results/partition_join.out	2024-11-08 19:58:05.708213105 +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/recovery/tmp_ch...
--- /tmp/cirrus-ci-build/src/test/regress/expected/partition_join.out	2024-11-08 19:52:12.288563442 +0000
+++ /tmp/cirrus-ci-build/src/test/recovery/tmp_check/results/partition_join.out	2024-11-08 19:59:07.053847091 +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-08 19:52:12.288563442 +0000
+++ /tmp/cirrus-ci-build/src/test/regress/results/partition_join.out	2024-11-08 19:55:23.568017577 +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-08 19:52:12.205052453 +0000
+++ /tmp/cirrus-ci-build/build/testrun/pg_upgrade/002_pg_upgrade/data/results/partition_join.out	2024-11-08 19:54:36.023...
@@ -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-08 19:52:12.205052453 +0000
+++ /tmp/cirrus-ci-build/build/testrun/recovery/027_stream_regress/data/results/partition_join.out	2024-11-08 19:55:09.6...
@@ -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-08 19:52:12.205052453 +0000
+++ /tmp/cirrus-ci-build/build/testrun/regress/regress/results/partition_join.out	2024-11-08 19:54:28.455710096 +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 --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-08 19:52:22.943819800 +0000
+++ C:/cirrus/build/testrun/pg_upgrade/002_pg_upgrade/data/results/partition_join.out	2024-11-08 19:56:04.644174100 +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-08 19:52:22.943819800 +0000
+++ C:/cirrus/build/testrun/recovery/027_stream_regress/data/results/partition_join.out	2024-11-08 19:58:33.641785600 +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-08 19:52:22.943819800 +0000
+++ C:/cirrus/build/testrun/regress/regress/results/partition_join.out	2024-11-08 19:55:51.465955500 +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-08 17:35:45.298156445 +0000
+++ /tmp/cirrus-ci-build/build-32/testrun/citext/regress/results/citext.out	2024-11-08 17:42:02.807857318 +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-08 17:35:47.210935961 +0000
+++ /tmp/cirrus-ci-build/build-32/testrun/recovery/027_stream_regress/data/results/strings.out	2024-11-08 17:41:39.14388...
@@ -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-08 17:35:47.210935961 +0000
+++ /tmp/cirrus-ci-build/build-32/testrun/regress/regress/results/strings.out	2024-11-08 17:41:01.583935521 +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-08 17:35:47.074884890 +0000
+++ /tmp/cirrus-ci-build/build-32/testrun/test_regex/regress/results/test_regex.out	2024-11-08 17:42:21.171833555 +0000
@@ -1010,4075 +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-08 17:33:23.601698000 +0000
+++ /tmp/cirrus-ci-build/build/testrun/regress-running/regress/results/privs_in_db.out	2024-11-08 17:39:16.445241000 +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/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-08 15:35:10.65674600...
+++ /tmp/cirrus-ci-build/build/testrun/isolation/isolation/results/vacuum-extending-in-repetable-read.out	2024-11-08 15:...
@@ -9,9 +9,10 @@
     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)
+relname                   |tuples_deleted|dead_tuples|tuples_frozen
+--------------------------+--------------+-----------+-------------
+test_vacuum_stat_isolation|             0|          0|            0
+(1 row)
 
 step s1_begin_repeatable_read: 
   BEGIN transaction ISOLATION LEVEL REPEATABLE READ;
@@ -22,7 +23,8 @@
   100
 (1 row)
...

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/vacuum_tables_and_db_statistics.out /tmp/cirrus-ci-build/build/t...
--- /tmp/cirrus-ci-build/src/test/regress/expected/vacuum_tables_and_db_statistics.out	2024-11-08 15:35:10.833434000 +00...
+++ /tmp/cirrus-ci-build/build/testrun/pg_upgrade/002_pg_upgrade/data/results/vacuum_tables_and_db_statistics.out	2024-1...
@@ -186,7 +186,7 @@
 
 SELECT pages_frozen AS pf, pages_all_visible AS pv, rev_all_frozen_pages AS hafp,rev_all_visible_pages AS havp
 FROM pg_stat_get_vacuum_tables, pg_stat_all_tables WHERE pg_stat_get_vacuum_tables.relname = 'vestat' and pg_stat_get_v...
-UPDATE vestat SET x = x + 1001;
+UPDATE vestat SET x = x+1001;
 VACUUM (PARALLEL 0, BUFFER_USAGE_LIMIT 128) vestat;
 SELECT pages_frozen > :pf AS pages_frozen,pages_all_visible > :pv AS pages_all_visible,rev_all_frozen_pages > :hafp AS ...
 FROM pg_stat_get_vacuum_tables, pg_stat_all_tables WHERE pg_stat_get_vacuum_tables.relname = 'vestat' and pg_stat_get_v...

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/vacuum_tables_and_db_statistics.out /tmp/cirrus-ci-build/build/t...
--- /tmp/cirrus-ci-build/src/test/regress/expected/vacuum_tables_and_db_statistics.out	2024-11-08 15:35:10.833434000 +00...
+++ /tmp/cirrus-ci-build/build/testrun/recovery/027_stream_regress/data/results/vacuum_tables_and_db_statistics.out	2024...
@@ -186,7 +186,7 @@
 
 SELECT pages_frozen AS pf, pages_all_visible AS pv, rev_all_frozen_pages AS hafp,rev_all_visible_pages AS havp
 FROM pg_stat_get_vacuum_tables, pg_stat_all_tables WHERE pg_stat_get_vacuum_tables.relname = 'vestat' and pg_stat_get_v...
-UPDATE vestat SET x = x + 1001;
+UPDATE vestat SET x = x+1001;
 VACUUM (PARALLEL 0, BUFFER_USAGE_LIMIT 128) vestat;
 SELECT pages_frozen > :pf AS pages_frozen,pages_all_visible > :pv AS pages_all_visible,rev_all_frozen_pages > :hafp AS ...
 FROM pg_stat_get_vacuum_tables, pg_stat_all_tables WHERE pg_stat_get_vacuum_tables.relname = 'vestat' and pg_stat_get_v...

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/vacuum_tables_and_db_statistics.out /tmp/cirrus-ci-build/build/t...
--- /tmp/cirrus-ci-build/src/test/regress/expected/vacuum_tables_and_db_statistics.out	2024-11-08 15:35:10.833434000 +00...
+++ /tmp/cirrus-ci-build/build/testrun/regress/regress/results/vacuum_tables_and_db_statistics.out	2024-11-08 15:38:06.7...
@@ -186,7 +186,7 @@
 
 SELECT pages_frozen AS pf, pages_all_visible AS pv, rev_all_frozen_pages AS hafp,rev_all_visible_pages AS havp
 FROM pg_stat_get_vacuum_tables, pg_stat_all_tables WHERE pg_stat_get_vacuum_tables.relname = 'vestat' and pg_stat_get_v...
-UPDATE vestat SET x = x + 1001;
+UPDATE vestat SET x = x+1001;
 VACUUM (PARALLEL 0, BUFFER_USAGE_LIMIT 128) vestat;
 SELECT pages_frozen > :pf AS pages_frozen,pages_all_visible > :pv AS pages_all_visible,rev_all_frozen_pages > :hafp AS ...
 FROM pg_stat_get_vacuum_tables, pg_stat_all_tables WHERE pg_stat_get_vacuum_tables.relname = 'vestat' and pg_stat_get_v...

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/vacuum_tables_and_db_statistics.out /tmp/cirrus-ci-build/src/bin...
--- /tmp/cirrus-ci-build/src/test/regress/expected/vacuum_tables_and_db_statistics.out	2024-11-08 15:35:06.967296504 +00...
+++ /tmp/cirrus-ci-build/src/bin/pg_upgrade/tmp_check/results/vacuum_tables_and_db_statistics.out	2024-11-08 15:42:59.91...
@@ -186,7 +186,7 @@
 
 SELECT pages_frozen AS pf, pages_all_visible AS pv, rev_all_frozen_pages AS hafp,rev_all_visible_pages AS havp
 FROM pg_stat_get_vacuum_tables, pg_stat_all_tables WHERE pg_stat_get_vacuum_tables.relname = 'vestat' and pg_stat_get_v...
-UPDATE vestat SET x = x + 1001;
+UPDATE vestat SET x = x+1001;
 VACUUM (PARALLEL 0, BUFFER_USAGE_LIMIT 128) vestat;
 SELECT pages_frozen > :pf AS pages_frozen,pages_all_visible > :pv AS pages_all_visible,rev_all_frozen_pages > :hafp AS ...
 FROM pg_stat_get_vacuum_tables, pg_stat_all_tables WHERE pg_stat_get_vacuum_tables.relname = 'vestat' and pg_stat_get_v...

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-08 15:35:06.74729649...
+++ /tmp/cirrus-ci-build/src/test/isolation/output_iso/results/vacuum-extending-in-repetable-read.out	2024-11-08 15:40:4...
@@ -9,9 +9,10 @@
     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)
+relname                   |tuples_deleted|dead_tuples|tuples_frozen
+--------------------------+--------------+-----------+-------------
+test_vacuum_stat_isolation|             0|          0|            0
+(1 row)
 
 step s1_begin_repeatable_read: 
   BEGIN transaction ISOLATION LEVEL REPEATABLE READ;
@@ -22,7 +23,8 @@
   100
 (1 row)
...

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/vacuum_tables_and_db_statistics.out /tmp/cirrus-ci-build/src/tes...
--- /tmp/cirrus-ci-build/src/test/regress/expected/vacuum_tables_and_db_statistics.out	2024-11-08 15:35:06.967296504 +00...
+++ /tmp/cirrus-ci-build/src/test/regress/results/vacuum_tables_and_db_statistics.out	2024-11-08 15:41:15.698449438 +000...
@@ -186,7 +186,7 @@
 
 SELECT pages_frozen AS pf, pages_all_visible AS pv, rev_all_frozen_pages AS hafp,rev_all_visible_pages AS havp
 FROM pg_stat_get_vacuum_tables, pg_stat_all_tables WHERE pg_stat_get_vacuum_tables.relname = 'vestat' and pg_stat_get_v...
-UPDATE vestat SET x = x + 1001;
+UPDATE vestat SET x = x+1001;
 VACUUM (PARALLEL 0, BUFFER_USAGE_LIMIT 128) vestat;
 SELECT pages_frozen > :pf AS pages_frozen,pages_all_visible > :pv AS pages_all_visible,rev_all_frozen_pages > :hafp AS ...
 FROM pg_stat_get_vacuum_tables, pg_stat_all_tables WHERE pg_stat_get_vacuum_tables.relname = 'vestat' and pg_stat_get_v...

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-08 15:35:05.69469816...
+++ /tmp/cirrus-ci-build/build/testrun/isolation/isolation/results/vacuum-extending-in-repetable-read.out	2024-11-08 15:...
@@ -9,9 +9,10 @@
     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)
+relname                   |tuples_deleted|dead_tuples|tuples_frozen
+--------------------------+--------------+-----------+-------------
+test_vacuum_stat_isolation|             0|          0|            0
+(1 row)
 
 step s1_begin_repeatable_read: 
   BEGIN transaction ISOLATION LEVEL REPEATABLE READ;
@@ -22,7 +23,8 @@
   100
 (1 row)
...

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/vacuum_tables_and_db_statistics.out /tmp/cirrus-ci-build/build/t...
--- /tmp/cirrus-ci-build/src/test/regress/expected/vacuum_tables_and_db_statistics.out	2024-11-08 15:35:05.909973335 +00...
+++ /tmp/cirrus-ci-build/build/testrun/pg_upgrade/002_pg_upgrade/data/results/vacuum_tables_and_db_statistics.out	2024-1...
@@ -186,7 +186,7 @@
 
 SELECT pages_frozen AS pf, pages_all_visible AS pv, rev_all_frozen_pages AS hafp,rev_all_visible_pages AS havp
 FROM pg_stat_get_vacuum_tables, pg_stat_all_tables WHERE pg_stat_get_vacuum_tables.relname = 'vestat' and pg_stat_get_v...
-UPDATE vestat SET x = x + 1001;
+UPDATE vestat SET x = x+1001;
 VACUUM (PARALLEL 0, BUFFER_USAGE_LIMIT 128) vestat;
 SELECT pages_frozen > :pf AS pages_frozen,pages_all_visible > :pv AS pages_all_visible,rev_all_frozen_pages > :hafp AS ...
 FROM pg_stat_get_vacuum_tables, pg_stat_all_tables WHERE pg_stat_get_vacuum_tables.relname = 'vestat' and pg_stat_get_v...

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/vacuum_tables_and_db_statistics.out /tmp/cirrus-ci-build/build/t...
--- /tmp/cirrus-ci-build/src/test/regress/expected/vacuum_tables_and_db_statistics.out	2024-11-08 15:35:05.909973335 +00...
+++ /tmp/cirrus-ci-build/build/testrun/recovery/027_stream_regress/data/results/vacuum_tables_and_db_statistics.out	2024...
@@ -186,7 +186,7 @@
 
 SELECT pages_frozen AS pf, pages_all_visible AS pv, rev_all_frozen_pages AS hafp,rev_all_visible_pages AS havp
 FROM pg_stat_get_vacuum_tables, pg_stat_all_tables WHERE pg_stat_get_vacuum_tables.relname = 'vestat' and pg_stat_get_v...
-UPDATE vestat SET x = x + 1001;
+UPDATE vestat SET x = x+1001;
 VACUUM (PARALLEL 0, BUFFER_USAGE_LIMIT 128) vestat;
 SELECT pages_frozen > :pf AS pages_frozen,pages_all_visible > :pv AS pages_all_visible,rev_all_frozen_pages > :hafp AS ...
 FROM pg_stat_get_vacuum_tables, pg_stat_all_tables WHERE pg_stat_get_vacuum_tables.relname = 'vestat' and pg_stat_get_v...

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/vacuum_tables_and_db_statistics.out /tmp/cirrus-ci-build/build/t...
--- /tmp/cirrus-ci-build/src/test/regress/expected/vacuum_tables_and_db_statistics.out	2024-11-08 15:35:05.909973335 +00...
+++ /tmp/cirrus-ci-build/build/testrun/regress/regress/results/vacuum_tables_and_db_statistics.out	2024-11-08 15:41:01.6...
@@ -186,7 +186,7 @@
 
 SELECT pages_frozen AS pf, pages_all_visible AS pv, rev_all_frozen_pages AS hafp,rev_all_visible_pages AS havp
 FROM pg_stat_get_vacuum_tables, pg_stat_all_tables WHERE pg_stat_get_vacuum_tables.relname = 'vestat' and pg_stat_get_v...
-UPDATE vestat SET x = x + 1001;
+UPDATE vestat SET x = x+1001;
 VACUUM (PARALLEL 0, BUFFER_USAGE_LIMIT 128) vestat;
 SELECT pages_frozen > :pf AS pages_frozen,pages_all_visible > :pv AS pages_all_visible,rev_all_frozen_pages > :hafp AS ...
 FROM pg_stat_get_vacuum_tables, pg_stat_all_tables WHERE pg_stat_get_vacuum_tables.relname = 'vestat' and pg_stat_get_v...

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-08 15:35:10
+++ /Users/admin/pgsql/build/testrun/isolation/isolation/results/vacuum-extending-in-repetable-read.out	2024-11-08 15:38...
@@ -9,9 +9,10 @@
     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)
+relname                   |tuples_deleted|dead_tuples|tuples_frozen
+--------------------------+--------------+-----------+-------------
+test_vacuum_stat_isolation|             0|          0|            0
+(1 row)
 
 step s1_begin_repeatable_read: 
   BEGIN transaction ISOLATION LEVEL REPEATABLE READ;
@@ -22,7 +23,8 @@
   100
 (1 row)
...

diff -U3 /Users/admin/pgsql/src/test/regress/expected/vacuum_tables_and_db_statistics.out /Users/admin/pgsql/build/testr...
--- /Users/admin/pgsql/src/test/regress/expected/vacuum_tables_and_db_statistics.out	2024-11-08 15:35:11
+++ /Users/admin/pgsql/build/testrun/pg_upgrade/002_pg_upgrade/data/results/vacuum_tables_and_db_statistics.out	2024-11-...
@@ -186,7 +186,7 @@
 
 SELECT pages_frozen AS pf, pages_all_visible AS pv, rev_all_frozen_pages AS hafp,rev_all_visible_pages AS havp
 FROM pg_stat_get_vacuum_tables, pg_stat_all_tables WHERE pg_stat_get_vacuum_tables.relname = 'vestat' and pg_stat_get_v...
-UPDATE vestat SET x = x + 1001;
+UPDATE vestat SET x = x+1001;
 VACUUM (PARALLEL 0, BUFFER_USAGE_LIMIT 128) vestat;
 SELECT pages_frozen > :pf AS pages_frozen,pages_all_visible > :pv AS pages_all_visible,rev_all_frozen_pages > :hafp AS ...
 FROM pg_stat_get_vacuum_tables, pg_stat_all_tables WHERE pg_stat_get_vacuum_tables.relname = 'vestat' and pg_stat_get_v...

diff -U3 /Users/admin/pgsql/src/test/regress/expected/vacuum_tables_and_db_statistics.out /Users/admin/pgsql/build/testr...
--- /Users/admin/pgsql/src/test/regress/expected/vacuum_tables_and_db_statistics.out	2024-11-08 15:35:11
+++ /Users/admin/pgsql/build/testrun/recovery/027_stream_regress/data/results/vacuum_tables_and_db_statistics.out	2024-1...
@@ -186,7 +186,7 @@
 
 SELECT pages_frozen AS pf, pages_all_visible AS pv, rev_all_frozen_pages AS hafp,rev_all_visible_pages AS havp
 FROM pg_stat_get_vacuum_tables, pg_stat_all_tables WHERE pg_stat_get_vacuum_tables.relname = 'vestat' and pg_stat_get_v...
-UPDATE vestat SET x = x + 1001;
+UPDATE vestat SET x = x+1001;
 VACUUM (PARALLEL 0, BUFFER_USAGE_LIMIT 128) vestat;
 SELECT pages_frozen > :pf AS pages_frozen,pages_all_visible > :pv AS pages_all_visible,rev_all_frozen_pages > :hafp AS ...
 FROM pg_stat_get_vacuum_tables, pg_stat_all_tables WHERE pg_stat_get_vacuum_tables.relname = 'vestat' and pg_stat_get_v...

diff -U3 /Users/admin/pgsql/src/test/regress/expected/vacuum_tables_and_db_statistics.out /Users/admin/pgsql/build/testr...
--- /Users/admin/pgsql/src/test/regress/expected/vacuum_tables_and_db_statistics.out	2024-11-08 15:35:11
+++ /Users/admin/pgsql/build/testrun/regress/regress/results/vacuum_tables_and_db_statistics.out	2024-11-08 15:38:31
@@ -186,7 +186,7 @@
 
 SELECT pages_frozen AS pf, pages_all_visible AS pv, rev_all_frozen_pages AS hafp,rev_all_visible_pages AS havp
 FROM pg_stat_get_vacuum_tables, pg_stat_all_tables WHERE pg_stat_get_vacuum_tables.relname = 'vestat' and pg_stat_get_v...
-UPDATE vestat SET x = x + 1001;
+UPDATE vestat SET x = x+1001;
 VACUUM (PARALLEL 0, BUFFER_USAGE_LIMIT 128) vestat;
 SELECT pages_frozen > :pf AS pages_frozen,pages_all_visible > :pv AS pages_all_visible,rev_all_frozen_pages > :hafp AS ...
 FROM pg_stat_get_vacuum_tables, pg_stat_all_tables WHERE pg_stat_get_vacuum_tables.relname = 'vestat' and pg_stat_get_v...

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-08 15:35:15.127087400 +0000
+++ C:/cirrus/build/testrun/isolation/isolation/results/vacuum-extending-in-repetable-read.out	2024-11-08 15:39:16.38851...
@@ -9,9 +9,10 @@
     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)
+relname                   |tuples_deleted|dead_tuples|tuples_frozen
+--------------------------+--------------+-----------+-------------
+test_vacuum_stat_isolation|             0|          0|            0
+(1 row)
 
 step s1_begin_repeatable_read: 
   BEGIN transaction ISOLATION LEVEL REPEATABLE READ;
@@ -22,7 +23,8 @@
   100
 (1 row)
...

diff --strip-trailing-cr -U3 C:/cirrus/src/test/regress/expected/vacuum_tables_and_db_statistics.out C:/cirrus/build/tes...
--- C:/cirrus/src/test/regress/expected/vacuum_tables_and_db_statistics.out	2024-11-08 15:35:15.756974100 +0000
+++ C:/cirrus/build/testrun/pg_upgrade/002_pg_upgrade/data/results/vacuum_tables_and_db_statistics.out	2024-11-08 15:39:...
@@ -186,7 +186,7 @@
 
 SELECT pages_frozen AS pf, pages_all_visible AS pv, rev_all_frozen_pages AS hafp,rev_all_visible_pages AS havp
 FROM pg_stat_get_vacuum_tables, pg_stat_all_tables WHERE pg_stat_get_vacuum_tables.relname = 'vestat' and pg_stat_get_v...
-UPDATE vestat SET x = x + 1001;
+UPDATE vestat SET x = x+1001;
 VACUUM (PARALLEL 0, BUFFER_USAGE_LIMIT 128) vestat;
 SELECT pages_frozen > :pf AS pages_frozen,pages_all_visible > :pv AS pages_all_visible,rev_all_frozen_pages > :hafp AS ...
 FROM pg_stat_get_vacuum_tables, pg_stat_all_tables WHERE pg_stat_get_vacuum_tables.relname = 'vestat' and pg_stat_get_v...

diff --strip-trailing-cr -U3 C:/cirrus/src/test/regress/expected/vacuum_tables_and_db_statistics.out C:/cirrus/build/tes...
--- C:/cirrus/src/test/regress/expected/vacuum_tables_and_db_statistics.out	2024-11-08 15:35:15.756974100 +0000
+++ C:/cirrus/build/testrun/recovery/027_stream_regress/data/results/vacuum_tables_and_db_statistics.out	2024-11-08 15:4...
@@ -186,7 +186,7 @@
 
 SELECT pages_frozen AS pf, pages_all_visible AS pv, rev_all_frozen_pages AS hafp,rev_all_visible_pages AS havp
 FROM pg_stat_get_vacuum_tables, pg_stat_all_tables WHERE pg_stat_get_vacuum_tables.relname = 'vestat' and pg_stat_get_v...
-UPDATE vestat SET x = x + 1001;
+UPDATE vestat SET x = x+1001;
 VACUUM (PARALLEL 0, BUFFER_USAGE_LIMIT 128) vestat;
 SELECT pages_frozen > :pf AS pages_frozen,pages_all_visible > :pv AS pages_all_visible,rev_all_frozen_pages > :hafp AS ...
 FROM pg_stat_get_vacuum_tables, pg_stat_all_tables WHERE pg_stat_get_vacuum_tables.relname = 'vestat' and pg_stat_get_v...

diff --strip-trailing-cr -U3 C:/cirrus/src/test/regress/expected/vacuum_tables_and_db_statistics.out C:/cirrus/build/tes...
--- C:/cirrus/src/test/regress/expected/vacuum_tables_and_db_statistics.out	2024-11-08 15:35:15.756974100 +0000
+++ C:/cirrus/build/testrun/regress/regress/results/vacuum_tables_and_db_statistics.out	2024-11-08 15:39:05.647307200 +0...
@@ -186,7 +186,7 @@
 
 SELECT pages_frozen AS pf, pages_all_visible AS pv, rev_all_frozen_pages AS hafp,rev_all_visible_pages AS havp
 FROM pg_stat_get_vacuum_tables, pg_stat_all_tables WHERE pg_stat_get_vacuum_tables.relname = 'vestat' and pg_stat_get_v...
-UPDATE vestat SET x = x + 1001;
+UPDATE vestat SET x = x+1001;
 VACUUM (PARALLEL 0, BUFFER_USAGE_LIMIT 128) vestat;
 SELECT pages_frozen > :pf AS pages_frozen,pages_all_visible > :pv AS pages_all_visible,rev_all_frozen_pages > :hafp AS ...
 FROM pg_stat_get_vacuum_tables, pg_stat_all_tables WHERE pg_stat_get_vacuum_tables.relname = 'vestat' and pg_stat_get_v...

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-08 11:20:40.058512000 +0000
+++ /tmp/cirrus-ci-build/build/testrun/pg_stat_statements/regress/results/level_tracking.out	2024-11-08 11:23:14.6843050...
@@ -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-08 11:20:39.312338137 +0000
+++ /tmp/cirrus-ci-build/contrib/pg_stat_statements/results/level_tracking.out	2024-11-08 11:25:49.153047967 +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-08 11:20:36.379250459 +0000
+++ /tmp/cirrus-ci-build/build/testrun/pg_stat_statements/regress/results/level_tracking.out	2024-11-08 11:25:31.5381490...
@@ -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-08 11:20:50.027699400 +0000
+++ C:/cirrus/build/testrun/pg_stat_statements/regress/results/level_tracking.out	2024-11-08 11:27:21.933979000 +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/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-08 08:46:04.735253000 +0000
+++ /tmp/cirrus-ci-build/build/testrun/pg_upgrade/002_pg_upgrade/data/results/xml.out	2024-11-08 08:48:46.516589000 +000...
@@ -2192,7 +2192,7 @@
 SELECT j, pg_typeof(j) FROM xmlcast('11:11:11.5'::time with time zone AS xml) t(j);
        j       | pg_typeof 
 ---------------+-----------
- 11:11:11.5-07 | xml
+ 11:11:11.5-08 | xml
 (1 row)
 
 -- Convert an XML string to bytea and back to xml

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-08 08:46:04.735253000 +0000
+++ /tmp/cirrus-ci-build/build/testrun/recovery/027_stream_regress/data/results/xml.out	2024-11-08 08:49:32.088235000 +0...
@@ -2192,7 +2192,7 @@
 SELECT j, pg_typeof(j) FROM xmlcast('11:11:11.5'::time with time zone AS xml) t(j);
        j       | pg_typeof 
 ---------------+-----------
- 11:11:11.5-07 | xml
+ 11:11:11.5-08 | xml
 (1 row)
 
 -- Convert an XML string to bytea and back to xml

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-08 08:46:04.735253000 +0000
+++ /tmp/cirrus-ci-build/build/testrun/regress/regress/results/xml.out	2024-11-08 08:48:41.714106000 +0000
@@ -2192,7 +2192,7 @@
 SELECT j, pg_typeof(j) FROM xmlcast('11:11:11.5'::time with time zone AS xml) t(j);
        j       | pg_typeof 
 ---------------+-----------
- 11:11:11.5-07 | xml
+ 11:11:11.5-08 | xml
 (1 row)
 
 -- Convert an XML string to bytea and back to xml

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-08 08:46:00.530091725 +0000
+++ /tmp/cirrus-ci-build/src/bin/pg_upgrade/tmp_check/results/xml.out	2024-11-08 08:52:56.213155737 +0000
@@ -2192,7 +2192,7 @@
 SELECT j, pg_typeof(j) FROM xmlcast('11:11:11.5'::time with time zone AS xml) t(j);
        j       | pg_typeof 
 ---------------+-----------
- 11:11:11.5-07 | xml
+ 11:11:11.5-08 | xml
 (1 row)
 
 -- Convert an XML string to bytea and back to xml

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-08 08:46:00.530091725 +0000
+++ /tmp/cirrus-ci-build/src/test/regress/results/xml.out	2024-11-08 08:51:39.789204399 +0000
@@ -2192,7 +2192,7 @@
 SELECT j, pg_typeof(j) FROM xmlcast('11:11:11.5'::time with time zone AS xml) t(j);
        j       | pg_typeof 
 ---------------+-----------
- 11:11:11.5-07 | xml
+ 11:11:11.5-08 | xml
 (1 row)
 
 -- Convert an XML string to bytea and back to xml

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-08 08:46:01.211842702 +0000
+++ /tmp/cirrus-ci-build/build/testrun/pg_upgrade/002_pg_upgrade/data/results/xml.out	2024-11-08 08:51:44.090537726 +000...
@@ -2192,7 +2192,7 @@
 SELECT j, pg_typeof(j) FROM xmlcast('11:11:11.5'::time with time zone AS xml) t(j);
        j       | pg_typeof 
 ---------------+-----------
- 11:11:11.5-07 | xml
+ 11:11:11.5-08 | xml
 (1 row)
 
 -- Convert an XML string to bytea and back to xml

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-08 08:46:01.211842702 +0000
+++ /tmp/cirrus-ci-build/build/testrun/recovery/027_stream_regress/data/results/xml.out	2024-11-08 08:52:22.978822046 +0...
@@ -2192,7 +2192,7 @@
 SELECT j, pg_typeof(j) FROM xmlcast('11:11:11.5'::time with time zone AS xml) t(j);
        j       | pg_typeof 
 ---------------+-----------
- 11:11:11.5-07 | xml
+ 11:11:11.5-08 | xml
 (1 row)
 
 -- Convert an XML string to bytea and back to xml

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-08 08:46:01.211842702 +0000
+++ /tmp/cirrus-ci-build/build/testrun/regress/regress/results/xml.out	2024-11-08 08:51:37.422496963 +0000
@@ -2192,7 +2192,7 @@
 SELECT j, pg_typeof(j) FROM xmlcast('11:11:11.5'::time with time zone AS xml) t(j);
        j       | pg_typeof 
 ---------------+-----------
- 11:11:11.5-07 | xml
+ 11:11:11.5-08 | xml
 (1 row)
 
 -- Convert an XML string to bytea and back to xml

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-08 08:46:03
+++ /Users/admin/pgsql/build/testrun/pg_upgrade/002_pg_upgrade/data/results/xml.out	2024-11-08 08:49:15
@@ -2192,7 +2192,7 @@
 SELECT j, pg_typeof(j) FROM xmlcast('11:11:11.5'::time with time zone AS xml) t(j);
        j       | pg_typeof 
 ---------------+-----------
- 11:11:11.5-07 | xml
+ 11:11:11.5-08 | xml
 (1 row)
 
 -- Convert an XML string to bytea and back to xml

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-08 08:46:03
+++ /Users/admin/pgsql/build/testrun/recovery/027_stream_regress/data/results/xml.out	2024-11-08 08:50:37
@@ -2192,7 +2192,7 @@
 SELECT j, pg_typeof(j) FROM xmlcast('11:11:11.5'::time with time zone AS xml) t(j);
        j       | pg_typeof 
 ---------------+-----------
- 11:11:11.5-07 | xml
+ 11:11:11.5-08 | xml
 (1 row)
 
 -- Convert an XML string to bytea and back to xml

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-08 08:46:03
+++ /Users/admin/pgsql/build/testrun/regress/regress/results/xml.out	2024-11-08 08:49:15
@@ -2192,7 +2192,7 @@
 SELECT j, pg_typeof(j) FROM xmlcast('11:11:11.5'::time with time zone AS xml) t(j);
        j       | pg_typeof 
 ---------------+-----------
- 11:11:11.5-07 | xml
+ 11:11:11.5-08 | xml
 (1 row)
 
 -- Convert an XML string to bytea and back to xml

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-08 08:29:07.476137621 +0000
+++ /tmp/cirrus-ci-build/build/testrun/postgres_fdw/regress/results/query_cancel.out	2024-11-08 08:32:39.733671015 +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/partition_aggregate.out /tmp/cirrus-ci-build/build-32/testrun/re...
--- /tmp/cirrus-ci-build/src/test/regress/expected/partition_aggregate.out	2024-11-08 07:03:24.104650031 +0000
+++ /tmp/cirrus-ci-build/build-32/testrun/recovery/027_stream_regress/data/results/partition_aggregate.out	2024-11-08 07...
@@ -1529,44 +1529,32 @@
     locale = 'und-u-ks-level2',
     deterministic = false
 );
+ERROR:  current database's encoding is not supported with this provider
 CREATE TABLE pagg_tab3 (c text collate case_insensitive) PARTITION BY LIST(c collate "C");
+ERROR:  collation "case_insensitive" for encoding "SQL_ASCII" does not exist
+LINE 1: CREATE TABLE pagg_tab3 (c text collate case_insensitive) PAR...
+                                       ^
 CREATE TABLE pagg_tab3_p1 PARTITION OF pagg_tab3 FOR VALUES IN ('a', 'b', 'c', 'd');
+ERROR:  relation "pagg_tab3" does not exist
 CREATE TABLE pagg_tab3_p2 PARTITION OF pagg_tab3 FOR VALUES IN ('e', 'f', 'A');
+ERROR:  relation "pagg_tab3" does not exist
 CREATE TABLE pagg_tab3_p3 PARTITION OF pagg_tab3 FOR VALUES IN ('B', 'C', 'D', 'E');
+ERROR:  relation "pagg_tab3" does not exist
 INSERT INTO pagg_tab3 SELECT substr('abcdeABCDE', (i % 10) +1 , 1) FROM generate_series(0, 2999) i;
+ERROR:  relation "pagg_tab3" does not exist
...

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/partition_aggregate.out /tmp/cirrus-ci-build/build-32/testrun/re...
--- /tmp/cirrus-ci-build/src/test/regress/expected/partition_aggregate.out	2024-11-08 07:03:24.104650031 +0000
+++ /tmp/cirrus-ci-build/build-32/testrun/regress/regress/results/partition_aggregate.out	2024-11-08 07:09:54.403641535 ...
@@ -1529,44 +1529,32 @@
     locale = 'und-u-ks-level2',
     deterministic = false
 );
+ERROR:  current database's encoding is not supported with this provider
 CREATE TABLE pagg_tab3 (c text collate case_insensitive) PARTITION BY LIST(c collate "C");
+ERROR:  collation "case_insensitive" for encoding "SQL_ASCII" does not exist
+LINE 1: CREATE TABLE pagg_tab3 (c text collate case_insensitive) PAR...
+                                       ^
 CREATE TABLE pagg_tab3_p1 PARTITION OF pagg_tab3 FOR VALUES IN ('a', 'b', 'c', 'd');
+ERROR:  relation "pagg_tab3" does not exist
 CREATE TABLE pagg_tab3_p2 PARTITION OF pagg_tab3 FOR VALUES IN ('e', 'f', 'A');
+ERROR:  relation "pagg_tab3" does not exist
 CREATE TABLE pagg_tab3_p3 PARTITION OF pagg_tab3 FOR VALUES IN ('B', 'C', 'D', 'E');
+ERROR:  relation "pagg_tab3" does not exist
 INSERT INTO pagg_tab3 SELECT substr('abcdeABCDE', (i % 10) +1 , 1) FROM generate_series(0, 2999) i;
+ERROR:  relation "pagg_tab3" does not exist
...

diff --strip-trailing-cr -U3 C:/cirrus/src/test/regress/expected/partition_aggregate.out C:/cirrus/build/testrun/pg_upgr...
--- C:/cirrus/src/test/regress/expected/partition_aggregate.out	2024-11-08 07:03:43.044214800 +0000
+++ C:/cirrus/build/testrun/pg_upgrade/002_pg_upgrade/data/results/partition_aggregate.out	2024-11-08 07:07:44.719607800...
@@ -1529,44 +1529,32 @@
     locale = 'und-u-ks-level2',
     deterministic = false
 );
+ERROR:  ICU is not supported in this build
 CREATE TABLE pagg_tab3 (c text collate case_insensitive) PARTITION BY LIST(c collate "C");
+ERROR:  collation "case_insensitive" for encoding "UTF8" does not exist
+LINE 1: CREATE TABLE pagg_tab3 (c text collate case_insensitive) PAR...
+                                       ^
 CREATE TABLE pagg_tab3_p1 PARTITION OF pagg_tab3 FOR VALUES IN ('a', 'b', 'c', 'd');
+ERROR:  relation "pagg_tab3" does not exist
 CREATE TABLE pagg_tab3_p2 PARTITION OF pagg_tab3 FOR VALUES IN ('e', 'f', 'A');
+ERROR:  relation "pagg_tab3" does not exist
 CREATE TABLE pagg_tab3_p3 PARTITION OF pagg_tab3 FOR VALUES IN ('B', 'C', 'D', 'E');
+ERROR:  relation "pagg_tab3" does not exist
 INSERT INTO pagg_tab3 SELECT substr('abcdeABCDE', (i % 10) +1 , 1) FROM generate_series(0, 2999) i;
+ERROR:  relation "pagg_tab3" does not exist
...

diff --strip-trailing-cr -U3 C:/cirrus/src/test/regress/expected/partition_aggregate.out C:/cirrus/build/testrun/recover...
--- C:/cirrus/src/test/regress/expected/partition_aggregate.out	2024-11-08 07:03:43.044214800 +0000
+++ C:/cirrus/build/testrun/recovery/027_stream_regress/data/results/partition_aggregate.out	2024-11-08 07:10:11.3299916...
@@ -1529,44 +1529,32 @@
     locale = 'und-u-ks-level2',
     deterministic = false
 );
+ERROR:  ICU is not supported in this build
 CREATE TABLE pagg_tab3 (c text collate case_insensitive) PARTITION BY LIST(c collate "C");
+ERROR:  collation "case_insensitive" for encoding "WIN1252" does not exist
+LINE 1: CREATE TABLE pagg_tab3 (c text collate case_insensitive) PAR...
+                                       ^
 CREATE TABLE pagg_tab3_p1 PARTITION OF pagg_tab3 FOR VALUES IN ('a', 'b', 'c', 'd');
+ERROR:  relation "pagg_tab3" does not exist
 CREATE TABLE pagg_tab3_p2 PARTITION OF pagg_tab3 FOR VALUES IN ('e', 'f', 'A');
+ERROR:  relation "pagg_tab3" does not exist
 CREATE TABLE pagg_tab3_p3 PARTITION OF pagg_tab3 FOR VALUES IN ('B', 'C', 'D', 'E');
+ERROR:  relation "pagg_tab3" does not exist
 INSERT INTO pagg_tab3 SELECT substr('abcdeABCDE', (i % 10) +1 , 1) FROM generate_series(0, 2999) i;
+ERROR:  relation "pagg_tab3" does not exist
...

diff --strip-trailing-cr -U3 C:/cirrus/src/test/regress/expected/partition_aggregate.out C:/cirrus/build/testrun/regress...
--- C:/cirrus/src/test/regress/expected/partition_aggregate.out	2024-11-08 07:03:43.044214800 +0000
+++ C:/cirrus/build/testrun/regress/regress/results/partition_aggregate.out	2024-11-08 07:07:37.414896100 +0000
@@ -1529,44 +1529,32 @@
     locale = 'und-u-ks-level2',
     deterministic = false
 );
+ERROR:  ICU is not supported in this build
 CREATE TABLE pagg_tab3 (c text collate case_insensitive) PARTITION BY LIST(c collate "C");
+ERROR:  collation "case_insensitive" for encoding "WIN1252" does not exist
+LINE 1: CREATE TABLE pagg_tab3 (c text collate case_insensitive) PAR...
+                                       ^
 CREATE TABLE pagg_tab3_p1 PARTITION OF pagg_tab3 FOR VALUES IN ('a', 'b', 'c', 'd');
+ERROR:  relation "pagg_tab3" does not exist
 CREATE TABLE pagg_tab3_p2 PARTITION OF pagg_tab3 FOR VALUES IN ('e', 'f', 'A');
+ERROR:  relation "pagg_tab3" does not exist
 CREATE TABLE pagg_tab3_p3 PARTITION OF pagg_tab3 FOR VALUES IN ('B', 'C', 'D', 'E');
+ERROR:  relation "pagg_tab3" does not exist
 INSERT INTO pagg_tab3 SELECT substr('abcdeABCDE', (i % 10) +1 , 1) FROM generate_series(0, 2999) i;
+ERROR:  relation "pagg_tab3" does not exist
...

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/join.out /tmp/cirrus-ci-build/build/testrun/pg_upgrade/002_pg_up...
--- /tmp/cirrus-ci-build/src/test/regress/expected/join.out	2024-11-08 06:41:03.153448000 +0000
+++ /tmp/cirrus-ci-build/build/testrun/pg_upgrade/002_pg_upgrade/data/results/join.out	2024-11-08 06:43:18.749018000 +00...
@@ -2273,10 +2273,10 @@
 select aa, bb, unique1, unique1
   from tenk1 right join b_star on aa = unique1
   where bb < bb and bb is null;
- aa | bb | unique1 | unique1 
-----+----+---------+---------
-(0 rows)
-
+ERROR:  deadlock detected
+DETAIL:  Process 10860 waits for AccessShareLock on relation 24549 of database 16387; blocked by process 10846.
+Process 10846 waits for AccessExclusiveLock on relation 16421 of database 16387; blocked by process 10860.
+HINT:  See server log for query details.
 --
 -- regression test: check handling of empty-FROM subquery underneath outer join
 --

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/join.out /tmp/cirrus-ci-build/src/test/recovery/tmp_check/result...
--- /tmp/cirrus-ci-build/src/test/regress/expected/join.out	2024-11-08 06:41:03.268944565 +0000
+++ /tmp/cirrus-ci-build/src/test/recovery/tmp_check/results/join.out	2024-11-08 06:50:10.267823094 +0000
@@ -2238,11 +2238,10 @@
   x.unique1 in (select a.f1 from int4_tbl a,float8_tbl b where a.f1=b.f1) and
   x.unique1 = 0 and
   x.unique1 in (select aa.f1 from int4_tbl aa,float8_tbl bb where aa.f1=bb.f1);
- count 
--------
-     1
-(1 row)
-
+ERROR:  deadlock detected
+DETAIL:  Process 54468 waits for AccessShareLock on relation 24504 of database 16384; blocked by process 54482.
+Process 54482 waits for AccessExclusiveLock on relation 16418 of database 16384; blocked by process 54468.
+HINT:  See server log for query details.
 -- try that with GEQO too
 begin;
 set geqo = on;

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/select_distinct.out /tmp/cirrus-ci-build/build/testrun/pg_upgrad...
--- /tmp/cirrus-ci-build/src/test/regress/expected/select_distinct.out	2024-11-08 06:40:59.535006592 +0000
+++ /tmp/cirrus-ci-build/build/testrun/pg_upgrade/002_pg_upgrade/data/results/select_distinct.out	2024-11-08 06:45:46.87...
@@ -232,18 +232,10 @@
 -- Ensure we get a parallel plan
 EXPLAIN (costs off)
 SELECT DISTINCT four FROM tenk1;
-                     QUERY PLAN                     
-----------------------------------------------------
- Unique
-   ->  Gather Merge
-         Workers Planned: 2
-         ->  Sort
-               Sort Key: four
-               ->  HashAggregate
-                     Group Key: four
-                     ->  Parallel Seq Scan on tenk1
-(8 rows)
-
+ERROR:  deadlock detected
...

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/join.out /tmp/cirrus-ci-build/build/testrun/regress/regress/resu...
--- /tmp/cirrus-ci-build/src/test/regress/expected/join.out	2024-11-08 06:40:59.494825609 +0000
+++ /tmp/cirrus-ci-build/build/testrun/regress/regress/results/join.out	2024-11-08 06:45:45.175390297 +0000
@@ -2238,11 +2238,10 @@
   x.unique1 in (select a.f1 from int4_tbl a,float8_tbl b where a.f1=b.f1) and
   x.unique1 = 0 and
   x.unique1 in (select aa.f1 from int4_tbl aa,float8_tbl bb where aa.f1=bb.f1);
- count 
--------
-     1
-(1 row)
-
+ERROR:  deadlock detected
+DETAIL:  Process 29484 waits for AccessShareLock on relation 24446 of database 16384; blocked by process 29472.
+Process 29472 waits for AccessExclusiveLock on relation 16418 of database 16384; blocked by process 29484.
+HINT:  See server log for query details.
 -- try that with GEQO too
 begin;
 set geqo = on;

diff -U3 /Users/admin/pgsql/src/test/regress/expected/subselect.out /Users/admin/pgsql/build/testrun/pg_upgrade/002_pg_u...
--- /Users/admin/pgsql/src/test/regress/expected/subselect.out	2024-11-08 06:41:01
+++ /Users/admin/pgsql/build/testrun/pg_upgrade/002_pg_upgrade/data/results/subselect.out	2024-11-08 06:43:29
@@ -1029,7 +1029,7 @@
    ->  Seq Scan on tenk1 t
          Filter: ((ANY (unique2 = (hashed SubPlan 2).col1)) OR (ten < 0))
          SubPlan 2
-           ->  Index Only Scan using tenk1_unique1 on tenk1 k
+           ->  Index Only Scan using idx_int4 on tenk1 k
 (5 rows)
 
 select count(*) from tenk1 t
@@ -1403,7 +1403,7 @@
    ->  Seq Scan on public.tenk1 b
          Output: b.unique1, b.unique2, b.two, b.four, b.ten, b.twenty, b.hundred, b.thousand, b.twothousand, b.fivethou...
    SubPlan 1
-     ->  Index Only Scan using tenk1_unique1 on public.tenk1 a
+     ->  Index Only Scan using idx_int4 on public.tenk1 a
            Output: a.unique1
 (10 rows)
...

diff --strip-trailing-cr -U3 C:/cirrus/src/test/regress/expected/join.out C:/cirrus/build/testrun/pg_upgrade/002_pg_upgr...
--- C:/cirrus/src/test/regress/expected/join.out	2024-11-08 06:41:13.353801200 +0000
+++ C:/cirrus/build/testrun/pg_upgrade/002_pg_upgrade/data/results/join.out	2024-11-08 06:43:48.591934900 +0000
@@ -4291,27 +4291,10 @@
 explain (costs off)
 select * from tenk1 a join tenk1 b on
   (a.unique1 = 1 and b.unique1 = 2) or (a.unique2 = 3 and b.hundred = 4);
-                                           QUERY PLAN                                            
--------------------------------------------------------------------------------------------------
- Nested Loop
-   Join Filter: (((a.unique1 = 1) AND (b.unique1 = 2)) OR ((a.unique2 = 3) AND (b.hundred = 4)))
-   ->  Bitmap Heap Scan on tenk1 b
-         Recheck Cond: ((unique1 = 2) OR (hundred = 4))
-         ->  BitmapOr
-               ->  Bitmap Index Scan on tenk1_unique1
-                     Index Cond: (unique1 = 2)
-               ->  Bitmap Index Scan on tenk1_hundred
-                     Index Cond: (hundred = 4)
-   ->  Materialize
-         ->  Bitmap Heap Scan on tenk1 a
...

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-08 06:41:13.431327400 +0000
+++ C:/cirrus/build/testrun/recovery/027_stream_regress/data/results/subselect.out	2024-11-08 06:46:19.837079000 +0000
@@ -1029,7 +1029,7 @@
    ->  Seq Scan on tenk1 t
          Filter: ((ANY (unique2 = (hashed SubPlan 2).col1)) OR (ten < 0))
          SubPlan 2
-           ->  Index Only Scan using tenk1_unique1 on tenk1 k
+           ->  Index Only Scan using idx_int4 on tenk1 k
 (5 rows)
 
 select count(*) from tenk1 t
@@ -1403,7 +1403,7 @@
    ->  Seq Scan on public.tenk1 b
          Output: b.unique1, b.unique2, b.two, b.four, b.ten, b.twenty, b.hundred, b.thousand, b.twothousand, b.fivethou...
    SubPlan 1
-     ->  Index Only Scan using tenk1_unique1 on public.tenk1 a
+     ->  Index Only Scan using idx_int4 on public.tenk1 a
            Output: a.unique1
 (10 rows)
...

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-08 06:29:02.338793000 +0000
+++ /tmp/cirrus-ci-build/build/testrun/pg_upgrade/002_pg_upgrade/data/results/brin.out	2024-11-08 06:31:27.955785000 +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-08 06:29:02.400200000 +0000
+++ /tmp/cirrus-ci-build/build/testrun/pg_upgrade/002_pg_upgrade/data/results/privileges.out	2024-11-08 06:31:27.9503810...
@@ -1775,1417 +1775,10 @@
 -- Do the same concurrently
...

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-08 06:29:02.338793000 +0000
+++ /tmp/cirrus-ci-build/build/testrun/recovery/027_stream_regress/data/results/brin.out	2024-11-08 06:32:08.502755000 +...
@@ -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-08 06:29:02.338793000 +0000
+++ /tmp/cirrus-ci-build/build/testrun/regress/regress/results/brin.out	2024-11-08 06:31:25.518353000 +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-08 06:29:02.400200000 +0000
+++ /tmp/cirrus-ci-build/build/testrun/regress/regress/results/privileges.out	2024-11-08 06:31:25.517001000 +0000
@@ -1775,1417 +1775,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-08 06:28:57.273009944 +0000
+++ /tmp/cirrus-ci-build/src/bin/pg_upgrade/tmp_check/results/brin.out	2024-11-08 06:35:00.612128253 +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/src/bin/pg_upgrade/tmp_check...
--- /tmp/cirrus-ci-build/src/test/regress/expected/privileges.out	2024-11-08 06:28:57.340721613 +0000
+++ /tmp/cirrus-ci-build/src/bin/pg_upgrade/tmp_check/results/privileges.out	2024-11-08 06:35:00.568128183 +0000
@@ -1779,1413 +1779,10 @@
 REINDEX TABLE sro_tab;
...

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-08 06:28:57.273009944 +0000
+++ /tmp/cirrus-ci-build/src/test/regress/results/brin.out	2024-11-08 06:33:19.100079138 +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-08 06:28:56.070602866 +0000
+++ /tmp/cirrus-ci-build/build/testrun/pg_upgrade/002_pg_upgrade/data/results/brin.out	2024-11-08 06:34:41.509785658 +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-08 06:28:56.070602866 +0000
+++ /tmp/cirrus-ci-build/build/testrun/recovery/027_stream_regress/data/results/brin.out	2024-11-08 06:35:24.029760957 +...
@@ -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-08 06:28:56.070602866 +0000
+++ /tmp/cirrus-ci-build/build/testrun/regress/regress/results/brin.out	2024-11-08 06:34:33.945790497 +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/pg_upgrade/002_pg_upgr...
--- C:/cirrus/src/test/regress/expected/brin.out	2024-11-08 06:29:11.658132400 +0000
+++ C:/cirrus/build/testrun/pg_upgrade/002_pg_upgrade/data/results/brin.out	2024-11-08 06:32:39.195944900 +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-08 06:29:11.658132400 +0000
+++ C:/cirrus/build/testrun/recovery/027_stream_regress/data/results/brin.out	2024-11-08 06:34:38.283773700 +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 --strip-trailing-cr -U3 C:/cirrus/src/test/regress/expected/privileges.out C:/cirrus/build/testrun/recovery/027_str...
--- C:/cirrus/src/test/regress/expected/privileges.out	2024-11-08 06:29:11.824776900 +0000
+++ C:/cirrus/build/testrun/recovery/027_stream_regress/data/results/privileges.out	2024-11-08 06:34:38.283773700 +0000
@@ -1775,1417 +1775,10 @@
 -- Do the same concurrently
...

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-08 06:29:11.658132400 +0000
+++ C:/cirrus/build/testrun/regress/regress/results/brin.out	2024-11-08 06:32:30.044566500 +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/pg_upgrade/002_pg...
--- C:/cirrus/src/test/regress/expected/subselect.out	2024-11-08 01:27:20.099371900 +0000
+++ C:/cirrus/build/testrun/pg_upgrade/002_pg_upgrade/data/results/subselect.out	2024-11-08 01:29:57.863687700 +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/recovery/027_stre...
--- C:/cirrus/src/test/regress/expected/subselect.out	2024-11-08 01:27:20.099371900 +0000
+++ C:/cirrus/build/testrun/recovery/027_stream_regress/data/results/subselect.out	2024-11-08 01:31:59.927306400 +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-08 01:27:20.099371900 +0000
+++ C:/cirrus/build/testrun/regress/regress/results/subselect.out	2024-11-08 01:29:43.796656600 +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/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-07 21:07:16.667360000 +0000
+++ /tmp/cirrus-ci-build/build/testrun/pg_upgrade/002_pg_upgrade/data/results/privileges.out	2024-11-07 21:09:30.8289080...
@@ -1775,1508 +1775,10 @@
 -- Do the same concurrently
 CREATE INDEX CONCURRENTLY sro_idx ON sro_tab ((sro_ifun(a) + sro_ifun(0)))
 	WHERE sro_ifun(a + 10) > sro_ifun(10);
--- REINDEX
-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 
...

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-07 21:07:16.611506000 +0000
+++ /tmp/cirrus-ci-build/build/testrun/recovery/027_stream_regress/data/results/brin.out	2024-11-07 21:10:03.084872000 +...
@@ -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-07 21:07:16.611506000 +0000
+++ /tmp/cirrus-ci-build/build/testrun/regress/regress/results/brin.out	2024-11-07 21:09:28.568257000 +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-07 21:07:16.667360000 +0000
+++ /tmp/cirrus-ci-build/build/testrun/regress/regress/results/privileges.out	2024-11-07 21:09:28.567223000 +0000
@@ -1779,1504 +1779,10 @@
 REINDEX TABLE sro_tab;
...

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-07 21:07:08.820063170 +0000
+++ /tmp/cirrus-ci-build/src/bin/pg_upgrade/tmp_check/results/brin.out	2024-11-07 21:13:41.049678093 +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-07 21:07:08.820063170 +0000
+++ /tmp/cirrus-ci-build/src/test/regress/results/brin.out	2024-11-07 21:11:42.310112879 +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-07 21:07:10.456649139 +0000
+++ /tmp/cirrus-ci-build/build/testrun/pg_upgrade/002_pg_upgrade/data/results/brin.out	2024-11-07 21:12:32.712606388 +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-07 21:07:10.456649139 +0000
+++ /tmp/cirrus-ci-build/build/testrun/recovery/027_stream_regress/data/results/brin.out	2024-11-07 21:13:08.337210268 +...
@@ -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-07 21:07:10.456649139 +0000
+++ /tmp/cirrus-ci-build/build/testrun/regress/regress/results/brin.out	2024-11-07 21:12:28.256546077 +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-07 21:07:04
+++ /Users/admin/pgsql/build/testrun/pg_upgrade/002_pg_upgrade/data/results/brin.out	2024-11-07 21:11:13
@@ -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 /Users/admin/pgsql/src/test/regress/expected/privileges.out /Users/admin/pgsql/build/testrun/pg_upgrade/002_pg_...
--- /Users/admin/pgsql/src/test/regress/expected/privileges.out	2024-11-07 21:07:05
+++ /Users/admin/pgsql/build/testrun/pg_upgrade/002_pg_upgrade/data/results/privileges.out	2024-11-07 21:11:13
@@ -1775,1508 +1775,10 @@
 -- Do the same concurrently
...

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-07 21:07:04
+++ /Users/admin/pgsql/build/testrun/recovery/027_stream_regress/data/results/brin.out	2024-11-07 21:12:46
@@ -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 /Users/admin/pgsql/src/test/regress/expected/privileges.out /Users/admin/pgsql/build/testrun/recovery/027_strea...
--- /Users/admin/pgsql/src/test/regress/expected/privileges.out	2024-11-07 21:07:05
+++ /Users/admin/pgsql/build/testrun/recovery/027_stream_regress/data/results/privileges.out	2024-11-07 21:12:46
@@ -1775,1508 +1775,10 @@
 -- Do the same concurrently
...

diff -U3 /Users/admin/pgsql/src/test/regress/expected/brin.out /Users/admin/pgsql/build/testrun/regress/regress/results/...
--- /Users/admin/pgsql/src/test/regress/expected/brin.out	2024-11-07 21:07:04
+++ /Users/admin/pgsql/build/testrun/regress/regress/results/brin.out	2024-11-07 21:11:13
@@ -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/pg_upgrade/002_pg_upgr...
--- C:/cirrus/src/test/regress/expected/brin.out	2024-11-07 21:07:19.957426600 +0000
+++ C:/cirrus/build/testrun/pg_upgrade/002_pg_upgrade/data/results/brin.out	2024-11-07 21:10:07.056773400 +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-07 21:07:19.957426600 +0000
+++ C:/cirrus/build/testrun/recovery/027_stream_regress/data/results/brin.out	2024-11-07 21:11:57.935300300 +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-07 21:07:19.957426600 +0000
+++ C:/cirrus/build/testrun/regress/regress/results/brin.out	2024-11-07 21:10:03.973751600 +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/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-07 19:21:16.303490000 +0000
+++ /tmp/cirrus-ci-build/build/testrun/pg_upgrade/002_pg_upgrade/data/results/xml.out	2024-11-07 19:22:39.868156000 +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-07 19:21:16.303490000 +0000
+++ /tmp/cirrus-ci-build/build/testrun/recovery/027_stream_regress/data/results/xml.out	2024-11-07 19:23:23.637970000 +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-07 19:21:16.303490000 +0000
+++ /tmp/cirrus-ci-build/build/testrun/regress/regress/results/xml.out	2024-11-07 19:22:35.364174000 +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-07 19:21:11.721932233 +0000
+++ /tmp/cirrus-ci-build/src/bin/pg_upgrade/tmp_check/results/xml.out	2024-11-07 19:26:34.171033511 +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/recovery/tmp_check/results...
--- /tmp/cirrus-ci-build/src/test/regress/expected/xml.out	2024-11-07 19:21:11.721932233 +0000
+++ /tmp/cirrus-ci-build/src/test/recovery/tmp_check/results/xml.out	2024-11-07 19:27:52.162779885 +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-07 19:21:11.721932233 +0000
+++ /tmp/cirrus-ci-build/src/test/regress/results/xml.out	2024-11-07 19:24:15.339148233 +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-07 19:21:12.543655898 +0000
+++ /tmp/cirrus-ci-build/build/testrun/pg_upgrade/002_pg_upgrade/data/results/xml.out	2024-11-07 19:23:33.494821733 +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-07 19:21:12.543655898 +0000
+++ /tmp/cirrus-ci-build/build/testrun/recovery/027_stream_regress/data/results/xml.out	2024-11-07 19:24:11.583501257 +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-07 19:21:12.543655898 +0000
+++ /tmp/cirrus-ci-build/build/testrun/regress/regress/results/xml.out	2024-11-07 19:23:26.918745797 +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-07 19:21:10
+++ /Users/admin/pgsql/build/testrun/pg_upgrade/002_pg_upgrade/data/results/xml.out	2024-11-07 19:23:18
@@ -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-07 19:21:10
+++ /Users/admin/pgsql/build/testrun/recovery/027_stream_regress/data/results/xml.out	2024-11-07 19:24:27
@@ -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-07 19:21:10
+++ /Users/admin/pgsql/build/testrun/regress/regress/results/xml.out	2024-11-07 19:23:18
@@ -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-07 16:32:28.230405000 +0000
+++ /tmp/cirrus-ci-build/build/testrun/pg_upgrade/002_pg_upgrade/data/results/indexing.out	2024-11-07 16:34:28.471803000...
@@ -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-07 16:32:28.230405000 +0000
+++ /tmp/cirrus-ci-build/build/testrun/recovery/027_stream_regress/data/results/indexing.out	2024-11-07 16:35:08.2378310...
@@ -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-07 16:32:28.230405000 +0000
+++ /tmp/cirrus-ci-build/build/testrun/regress/regress/results/indexing.out	2024-11-07 16:34:23.900705000 +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-07 16:32:17.962739479 +0000
+++ /tmp/cirrus-ci-build/src/bin/pg_upgrade/tmp_check/results/indexing.out	2024-11-07 16:38:31.068426030 +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-07 16:32:17.797975097 +0000
+++ /tmp/cirrus-ci-build/src/test/isolation/output_iso/results/partitioned-cic.out	2024-11-07 16:59:24.698077755 +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-07 16:32:17.962739479 +0000
+++ /tmp/cirrus-ci-build/src/test/recovery/tmp_check/results/indexing.out	2024-11-07 16:39:20.557727849 +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-07 16:32:17.962739479 +0000
+++ /tmp/cirrus-ci-build/src/test/regress/results/indexing.out	2024-11-07 16:35:38.116120119 +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-07 16:32:20.650177573 +0000
+++ /tmp/cirrus-ci-build/build/testrun/pg_upgrade/002_pg_upgrade/data/results/indexing.out	2024-11-07 16:34:55.573744709...
@@ -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-07 16:32:20.650177573 +0000
+++ /tmp/cirrus-ci-build/build/testrun/recovery/027_stream_regress/data/results/indexing.out	2024-11-07 16:35:26.8796301...
@@ -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-07 16:32:20.650177573 +0000
+++ /tmp/cirrus-ci-build/build/testrun/regress/regress/results/indexing.out	2024-11-07 16:34:51.525535542 +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/pg_upgrade/002_pg_...
--- C:/cirrus/src/test/regress/expected/indexing.out	2024-11-07 16:32:36.596346000 +0000
+++ C:/cirrus/build/testrun/pg_upgrade/002_pg_upgrade/data/results/indexing.out	2024-11-07 16:36:30.798890000 +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-07 16:32:36.596346000 +0000
+++ C:/cirrus/build/testrun/recovery/027_stream_regress/data/results/indexing.out	2024-11-07 16:38:42.159715200 +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-07 16:32:36.596346000 +0000
+++ C:/cirrus/build/testrun/regress/regress/results/indexing.out	2024-11-07 16:36:14.044987100 +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/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-11-07 16:03:29.732559000 +0000
+++ /tmp/cirrus-ci-build/build/testrun/postgres_fdw-running/regress/results/postgres_fdw.out	2024-11-07 16:08:50.9563540...
@@ -12325,8 +12325,7 @@
   FROM postgres_fdw_get_connections(true);
  case 
 ------
-    1
-(1 row)
+(0 rows)
 
 -- After terminating the remote backend, since the connection is closed,
 -- "closed" should be TRUE, or NULL if the connection status check
@@ -12339,8 +12338,7 @@
   FROM postgres_fdw_get_connections(true);
  case 
 ------
-    1
-(1 row)
+(0 rows)
...

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-07 14:43:42.112092955 +0000
+++ /tmp/cirrus-ci-build/build-32/testrun/pg_upgrade/002_pg_upgrade/data/results/jsonb_jsonpath.out	2024-11-07 14:52:05....
@@ -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-07 14:43:42.112092955 +0000
+++ /tmp/cirrus-ci-build/build-32/testrun/recovery/027_stream_regress/data/results/jsonb_jsonpath.out	2024-11-07 14:52:4...
@@ -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-07 14:43:42.112092955 +0000
+++ /tmp/cirrus-ci-build/build-32/testrun/regress/regress/results/jsonb_jsonpath.out	2024-11-07 14:51:56.375911278 +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/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-07 04:09:04.432744501 +0000
+++ /tmp/cirrus-ci-build/src/bin/pg_upgrade/tmp_check/results/alter_table.out	2024-11-07 04:14:46.845813345 +0000
@@ -3491,9 +3491,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        
+-------+------------+---------------+-------------+----------------------
+ 38023 |            |             0 |       38023 | pktable_pkey
+ 38016 |            |             0 |       38016 | pktable
+ 38031 |            |             0 |       38031 | fktable
+ 38515 |            |             0 |       38521 | foo
+ 38526 |            |             0 |       38526 | pg_toast_38515_index
+ 38525 |            |             0 |       38525 | pg_toast_38515
+ 38726 |            |             0 |       38726 | old_oids
+ 38744 |            |             0 |       38744 | pg_toast_38741
...

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-07 04:09:04.432744501 +0000
+++ /tmp/cirrus-ci-build/src/test/recovery/tmp_check/results/alter_table.out	2024-11-07 04:15:52.733653024 +0000
@@ -3491,9 +3491,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        
+-------+------------+---------------+-------------+----------------------
+ 38056 |            |             0 |       38056 | foo
+ 37732 |            |             0 |       37732 | users_id_seq
+ 37738 |            |             0 |       37738 | pg_toast_37733
+ 37739 |            |             0 |       37739 | pg_toast_37733_index
+ 37733 |            |             0 |       37733 | users
+ 38219 |            |             0 |       38219 | forc_test
+ 37984 |            |             0 |       37984 | pktable_pkey
+ 37980 |            |             0 |       37980 | pktable
...

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-07 04:09:04.432744501 +0000
+++ /tmp/cirrus-ci-build/src/test/regress/results/alter_table.out	2024-11-07 04:12:08.989929241 +0000
@@ -3491,9 +3491,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        
+-------+------------+---------------+-------------+----------------------
+ 38032 |            |             0 |       38032 | pg_toast_38028
+ 38027 |            |             0 |       38027 | users_id_seq
+ 38033 |            |             0 |       38033 | pg_toast_38028_index
+ 38028 |            |             0 |       38028 | users
+ 38189 |            |             0 |       38189 | foo
+ 37983 |            |             0 |       37983 | pktable_pkey
+ 37980 |            |             0 |       37980 | pktable
+ 37986 |            |             0 |       37986 | fktable
...

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-07 04:08:26.365424539 +0000
+++ /tmp/cirrus-ci-build/build/testrun/pg_upgrade/002_pg_upgrade/data/results/alter_table.out	2024-11-07 04:10:42.494770...
@@ -3491,9 +3491,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        
+-------+------------+---------------+-------------+----------------------
+ 37899 |            |             0 |       37899 | pktable_pkey
+ 37896 |            |             0 |       37896 | pktable
+ 37903 |            |             0 |       37903 | fktable
+ 38383 |            |             0 |       38388 | foo
+ 38392 |            |             0 |       38392 | pg_toast_38383_index
+ 38391 |            |             0 |       38391 | pg_toast_38383
+ 38597 |            |             0 |       38597 | old_oids
+ 38616 |            |             0 |       38616 | pg_toast_38613
...

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-07 04:08:26.365424539 +0000
+++ /tmp/cirrus-ci-build/build/testrun/recovery/027_stream_regress/data/results/alter_table.out	2024-11-07 04:11:16.8306...
@@ -3491,9 +3491,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        
+-------+------------+---------------+-------------+----------------------
+ 37732 |            |             0 |       37732 | pktable_pkey
+ 37724 |            |             0 |       37724 | pktable
+ 37734 |            |             0 |       37734 | fktable
+ 38301 |            |             0 |       38301 | pg_toast_38293
+ 38293 |            |             0 |       38298 | foo
+ 38302 |            |             0 |       38302 | pg_toast_38293_index
+ 38538 |            |             0 |       38538 | old_oids
+ 38556 |            |             0 |       38556 | pg_toast_38553
...

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-07 04:08:26.365424539 +0000
+++ /tmp/cirrus-ci-build/build/testrun/regress/regress/results/alter_table.out	2024-11-07 04:10:32.902795940 +0000
@@ -3491,9 +3491,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        
+-------+------------+---------------+-------------+----------------------
+ 38094 |            |             0 |       38094 | users_id_seq
+ 38099 |            |             0 |       38099 | pg_toast_38095
+ 38100 |            |             0 |       38100 | pg_toast_38095_index
+ 38095 |            |             0 |       38095 | users
+ 38207 |            |             0 |       38207 | foo
+ 38451 |            |             0 |       38451 | forc_test
+ 38851 |            |             0 |       38851 | pg_toast_38848
+ 38852 |            |             0 |       38852 | pg_toast_38848_index
...

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-07 03:53:44.784456000 +0000
+++ /tmp/cirrus-ci-build/build/testrun/pg_upgrade/002_pg_upgrade/data/results/alter_table.out	2024-11-07 03:55:58.199318...
@@ -3491,9 +3491,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        
+-------+------------+---------------+-------------+----------------------
+ 37768 |            |             0 |       37768 | pktable_pkey
+ 37765 |            |             0 |       37765 | pktable
+ 37773 |            |             0 |       37773 | fktable
+ 38443 |            |             0 |       38448 | foo
+ 38452 |            |             0 |       38452 | pg_toast_38443_index
+ 38451 |            |             0 |       38451 | pg_toast_38443
+ 38726 |            |             0 |       38726 | old_oids
+ 38743 |            |             0 |       38743 | pg_toast_38740
...

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-07 03:53:44.784456000 +0000
+++ /tmp/cirrus-ci-build/build/testrun/recovery/027_stream_regress/data/results/alter_table.out	2024-11-07 03:56:51.5850...
@@ -3491,9 +3491,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        
+-------+------------+---------------+-------------+----------------------
+ 37911 |            |             0 |       37911 | pktable_pkey
+ 37908 |            |             0 |       37908 | pktable
+ 37913 |            |             0 |       37913 | fktable
+ 38452 |            |             0 |       38457 | foo
+ 38461 |            |             0 |       38461 | pg_toast_38452_index
+ 38460 |            |             0 |       38460 | pg_toast_38452
+ 38645 |            |             0 |       38645 | old_oids
+ 38662 |            |             0 |       38662 | pg_toast_38659
...

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-07 03:53:44.784456000 +0000
+++ /tmp/cirrus-ci-build/build/testrun/regress/regress/results/alter_table.out	2024-11-07 03:56:00.735845000 +0000
@@ -3491,9 +3491,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        
+-------+------------+---------------+-------------+----------------------
+ 37792 |            |             0 |       37792 | pktable_pkey
+ 37789 |            |             0 |       37789 | pktable
+ 37794 |            |             0 |       37794 | fktable
+ 38384 |            |             0 |       38393 | foo
+ 38397 |            |             0 |       38397 | pg_toast_38384_index
+ 38396 |            |             0 |       38396 | pg_toast_38384
+ 38615 |            |             0 |       38615 | old_oids
+ 38633 |            |             0 |       38633 | pg_toast_38630
...

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-07 03:53:50.544900100 +0000
+++ C:/cirrus/build/testrun/pg_upgrade/002_pg_upgrade/data/results/alter_table.out	2024-11-07 03:57:20.769680600 +0000
@@ -3491,9 +3491,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        
+-------+------------+---------------+-------------+----------------------
+ 37426 |            |             0 |       37426 | pktable_pkey
+ 37423 |            |             0 |       37423 | pktable
+ 37428 |            |             0 |       37428 | fktable
+ 38089 |            |             0 |       38096 | foo
+ 38101 |            |             0 |       38101 | pg_toast_38089_index
+ 38100 |            |             0 |       38100 | pg_toast_38089
+ 38348 |            |             0 |       38348 | old_oids
+ 38365 |            |             0 |       38365 | pg_toast_38362
...

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-07 03:53:50.544900100 +0000
+++ C:/cirrus/build/testrun/recovery/027_stream_regress/data/results/alter_table.out	2024-11-07 03:59:54.825896800 +0000
@@ -3491,9 +3491,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        
+-------+------------+---------------+-------------+----------------------
+ 36196 |            |             0 |       36196 | pktable_pkey
+ 36192 |            |             0 |       36192 | pktable
+ 36200 |            |             0 |       36200 | fktable
+ 37481 |            |             0 |       37500 | foo
+ 37506 |            |             0 |       37506 | pg_toast_37481_index
+ 37504 |            |             0 |       37504 | pg_toast_37481
+ 38249 |            |             0 |       38249 | old_oids
+ 38270 |            |             0 |       38270 | pg_toast_38267
...

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-07 03:53:50.544900100 +0000
+++ C:/cirrus/build/testrun/regress/regress/results/alter_table.out	2024-11-07 03:57:13.166648500 +0000
@@ -3491,9 +3491,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        
+-------+------------+---------------+-------------+----------------------
+ 37180 |            |             0 |       37180 | pktable_pkey
+ 37177 |            |             0 |       37177 | pktable
+ 37182 |            |             0 |       37182 | fktable
+ 38079 |            |             0 |       38101 | foo
+ 38105 |            |             0 |       38105 | pg_toast_38079_index
+ 38104 |            |             0 |       38104 | pg_toast_38079
+ 38370 |            |             0 |       38370 | old_oids
+ 38400 |            |             0 |       38400 | pg_toast_38397
...

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-07 03:25:09.783127900 +0000
+++ C:/cirrus/build/testrun/pg_upgrade/002_pg_upgrade/data/results/date.out	2024-11-07 03:27:18.056171700 +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-07 03:25:09.783127900 +0000
+++ C:/cirrus/build/testrun/recovery/027_stream_regress/data/results/date.out	2024-11-07 03:29:38.863119500 +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-07 03:25:09.783127900 +0000
+++ C:/cirrus/build/testrun/regress/regress/results/date.out	2024-11-07 03:27:12.206644200 +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/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-07 00:25:23.645968000 +0000
+++ /tmp/cirrus-ci-build/build/testrun/pg_upgrade/002_pg_upgrade/data/results/copy2.out	2024-11-07 00:26:56.498299000 +0...
@@ -139,7 +139,7 @@
 LINE 1: COPY x from stdin (log_verbosity unsupported);
                            ^
 COPY x from stdin with (reject_limit 1);
-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
 COPY x from stdin with (on_error ignore, reject_limit 0);
 ERROR:  REJECT_LIMIT (0) must be greater than zero
 -- too many columns in column list: should fail

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-07 00:25:23.645968000 +0000
+++ /tmp/cirrus-ci-build/build/testrun/recovery/027_stream_regress/data/results/copy2.out	2024-11-07 00:27:52.917515000 ...
@@ -139,7 +139,7 @@
 LINE 1: COPY x from stdin (log_verbosity unsupported);
                            ^
 COPY x from stdin with (reject_limit 1);
-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
 COPY x from stdin with (on_error ignore, reject_limit 0);
 ERROR:  REJECT_LIMIT (0) must be greater than zero
 -- too many columns in column list: should fail

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-07 00:25:23.645968000 +0000
+++ /tmp/cirrus-ci-build/build/testrun/regress/regress/results/copy2.out	2024-11-07 00:26:57.029205000 +0000
@@ -139,7 +139,7 @@
 LINE 1: COPY x from stdin (log_verbosity unsupported);
                            ^
 COPY x from stdin with (reject_limit 1);
-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
 COPY x from stdin with (on_error ignore, reject_limit 0);
 ERROR:  REJECT_LIMIT (0) must be greater than zero
 -- too many columns in column list: should fail

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-07 00:25:14.038604774 +0000
+++ /tmp/cirrus-ci-build/src/bin/pg_upgrade/tmp_check/results/copy2.out	2024-11-07 00:30:38.153189847 +0000
@@ -139,7 +139,7 @@
 LINE 1: COPY x from stdin (log_verbosity unsupported);
                            ^
 COPY x from stdin with (reject_limit 1);
-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
 COPY x from stdin with (on_error ignore, reject_limit 0);
 ERROR:  REJECT_LIMIT (0) must be greater than zero
 -- too many columns in column list: should fail

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-07 00:25:14.038604774 +0000
+++ /tmp/cirrus-ci-build/src/test/recovery/tmp_check/results/copy2.out	2024-11-07 00:31:57.225662782 +0000
@@ -139,7 +139,7 @@
 LINE 1: COPY x from stdin (log_verbosity unsupported);
                            ^
 COPY x from stdin with (reject_limit 1);
-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
 COPY x from stdin with (on_error ignore, reject_limit 0);
 ERROR:  REJECT_LIMIT (0) must be greater than zero
 -- too many columns in column list: should fail