PostgreSQL Patch Tester

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-24 03:54:19.375489000 +0000
+++ /tmp/cirrus-ci-build/build/testrun/recovery/027_stream_regress/data/results/jsonb.out	2024-11-24 03:56:42.730700000 ...
@@ -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-24 03:54:19.375489000 +0000
+++ /tmp/cirrus-ci-build/build/testrun/regress/regress/results/jsonb.out	2024-11-24 03:55:52.267506000 +0000
@@ -5766,8 +5766,8 @@
 ----------------------------------------
  null
  ""
- "A"
  "a"
+ "A"
  -3.14159
  0
  0.0000000001

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
...