PostgreSQL Patch Tester

diff --strip-trailing-cr -U3 C:/cirrus/src/test/regress/expected/generated_virtual.out C:/cirrus/build/testrun/pg_upgrad...
--- C:/cirrus/src/test/regress/expected/generated_virtual.out	2025-09-16 06:40:14.439373400 +0000
+++ C:/cirrus/build/testrun/pg_upgrade/002_pg_upgrade/data/results/generated_virtual.out	2025-09-16 06:46:29.312672700 +...
@@ -1643,20 +1643,22 @@
 -- should get a dummy Result, not a seq scan
 explain (costs off)
 select * from gtest33 where b < 10;
-        QUERY PLAN        
---------------------------
+         QUERY PLAN          
+-----------------------------
  Result
    One-Time Filter: false
-(2 rows)
+   Replaces: Scan on gtest33
+(3 rows)
 
 -- should get a dummy Result, not a seq scan
 explain (costs off)
 select * from gtest33 where b is null;
...

diff --strip-trailing-cr -U3 C:/cirrus/src/test/regress/expected/generated_virtual.out C:/cirrus/build/testrun/recovery/...
--- C:/cirrus/src/test/regress/expected/generated_virtual.out	2025-09-16 06:40:14.439373400 +0000
+++ C:/cirrus/build/testrun/recovery/027_stream_regress/data/results/generated_virtual.out	2025-09-16 06:49:07.305147500...
@@ -1643,20 +1643,22 @@
 -- should get a dummy Result, not a seq scan
 explain (costs off)
 select * from gtest33 where b < 10;
-        QUERY PLAN        
---------------------------
+         QUERY PLAN          
+-----------------------------
  Result
    One-Time Filter: false
-(2 rows)
+   Replaces: Scan on gtest33
+(3 rows)
 
 -- should get a dummy Result, not a seq scan
 explain (costs off)
 select * from gtest33 where b is null;
...

diff --strip-trailing-cr -U3 C:/cirrus/src/test/regress/expected/generated_virtual.out C:/cirrus/build/testrun/regress/r...
--- C:/cirrus/src/test/regress/expected/generated_virtual.out	2025-09-16 06:40:14.439373400 +0000
+++ C:/cirrus/build/testrun/regress/regress/results/generated_virtual.out	2025-09-16 06:46:25.924514400 +0000
@@ -1643,20 +1643,22 @@
 -- should get a dummy Result, not a seq scan
 explain (costs off)
 select * from gtest33 where b < 10;
-        QUERY PLAN        
---------------------------
+         QUERY PLAN          
+-----------------------------
  Result
    One-Time Filter: false
-(2 rows)
+   Replaces: Scan on gtest33
+(3 rows)
 
 -- should get a dummy Result, not a seq scan
 explain (costs off)
 select * from gtest33 where b is null;
...

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/generated_virtual.out /tmp/cirrus-ci-build/build/testrun/pg_upgr...
--- /tmp/cirrus-ci-build/src/test/regress/expected/generated_virtual.out	2025-09-16 06:40:00.729856639 +0000
+++ /tmp/cirrus-ci-build/build/testrun/pg_upgrade/002_pg_upgrade/data/results/generated_virtual.out	2025-09-16 06:45:02....
@@ -1643,20 +1643,22 @@
 -- should get a dummy Result, not a seq scan
 explain (costs off)
 select * from gtest33 where b < 10;
-        QUERY PLAN        
---------------------------
+         QUERY PLAN          
+-----------------------------
  Result
    One-Time Filter: false
-(2 rows)
+   Replaces: Scan on gtest33
+(3 rows)
 
 -- should get a dummy Result, not a seq scan
 explain (costs off)
 select * from gtest33 where b is null;
...

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/generated_virtual.out /tmp/cirrus-ci-build/build/testrun/recover...
--- /tmp/cirrus-ci-build/src/test/regress/expected/generated_virtual.out	2025-09-16 06:40:00.729856639 +0000
+++ /tmp/cirrus-ci-build/build/testrun/recovery/027_stream_regress/data/results/generated_virtual.out	2025-09-16 06:46:2...
@@ -1643,20 +1643,22 @@
 -- should get a dummy Result, not a seq scan
 explain (costs off)
 select * from gtest33 where b < 10;
-        QUERY PLAN        
---------------------------
+         QUERY PLAN          
+-----------------------------
  Result
    One-Time Filter: false
-(2 rows)
+   Replaces: Scan on gtest33
+(3 rows)
 
 -- should get a dummy Result, not a seq scan
 explain (costs off)
 select * from gtest33 where b is null;
...

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/generated_virtual.out /tmp/cirrus-ci-build/build/testrun/regress...
--- /tmp/cirrus-ci-build/src/test/regress/expected/generated_virtual.out	2025-09-16 06:40:00.729856639 +0000
+++ /tmp/cirrus-ci-build/build/testrun/regress/regress/results/generated_virtual.out	2025-09-16 06:44:59.641406760 +0000
@@ -1643,20 +1643,22 @@
 -- should get a dummy Result, not a seq scan
 explain (costs off)
 select * from gtest33 where b < 10;
-        QUERY PLAN        
---------------------------
+         QUERY PLAN          
+-----------------------------
  Result
    One-Time Filter: false
-(2 rows)
+   Replaces: Scan on gtest33
+(3 rows)
 
 -- should get a dummy Result, not a seq scan
 explain (costs off)
 select * from gtest33 where b is null;
...

diff --strip-trailing-cr -U3 C:/cirrus/src/test/regress/expected/generated_virtual.out C:/cirrus/build/testrun/pg_upgrad...
--- C:/cirrus/src/test/regress/expected/generated_virtual.out	2025-09-16 06:40:03.606999400 +0000
+++ C:/cirrus/build/testrun/pg_upgrade/002_pg_upgrade/data/results/generated_virtual.out	2025-09-16 06:43:37.331127800 +...
@@ -1643,20 +1643,22 @@
 -- should get a dummy Result, not a seq scan
 explain (costs off)
 select * from gtest33 where b < 10;
-        QUERY PLAN        
---------------------------
+         QUERY PLAN          
+-----------------------------
  Result
    One-Time Filter: false
-(2 rows)
+   Replaces: Scan on gtest33
+(3 rows)
 
 -- should get a dummy Result, not a seq scan
 explain (costs off)
 select * from gtest33 where b is null;
...

diff --strip-trailing-cr -U3 C:/cirrus/src/test/regress/expected/generated_virtual.out C:/cirrus/build/testrun/recovery/...
--- C:/cirrus/src/test/regress/expected/generated_virtual.out	2025-09-16 06:40:03.606999400 +0000
+++ C:/cirrus/build/testrun/recovery/027_stream_regress/data/results/generated_virtual.out	2025-09-16 06:46:33.510313700...
@@ -1643,20 +1643,22 @@
 -- should get a dummy Result, not a seq scan
 explain (costs off)
 select * from gtest33 where b < 10;
-        QUERY PLAN        
---------------------------
+         QUERY PLAN          
+-----------------------------
  Result
    One-Time Filter: false
-(2 rows)
+   Replaces: Scan on gtest33
+(3 rows)
 
 -- should get a dummy Result, not a seq scan
 explain (costs off)
 select * from gtest33 where b is null;
...

diff --strip-trailing-cr -U3 C:/cirrus/src/test/regress/expected/generated_virtual.out C:/cirrus/build/testrun/regress/r...
--- C:/cirrus/src/test/regress/expected/generated_virtual.out	2025-09-16 06:40:03.606999400 +0000
+++ C:/cirrus/build/testrun/regress/regress/results/generated_virtual.out	2025-09-16 06:43:32.332591800 +0000
@@ -1643,20 +1643,22 @@
 -- should get a dummy Result, not a seq scan
 explain (costs off)
 select * from gtest33 where b < 10;
-        QUERY PLAN        
---------------------------
+         QUERY PLAN          
+-----------------------------
  Result
    One-Time Filter: false
-(2 rows)
+   Replaces: Scan on gtest33
+(3 rows)
 
 -- should get a dummy Result, not a seq scan
 explain (costs off)
 select * from gtest33 where b is null;
...

diff -U3 /Users/admin/pgsql/src/test/regress/expected/generated_virtual.out /Users/admin/pgsql/build/testrun/pg_upgrade/...
--- /Users/admin/pgsql/src/test/regress/expected/generated_virtual.out	2025-09-16 06:39:12
+++ /Users/admin/pgsql/build/testrun/pg_upgrade/002_pg_upgrade/data/results/generated_virtual.out	2025-09-16 06:41:11
@@ -1643,20 +1643,22 @@
 -- should get a dummy Result, not a seq scan
 explain (costs off)
 select * from gtest33 where b < 10;
-        QUERY PLAN        
---------------------------
+         QUERY PLAN          
+-----------------------------
  Result
    One-Time Filter: false
-(2 rows)
+   Replaces: Scan on gtest33
+(3 rows)
 
 -- should get a dummy Result, not a seq scan
 explain (costs off)
 select * from gtest33 where b is null;
...

diff -U3 /Users/admin/pgsql/src/test/regress/expected/generated_virtual.out /Users/admin/pgsql/build/testrun/recovery/02...
--- /Users/admin/pgsql/src/test/regress/expected/generated_virtual.out	2025-09-16 06:39:12
+++ /Users/admin/pgsql/build/testrun/recovery/027_stream_regress/data/results/generated_virtual.out	2025-09-16 06:41:52
@@ -1643,20 +1643,22 @@
 -- should get a dummy Result, not a seq scan
 explain (costs off)
 select * from gtest33 where b < 10;
-        QUERY PLAN        
---------------------------
+         QUERY PLAN          
+-----------------------------
  Result
    One-Time Filter: false
-(2 rows)
+   Replaces: Scan on gtest33
+(3 rows)
 
 -- should get a dummy Result, not a seq scan
 explain (costs off)
 select * from gtest33 where b is null;
...

diff -U3 /Users/admin/pgsql/src/test/regress/expected/generated_virtual.out /Users/admin/pgsql/build/testrun/regress/reg...
--- /Users/admin/pgsql/src/test/regress/expected/generated_virtual.out	2025-09-16 06:39:12
+++ /Users/admin/pgsql/build/testrun/regress/regress/results/generated_virtual.out	2025-09-16 06:41:10
@@ -1643,20 +1643,22 @@
 -- should get a dummy Result, not a seq scan
 explain (costs off)
 select * from gtest33 where b < 10;
-        QUERY PLAN        
---------------------------
+         QUERY PLAN          
+-----------------------------
  Result
    One-Time Filter: false
-(2 rows)
+   Replaces: Scan on gtest33
+(3 rows)
 
 -- should get a dummy Result, not a seq scan
 explain (costs off)
 select * from gtest33 where b is null;
...

diff -U3 /home/postgres/postgres/src/test/regress/expected/generated_virtual.out /home/postgres/postgres/build/testrun/p...
--- /home/postgres/postgres/src/test/regress/expected/generated_virtual.out	Tue Sep 16 06:40:23 2025
+++ /home/postgres/postgres/build/testrun/pg_upgrade/002_pg_upgrade/data/results/generated_virtual.out	Tue Sep 16 06:44:...
@@ -1643,20 +1643,22 @@
 -- should get a dummy Result, not a seq scan
 explain (costs off)
 select * from gtest33 where b < 10;
-        QUERY PLAN        
---------------------------
+         QUERY PLAN          
+-----------------------------
  Result
    One-Time Filter: false
-(2 rows)
+   Replaces: Scan on gtest33
+(3 rows)
 
 -- should get a dummy Result, not a seq scan
 explain (costs off)
 select * from gtest33 where b is null;
...

diff -U3 /home/postgres/postgres/src/test/regress/expected/generated_virtual.out /home/postgres/postgres/build/testrun/r...
--- /home/postgres/postgres/src/test/regress/expected/generated_virtual.out	Tue Sep 16 06:40:23 2025
+++ /home/postgres/postgres/build/testrun/recovery/027_stream_regress/data/results/generated_virtual.out	Tue Sep 16 06:4...
@@ -1643,20 +1643,22 @@
 -- should get a dummy Result, not a seq scan
 explain (costs off)
 select * from gtest33 where b < 10;
-        QUERY PLAN        
---------------------------
+         QUERY PLAN          
+-----------------------------
  Result
    One-Time Filter: false
-(2 rows)
+   Replaces: Scan on gtest33
+(3 rows)
 
 -- should get a dummy Result, not a seq scan
 explain (costs off)
 select * from gtest33 where b is null;
...

diff -U3 /home/postgres/postgres/src/test/regress/expected/generated_virtual.out /home/postgres/postgres/build/testrun/r...
--- /home/postgres/postgres/src/test/regress/expected/generated_virtual.out	Tue Sep 16 06:40:23 2025
+++ /home/postgres/postgres/build/testrun/regress/regress/results/generated_virtual.out	Tue Sep 16 06:44:05 2025
@@ -1643,20 +1643,22 @@
 -- should get a dummy Result, not a seq scan
 explain (costs off)
 select * from gtest33 where b < 10;
-        QUERY PLAN        
---------------------------
+         QUERY PLAN          
+-----------------------------
  Result
    One-Time Filter: false
-(2 rows)
+   Replaces: Scan on gtest33
+(3 rows)
 
 -- should get a dummy Result, not a seq scan
 explain (costs off)
 select * from gtest33 where b is null;
...

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/generated_virtual.out /tmp/cirrus-ci-build/build/testrun/pg_upgr...
--- /tmp/cirrus-ci-build/src/test/regress/expected/generated_virtual.out	2025-09-16 06:40:02.187862000 +0000
+++ /tmp/cirrus-ci-build/build/testrun/pg_upgrade/002_pg_upgrade/data/results/generated_virtual.out	2025-09-16 06:43:12....
@@ -1643,20 +1643,22 @@
 -- should get a dummy Result, not a seq scan
 explain (costs off)
 select * from gtest33 where b < 10;
-        QUERY PLAN        
---------------------------
+         QUERY PLAN          
+-----------------------------
  Result
    One-Time Filter: false
-(2 rows)
+   Replaces: Scan on gtest33
+(3 rows)
 
 -- should get a dummy Result, not a seq scan
 explain (costs off)
 select * from gtest33 where b is null;
...

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/generated_virtual.out /tmp/cirrus-ci-build/build/testrun/recover...
--- /tmp/cirrus-ci-build/src/test/regress/expected/generated_virtual.out	2025-09-16 06:40:02.187862000 +0000
+++ /tmp/cirrus-ci-build/build/testrun/recovery/027_stream_regress/data/results/generated_virtual.out	2025-09-16 06:44:3...
@@ -1643,20 +1643,22 @@
 -- should get a dummy Result, not a seq scan
 explain (costs off)
 select * from gtest33 where b < 10;
-        QUERY PLAN        
---------------------------
+         QUERY PLAN          
+-----------------------------
  Result
    One-Time Filter: false
-(2 rows)
+   Replaces: Scan on gtest33
+(3 rows)
 
 -- should get a dummy Result, not a seq scan
 explain (costs off)
 select * from gtest33 where b is null;
...

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/generated_virtual.out /tmp/cirrus-ci-build/build/testrun/regress...
--- /tmp/cirrus-ci-build/src/test/regress/expected/generated_virtual.out	2025-09-16 06:40:02.187862000 +0000
+++ /tmp/cirrus-ci-build/build/testrun/regress/regress/results/generated_virtual.out	2025-09-16 06:43:10.734936000 +0000
@@ -1643,20 +1643,22 @@
 -- should get a dummy Result, not a seq scan
 explain (costs off)
 select * from gtest33 where b < 10;
-        QUERY PLAN        
---------------------------
+         QUERY PLAN          
+-----------------------------
  Result
    One-Time Filter: false
-(2 rows)
+   Replaces: Scan on gtest33
+(3 rows)
 
 -- should get a dummy Result, not a seq scan
 explain (costs off)
 select * from gtest33 where b is null;
...

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/generated_virtual.out /tmp/cirrus-ci-build/src/bin/pg_upgrade/tm...
--- /tmp/cirrus-ci-build/src/test/regress/expected/generated_virtual.out	2025-09-16 06:40:10.734414118 +0000
+++ /tmp/cirrus-ci-build/src/bin/pg_upgrade/tmp_check/results/generated_virtual.out	2025-09-16 06:49:13.297520537 +0000
@@ -1643,20 +1643,22 @@
 -- should get a dummy Result, not a seq scan
 explain (costs off)
 select * from gtest33 where b < 10;
-        QUERY PLAN        
---------------------------
+         QUERY PLAN          
+-----------------------------
  Result
    One-Time Filter: false
-(2 rows)
+   Replaces: Scan on gtest33
+(3 rows)
 
 -- should get a dummy Result, not a seq scan
 explain (costs off)
 select * from gtest33 where b is null;
...

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/generated_virtual.out /tmp/cirrus-ci-build/src/test/recovery/tmp...
--- /tmp/cirrus-ci-build/src/test/regress/expected/generated_virtual.out	2025-09-16 06:40:10.734414118 +0000
+++ /tmp/cirrus-ci-build/src/test/recovery/tmp_check/results/generated_virtual.out	2025-09-16 06:50:21.309425833 +0000
@@ -1643,20 +1643,22 @@
 -- should get a dummy Result, not a seq scan
 explain (costs off)
 select * from gtest33 where b < 10;
-        QUERY PLAN        
---------------------------
+         QUERY PLAN          
+-----------------------------
  Result
    One-Time Filter: false
-(2 rows)
+   Replaces: Scan on gtest33
+(3 rows)
 
 -- should get a dummy Result, not a seq scan
 explain (costs off)
 select * from gtest33 where b is null;
...

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/generated_virtual.out /tmp/cirrus-ci-build/src/test/regress/resu...
--- /tmp/cirrus-ci-build/src/test/regress/expected/generated_virtual.out	2025-09-16 06:40:10.734414118 +0000
+++ /tmp/cirrus-ci-build/src/test/regress/results/generated_virtual.out	2025-09-16 06:45:19.457916551 +0000
@@ -1643,20 +1643,22 @@
 -- should get a dummy Result, not a seq scan
 explain (costs off)
 select * from gtest33 where b < 10;
-        QUERY PLAN        
---------------------------
+         QUERY PLAN          
+-----------------------------
  Result
    One-Time Filter: false
-(2 rows)
+   Replaces: Scan on gtest33
+(3 rows)
 
 -- should get a dummy Result, not a seq scan
 explain (costs off)
 select * from gtest33 where b is null;
...

diff -U3 /home/postgres/postgres/src/test/regress/expected/generated_virtual.out /home/postgres/postgres/build/testrun/p...
--- /home/postgres/postgres/src/test/regress/expected/generated_virtual.out	2025-09-16 06:40:32.660870784 +0000
+++ /home/postgres/postgres/build/testrun/pg_upgrade/002_pg_upgrade/data/results/generated_virtual.out	2025-09-16 06:43:...
@@ -1643,20 +1643,22 @@
 -- should get a dummy Result, not a seq scan
 explain (costs off)
 select * from gtest33 where b < 10;
-        QUERY PLAN        
---------------------------
+         QUERY PLAN          
+-----------------------------
  Result
    One-Time Filter: false
-(2 rows)
+   Replaces: Scan on gtest33
+(3 rows)
 
 -- should get a dummy Result, not a seq scan
 explain (costs off)
 select * from gtest33 where b is null;
...

diff -U3 /home/postgres/postgres/src/test/regress/expected/generated_virtual.out /home/postgres/postgres/build/testrun/r...
--- /home/postgres/postgres/src/test/regress/expected/generated_virtual.out	2025-09-16 06:40:32.660870784 +0000
+++ /home/postgres/postgres/build/testrun/recovery/027_stream_regress/data/results/generated_virtual.out	2025-09-16 06:4...
@@ -1643,20 +1643,22 @@
 -- should get a dummy Result, not a seq scan
 explain (costs off)
 select * from gtest33 where b < 10;
-        QUERY PLAN        
---------------------------
+         QUERY PLAN          
+-----------------------------
  Result
    One-Time Filter: false
-(2 rows)
+   Replaces: Scan on gtest33
+(3 rows)
 
 -- should get a dummy Result, not a seq scan
 explain (costs off)
 select * from gtest33 where b is null;
...

diff -U3 /home/postgres/postgres/src/test/regress/expected/generated_virtual.out /home/postgres/postgres/build/testrun/r...
--- /home/postgres/postgres/src/test/regress/expected/generated_virtual.out	2025-09-16 06:40:32.660870784 +0000
+++ /home/postgres/postgres/build/testrun/regress/regress/results/generated_virtual.out	2025-09-16 06:43:17.922327242 +0...
@@ -1643,20 +1643,22 @@
 -- should get a dummy Result, not a seq scan
 explain (costs off)
 select * from gtest33 where b < 10;
-        QUERY PLAN        
---------------------------
+         QUERY PLAN          
+-----------------------------
  Result
    One-Time Filter: false
-(2 rows)
+   Replaces: Scan on gtest33
+(3 rows)
 
 -- should get a dummy Result, not a seq scan
 explain (costs off)
 select * from gtest33 where b is null;
...

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/create_index.out /tmp/cirrus-ci-build/build/testrun/regress-runn...
--- /tmp/cirrus-ci-build/src/test/regress/expected/create_index.out	2025-09-15 23:05:11.239924000 +0000
+++ /tmp/cirrus-ci-build/build/testrun/regress-running/regress/results/create_index.out	2025-09-15 23:13:01.583005000 +0...
@@ -2042,7 +2042,7 @@
                                  QUERY PLAN                                 
 ----------------------------------------------------------------------------
  Aggregate
-   ->  Index Only Scan using tenk1_thous_tenthous on tenk1 t1
+   ->  Seq Scan on tenk1 t1
          Filter: ((thousand = 42) OR (thousand = (SubPlan 1)))
          SubPlan 1
            ->  Limit
@@ -2211,9 +2211,11 @@
                Filter: ((thousand = 42) OR (thousand = 41) OR (tenthous = 2))
                ->  Bitmap Index Scan on tenk2_hundred
                      Index Cond: (hundred = 42)
-         ->  Index Only Scan using tenk1_hundred on tenk1
-               Index Cond: (hundred = 42)
-(9 rows)
+         ->  Bitmap Heap Scan on tenk1
...

diff --strip-trailing-cr -U3 C:/cirrus/src/test/isolation/expected/lock-update-traversal.out C:/cirrus/build/testrun/iso...
--- C:/cirrus/src/test/isolation/expected/lock-update-traversal.out	2025-09-15 22:23:15.786094300 +0000
+++ C:/cirrus/build/testrun/isolation/isolation/results/lock-update-traversal.out	2025-09-15 22:30:23.471166700 +0000
@@ -1,63 +1,6 @@
 Parsed test spec with 2 sessions
 
 starting permutation: s1b s2b s1s s2u s1l s2c s2d1 s1c
-step s1b: BEGIN ISOLATION LEVEL REPEATABLE READ;
-step s2b: BEGIN;
-step s1s: SELECT * FROM foo;
-key|value
----+-----
-  1|    1
-(1 row)
-
-step s2u: UPDATE foo SET value = 2 WHERE key = 1;
-step s1l: SELECT * FROM foo FOR KEY SHARE;
-key|value
----+-----
-  1|    1
...

diff --strip-trailing-cr -U3 C:/cirrus/src/test/regress/expected/vacuum_parallel.out C:/cirrus/build/testrun/pg_upgrade/...
--- C:/cirrus/src/test/regress/expected/vacuum_parallel.out	2025-09-15 22:23:16.734780000 +0000
+++ C:/cirrus/build/testrun/pg_upgrade/002_pg_upgrade/data/results/vacuum_parallel.out	2025-09-15 22:29:51.752880000 +00...
@@ -43,7 +43,7 @@
 -- Since vacuum_in_leader_small_index uses deduplication, we expect an
 -- assertion failure with bug #17245 (in the absence of bugfix):
 INSERT INTO parallel_vacuum_table SELECT i FROM generate_series(1, 10000) i;
-RESET max_parallel_maintenance_workers;
-RESET min_parallel_index_scan_size;
--- Deliberately don't drop table, to get further coverage from tools like
--- pg_amcheck in some testing scenarios
+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/maintain_every.out C:/cirrus/build/testrun/pg_upgrade/0...
--- C:/cirrus/src/test/regress/expected/maintain_every.out	2025-09-15 22:23:16.601449500 +0000
+++ C:/cirrus/build/testrun/pg_upgrade/002_pg_upgrade/data/results/maintain_every.out	2025-09-15 22:29:51.862271400 +000...
@@ -1,33 +1,2 @@
--- Test maintenance commands that visit every eligible relation.  Run as a
...

diff --strip-trailing-cr -U3 C:/cirrus/src/test/regress/expected/vacuum_parallel.out C:/cirrus/build/testrun/recovery/02...
--- C:/cirrus/src/test/regress/expected/vacuum_parallel.out	2025-09-15 22:23:16.734780000 +0000
+++ C:/cirrus/build/testrun/recovery/027_stream_regress/data/results/vacuum_parallel.out	2025-09-15 22:32:29.244642300 +...
@@ -43,7 +43,7 @@
 -- Since vacuum_in_leader_small_index uses deduplication, we expect an
 -- assertion failure with bug #17245 (in the absence of bugfix):
 INSERT INTO parallel_vacuum_table SELECT i FROM generate_series(1, 10000) i;
-RESET max_parallel_maintenance_workers;
-RESET min_parallel_index_scan_size;
--- Deliberately don't drop table, to get further coverage from tools like
--- pg_amcheck in some testing scenarios
+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/maintain_every.out C:/cirrus/build/testrun/recovery/027...
--- C:/cirrus/src/test/regress/expected/maintain_every.out	2025-09-15 22:23:16.601449500 +0000
+++ C:/cirrus/build/testrun/recovery/027_stream_regress/data/results/maintain_every.out	2025-09-15 22:32:29.459765600 +0...
@@ -1,33 +1,2 @@
--- Test maintenance commands that visit every eligible relation.  Run as a
...

diff --strip-trailing-cr -U3 C:/cirrus/src/test/regress/expected/vacuum_parallel.out C:/cirrus/build/testrun/regress/reg...
--- C:/cirrus/src/test/regress/expected/vacuum_parallel.out	2025-09-15 22:23:16.734780000 +0000
+++ C:/cirrus/build/testrun/regress/regress/results/vacuum_parallel.out	2025-09-15 22:29:51.631308200 +0000
@@ -43,7 +43,7 @@
 -- Since vacuum_in_leader_small_index uses deduplication, we expect an
 -- assertion failure with bug #17245 (in the absence of bugfix):
 INSERT INTO parallel_vacuum_table SELECT i FROM generate_series(1, 10000) i;
-RESET max_parallel_maintenance_workers;
-RESET min_parallel_index_scan_size;
--- Deliberately don't drop table, to get further coverage from tools like
--- pg_amcheck in some testing scenarios
+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/maintain_every.out C:/cirrus/build/testrun/regress/regr...
--- C:/cirrus/src/test/regress/expected/maintain_every.out	2025-09-15 22:23:16.601449500 +0000
+++ C:/cirrus/build/testrun/regress/regress/results/maintain_every.out	2025-09-15 22:29:51.814895800 +0000
@@ -1,33 +1,2 @@
--- Test maintenance commands that visit every eligible relation.  Run as a
...

diff -U3 /Users/admin/pgsql/src/test/isolation/expected/lock-update-traversal.out /Users/admin/pgsql/build/testrun/isola...
--- /Users/admin/pgsql/src/test/isolation/expected/lock-update-traversal.out	2025-09-15 22:22:07
+++ /Users/admin/pgsql/build/testrun/isolation/isolation/results/lock-update-traversal.out	2025-09-15 22:24:40
@@ -1,63 +1,6 @@
 Parsed test spec with 2 sessions
 
 starting permutation: s1b s2b s1s s2u s1l s2c s2d1 s1c
-step s1b: BEGIN ISOLATION LEVEL REPEATABLE READ;
-step s2b: BEGIN;
-step s1s: SELECT * FROM foo;
-key|value
----+-----
-  1|    1
-(1 row)
-
-step s2u: UPDATE foo SET value = 2 WHERE key = 1;
-step s1l: SELECT * FROM foo FOR KEY SHARE;
-key|value
----+-----
-  1|    1
...

diff -U3 /Users/admin/pgsql/src/test/regress/expected/vacuum_parallel.out /Users/admin/pgsql/build/testrun/pg_upgrade/00...
--- /Users/admin/pgsql/src/test/regress/expected/vacuum_parallel.out	2025-09-15 22:22:07
+++ /Users/admin/pgsql/build/testrun/pg_upgrade/002_pg_upgrade/data/results/vacuum_parallel.out	2025-09-15 22:24:40
@@ -43,7 +43,7 @@
 -- Since vacuum_in_leader_small_index uses deduplication, we expect an
 -- assertion failure with bug #17245 (in the absence of bugfix):
 INSERT INTO parallel_vacuum_table SELECT i FROM generate_series(1, 10000) i;
-RESET max_parallel_maintenance_workers;
-RESET min_parallel_index_scan_size;
--- Deliberately don't drop table, to get further coverage from tools like
--- pg_amcheck in some testing scenarios
+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/maintain_every.out /Users/admin/pgsql/build/testrun/pg_upgrade/002...
--- /Users/admin/pgsql/src/test/regress/expected/maintain_every.out	2025-09-15 22:22:07
+++ /Users/admin/pgsql/build/testrun/pg_upgrade/002_pg_upgrade/data/results/maintain_every.out	2025-09-15 22:24:41
@@ -1,33 +1,2 @@
--- Test maintenance commands that visit every eligible relation.  Run as a
...

diff -U3 /Users/admin/pgsql/src/test/regress/expected/vacuum_parallel.out /Users/admin/pgsql/build/testrun/recovery/027_...
--- /Users/admin/pgsql/src/test/regress/expected/vacuum_parallel.out	2025-09-15 22:22:07
+++ /Users/admin/pgsql/build/testrun/recovery/027_stream_regress/data/results/vacuum_parallel.out	2025-09-15 22:25:26
@@ -43,7 +43,7 @@
 -- Since vacuum_in_leader_small_index uses deduplication, we expect an
 -- assertion failure with bug #17245 (in the absence of bugfix):
 INSERT INTO parallel_vacuum_table SELECT i FROM generate_series(1, 10000) i;
-RESET max_parallel_maintenance_workers;
-RESET min_parallel_index_scan_size;
--- Deliberately don't drop table, to get further coverage from tools like
--- pg_amcheck in some testing scenarios
+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/maintain_every.out /Users/admin/pgsql/build/testrun/recovery/027_s...
--- /Users/admin/pgsql/src/test/regress/expected/maintain_every.out	2025-09-15 22:22:07
+++ /Users/admin/pgsql/build/testrun/recovery/027_stream_regress/data/results/maintain_every.out	2025-09-15 22:25:26
@@ -1,33 +1,2 @@
--- Test maintenance commands that visit every eligible relation.  Run as a
...

diff -U3 /Users/admin/pgsql/src/test/regress/expected/vacuum_parallel.out /Users/admin/pgsql/build/testrun/regress/regre...
--- /Users/admin/pgsql/src/test/regress/expected/vacuum_parallel.out	2025-09-15 22:22:07
+++ /Users/admin/pgsql/build/testrun/regress/regress/results/vacuum_parallel.out	2025-09-15 22:24:40
@@ -43,7 +43,7 @@
 -- Since vacuum_in_leader_small_index uses deduplication, we expect an
 -- assertion failure with bug #17245 (in the absence of bugfix):
 INSERT INTO parallel_vacuum_table SELECT i FROM generate_series(1, 10000) i;
-RESET max_parallel_maintenance_workers;
-RESET min_parallel_index_scan_size;
--- Deliberately don't drop table, to get further coverage from tools like
--- pg_amcheck in some testing scenarios
+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/maintain_every.out /Users/admin/pgsql/build/testrun/regress/regres...
--- /Users/admin/pgsql/src/test/regress/expected/maintain_every.out	2025-09-15 22:22:07
+++ /Users/admin/pgsql/build/testrun/regress/regress/results/maintain_every.out	2025-09-15 22:24:41
@@ -1,33 +1,2 @@
--- Test maintenance commands that visit every eligible relation.  Run as a
...

diff -U3 /tmp/cirrus-ci-build/src/test/isolation/expected/lock-update-traversal.out /tmp/cirrus-ci-build/build/testrun/i...
--- /tmp/cirrus-ci-build/src/test/isolation/expected/lock-update-traversal.out	2025-09-15 22:23:00.156555852 +0000
+++ /tmp/cirrus-ci-build/build/testrun/isolation/isolation/results/lock-update-traversal.out	2025-09-15 22:28:32.2016242...
@@ -1,63 +1,6 @@
 Parsed test spec with 2 sessions
 
 starting permutation: s1b s2b s1s s2u s1l s2c s2d1 s1c
-step s1b: BEGIN ISOLATION LEVEL REPEATABLE READ;
-step s2b: BEGIN;
-step s1s: SELECT * FROM foo;
-key|value
----+-----
-  1|    1
-(1 row)
-
-step s2u: UPDATE foo SET value = 2 WHERE key = 1;
-step s1l: SELECT * FROM foo FOR KEY SHARE;
-key|value
----+-----
-  1|    1
...

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/vacuum_parallel.out /tmp/cirrus-ci-build/build/testrun/pg_upgrad...
--- /tmp/cirrus-ci-build/src/test/regress/expected/vacuum_parallel.out	2025-09-15 22:23:00.400821501 +0000
+++ /tmp/cirrus-ci-build/build/testrun/pg_upgrade/002_pg_upgrade/data/results/vacuum_parallel.out	2025-09-15 22:28:48.80...
@@ -43,7 +43,7 @@
 -- Since vacuum_in_leader_small_index uses deduplication, we expect an
 -- assertion failure with bug #17245 (in the absence of bugfix):
 INSERT INTO parallel_vacuum_table SELECT i FROM generate_series(1, 10000) i;
-RESET max_parallel_maintenance_workers;
-RESET min_parallel_index_scan_size;
--- Deliberately don't drop table, to get further coverage from tools like
--- pg_amcheck in some testing scenarios
+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/publication.out /tmp/cirrus-ci-build/build/testrun/pg_upgrade/00...
--- /tmp/cirrus-ci-build/src/test/regress/expected/publication.out	2025-09-15 22:23:00.368786661 +0000
+++ /tmp/cirrus-ci-build/build/testrun/pg_upgrade/002_pg_upgrade/data/results/publication.out	2025-09-15 22:28:49.385635...
@@ -359,1643 +359,10 @@
     "public.testpub_rf_tbl3" WHERE ((e > 300) AND (e < 500))
...

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/vacuum_parallel.out /tmp/cirrus-ci-build/build/testrun/recovery/...
--- /tmp/cirrus-ci-build/src/test/regress/expected/vacuum_parallel.out	2025-09-15 22:23:00.400821501 +0000
+++ /tmp/cirrus-ci-build/build/testrun/recovery/027_stream_regress/data/results/vacuum_parallel.out	2025-09-15 22:29:45....
@@ -43,7 +43,7 @@
 -- Since vacuum_in_leader_small_index uses deduplication, we expect an
 -- assertion failure with bug #17245 (in the absence of bugfix):
 INSERT INTO parallel_vacuum_table SELECT i FROM generate_series(1, 10000) i;
-RESET max_parallel_maintenance_workers;
-RESET min_parallel_index_scan_size;
--- Deliberately don't drop table, to get further coverage from tools like
--- pg_amcheck in some testing scenarios
+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/maintain_every.out /tmp/cirrus-ci-build/build/testrun/recovery/0...
--- /tmp/cirrus-ci-build/src/test/regress/expected/maintain_every.out	2025-09-15 22:23:00.344760533 +0000
+++ /tmp/cirrus-ci-build/build/testrun/recovery/027_stream_regress/data/results/maintain_every.out	2025-09-15 22:29:45.0...
@@ -10,24 +10,10 @@
 CREATE TEMP TABLE past_inh_db_child () INHERITS (past_inh_db_parent);
...

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/vacuum_parallel.out /tmp/cirrus-ci-build/build/testrun/regress/r...
--- /tmp/cirrus-ci-build/src/test/regress/expected/vacuum_parallel.out	2025-09-15 22:23:00.400821501 +0000
+++ /tmp/cirrus-ci-build/build/testrun/regress/regress/results/vacuum_parallel.out	2025-09-15 22:28:47.697634118 +0000
@@ -43,7 +43,7 @@
 -- Since vacuum_in_leader_small_index uses deduplication, we expect an
 -- assertion failure with bug #17245 (in the absence of bugfix):
 INSERT INTO parallel_vacuum_table SELECT i FROM generate_series(1, 10000) i;
-RESET max_parallel_maintenance_workers;
-RESET min_parallel_index_scan_size;
--- Deliberately don't drop table, to get further coverage from tools like
--- pg_amcheck in some testing scenarios
+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/maintain_every.out /tmp/cirrus-ci-build/build/testrun/regress/re...
--- /tmp/cirrus-ci-build/src/test/regress/expected/maintain_every.out	2025-09-15 22:23:00.344760533 +0000
+++ /tmp/cirrus-ci-build/build/testrun/regress/regress/results/maintain_every.out	2025-09-15 22:28:48.289634529 +0000
@@ -29,5 +29,10 @@
 (1 row)
...

diff --strip-trailing-cr -U3 C:/cirrus/src/test/isolation/expected/lock-update-traversal.out C:/cirrus/build/testrun/iso...
--- C:/cirrus/src/test/isolation/expected/lock-update-traversal.out	2025-09-15 22:23:04.086182400 +0000
+++ C:/cirrus/build/testrun/isolation/isolation/results/lock-update-traversal.out	2025-09-15 22:26:43.625336300 +0000
@@ -1,63 +1,6 @@
 Parsed test spec with 2 sessions
 
 starting permutation: s1b s2b s1s s2u s1l s2c s2d1 s1c
-step s1b: BEGIN ISOLATION LEVEL REPEATABLE READ;
-step s2b: BEGIN;
-step s1s: SELECT * FROM foo;
-key|value
----+-----
-  1|    1
-(1 row)
-
-step s2u: UPDATE foo SET value = 2 WHERE key = 1;
-step s1l: SELECT * FROM foo FOR KEY SHARE;
-key|value
----+-----
-  1|    1
...

diff --strip-trailing-cr -U3 C:/cirrus/src/test/regress/expected/vacuum_parallel.out C:/cirrus/build/testrun/pg_upgrade/...
--- C:/cirrus/src/test/regress/expected/vacuum_parallel.out	2025-09-15 22:23:05.052149700 +0000
+++ C:/cirrus/build/testrun/pg_upgrade/002_pg_upgrade/data/results/vacuum_parallel.out	2025-09-15 22:27:00.068707700 +00...
@@ -43,7 +43,7 @@
 -- Since vacuum_in_leader_small_index uses deduplication, we expect an
 -- assertion failure with bug #17245 (in the absence of bugfix):
 INSERT INTO parallel_vacuum_table SELECT i FROM generate_series(1, 10000) i;
-RESET max_parallel_maintenance_workers;
-RESET min_parallel_index_scan_size;
--- Deliberately don't drop table, to get further coverage from tools like
--- pg_amcheck in some testing scenarios
+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/maintain_every.out C:/cirrus/build/testrun/pg_upgrade/0...
--- C:/cirrus/src/test/regress/expected/maintain_every.out	2025-09-15 22:23:04.924232900 +0000
+++ C:/cirrus/build/testrun/pg_upgrade/002_pg_upgrade/data/results/maintain_every.out	2025-09-15 22:27:00.252248300 +000...
@@ -1,33 +1,2 @@
--- Test maintenance commands that visit every eligible relation.  Run as a
...

diff --strip-trailing-cr -U3 C:/cirrus/src/test/regress/expected/vacuum_parallel.out C:/cirrus/build/testrun/recovery/02...
--- C:/cirrus/src/test/regress/expected/vacuum_parallel.out	2025-09-15 22:23:05.052149700 +0000
+++ C:/cirrus/build/testrun/recovery/027_stream_regress/data/results/vacuum_parallel.out	2025-09-15 22:29:34.407087300 +...
@@ -43,7 +43,7 @@
 -- Since vacuum_in_leader_small_index uses deduplication, we expect an
 -- assertion failure with bug #17245 (in the absence of bugfix):
 INSERT INTO parallel_vacuum_table SELECT i FROM generate_series(1, 10000) i;
-RESET max_parallel_maintenance_workers;
-RESET min_parallel_index_scan_size;
--- Deliberately don't drop table, to get further coverage from tools like
--- pg_amcheck in some testing scenarios
+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/maintain_every.out C:/cirrus/build/testrun/recovery/027...
--- C:/cirrus/src/test/regress/expected/maintain_every.out	2025-09-15 22:23:04.924232900 +0000
+++ C:/cirrus/build/testrun/recovery/027_stream_regress/data/results/maintain_every.out	2025-09-15 22:29:34.803576300 +0...
@@ -1,33 +1,2 @@
--- Test maintenance commands that visit every eligible relation.  Run as a
...

diff --strip-trailing-cr -U3 C:/cirrus/src/test/regress/expected/vacuum_parallel.out C:/cirrus/build/testrun/regress/reg...
--- C:/cirrus/src/test/regress/expected/vacuum_parallel.out	2025-09-15 22:23:05.052149700 +0000
+++ C:/cirrus/build/testrun/regress/regress/results/vacuum_parallel.out	2025-09-15 22:26:51.056975100 +0000
@@ -43,7 +43,7 @@
 -- Since vacuum_in_leader_small_index uses deduplication, we expect an
 -- assertion failure with bug #17245 (in the absence of bugfix):
 INSERT INTO parallel_vacuum_table SELECT i FROM generate_series(1, 10000) i;
-RESET max_parallel_maintenance_workers;
-RESET min_parallel_index_scan_size;
--- Deliberately don't drop table, to get further coverage from tools like
--- pg_amcheck in some testing scenarios
+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/maintain_every.out C:/cirrus/build/testrun/regress/regr...
--- C:/cirrus/src/test/regress/expected/maintain_every.out	2025-09-15 22:23:04.924232900 +0000
+++ C:/cirrus/build/testrun/regress/regress/results/maintain_every.out	2025-09-15 22:26:52.342890700 +0000
@@ -1,33 +1,2 @@
--- Test maintenance commands that visit every eligible relation.  Run as a
...

diff -U3 /tmp/cirrus-ci-build/src/test/isolation/expected/insert-conflict-do-nothing-2.out /tmp/cirrus-ci-build/build/te...
--- /tmp/cirrus-ci-build/src/test/isolation/expected/insert-conflict-do-nothing-2.out	2025-09-15 22:23:00.588928000 +000...
+++ /tmp/cirrus-ci-build/build/testrun/isolation/isolation/results/insert-conflict-do-nothing-2.out	2025-09-15 22:25:59....
@@ -61,61 +61,6 @@
 
 
 starting permutation: begins1 begins2 donothing1 c1 donothing2 c2 show
-step begins1: BEGIN ISOLATION LEVEL SERIALIZABLE;
-step begins2: BEGIN ISOLATION LEVEL SERIALIZABLE;
-step donothing1: INSERT INTO ints(key, val) VALUES(1, 'donothing1') ON CONFLICT DO NOTHING;
-step c1: COMMIT;
-step donothing2: INSERT INTO ints(key, val) VALUES(1, 'donothing2'), (1, 'donothing3') ON CONFLICT DO NOTHING;
-step c2: COMMIT;
-step show: SELECT * FROM ints;
-key|val       
----+----------
-  1|donothing1
-(1 row)
-
-
...

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/vacuum_parallel.out /tmp/cirrus-ci-build/build/testrun/pg_upgrad...
--- /tmp/cirrus-ci-build/src/test/regress/expected/vacuum_parallel.out	2025-09-15 22:23:00.782241000 +0000
+++ /tmp/cirrus-ci-build/build/testrun/pg_upgrade/002_pg_upgrade/data/results/vacuum_parallel.out	2025-09-15 22:26:48.90...
@@ -43,7 +43,7 @@
 -- Since vacuum_in_leader_small_index uses deduplication, we expect an
 -- assertion failure with bug #17245 (in the absence of bugfix):
 INSERT INTO parallel_vacuum_table SELECT i FROM generate_series(1, 10000) i;
-RESET max_parallel_maintenance_workers;
-RESET min_parallel_index_scan_size;
--- Deliberately don't drop table, to get further coverage from tools like
--- pg_amcheck in some testing scenarios
+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/maintain_every.out /tmp/cirrus-ci-build/build/testrun/pg_upgrade...
--- /tmp/cirrus-ci-build/src/test/regress/expected/maintain_every.out	2025-09-15 22:23:00.733664000 +0000
+++ /tmp/cirrus-ci-build/build/testrun/pg_upgrade/002_pg_upgrade/data/results/maintain_every.out	2025-09-15 22:26:48.929...
@@ -1,33 +1,2 @@
--- Test maintenance commands that visit every eligible relation.  Run as a
...

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/vacuum_parallel.out /tmp/cirrus-ci-build/build/testrun/recovery/...
--- /tmp/cirrus-ci-build/src/test/regress/expected/vacuum_parallel.out	2025-09-15 22:23:00.782241000 +0000
+++ /tmp/cirrus-ci-build/build/testrun/recovery/027_stream_regress/data/results/vacuum_parallel.out	2025-09-15 22:27:52....
@@ -43,7 +43,7 @@
 -- Since vacuum_in_leader_small_index uses deduplication, we expect an
 -- assertion failure with bug #17245 (in the absence of bugfix):
 INSERT INTO parallel_vacuum_table SELECT i FROM generate_series(1, 10000) i;
-RESET max_parallel_maintenance_workers;
-RESET min_parallel_index_scan_size;
--- Deliberately don't drop table, to get further coverage from tools like
--- pg_amcheck in some testing scenarios
+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/maintain_every.out /tmp/cirrus-ci-build/build/testrun/recovery/0...
--- /tmp/cirrus-ci-build/src/test/regress/expected/maintain_every.out	2025-09-15 22:23:00.733664000 +0000
+++ /tmp/cirrus-ci-build/build/testrun/recovery/027_stream_regress/data/results/maintain_every.out	2025-09-15 22:27:52.9...
@@ -1,33 +1,3 @@
--- Test maintenance commands that visit every eligible relation.  Run as a
...

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/vacuum_parallel.out /tmp/cirrus-ci-build/build/testrun/regress/r...
--- /tmp/cirrus-ci-build/src/test/regress/expected/vacuum_parallel.out	2025-09-15 22:23:00.782241000 +0000
+++ /tmp/cirrus-ci-build/build/testrun/regress/regress/results/vacuum_parallel.out	2025-09-15 22:26:50.707521000 +0000
@@ -43,7 +43,7 @@
 -- Since vacuum_in_leader_small_index uses deduplication, we expect an
 -- assertion failure with bug #17245 (in the absence of bugfix):
 INSERT INTO parallel_vacuum_table SELECT i FROM generate_series(1, 10000) i;
-RESET max_parallel_maintenance_workers;
-RESET min_parallel_index_scan_size;
--- Deliberately don't drop table, to get further coverage from tools like
--- pg_amcheck in some testing scenarios
+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/maintain_every.out /tmp/cirrus-ci-build/build/testrun/regress/re...
--- /tmp/cirrus-ci-build/src/test/regress/expected/maintain_every.out	2025-09-15 22:23:00.733664000 +0000
+++ /tmp/cirrus-ci-build/build/testrun/regress/regress/results/maintain_every.out	2025-09-15 22:26:50.804829000 +0000
@@ -1,33 +1 @@
--- Test maintenance commands that visit every eligible relation.  Run as a
...

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/vacuum_parallel.out /tmp/cirrus-ci-build/src/bin/pg_upgrade/tmp_...
--- /tmp/cirrus-ci-build/src/test/regress/expected/vacuum_parallel.out	2025-09-15 22:23:06.484096248 +0000
+++ /tmp/cirrus-ci-build/src/bin/pg_upgrade/tmp_check/results/vacuum_parallel.out	2025-09-15 22:30:53.683514792 +0000
@@ -43,7 +43,7 @@
 -- Since vacuum_in_leader_small_index uses deduplication, we expect an
 -- assertion failure with bug #17245 (in the absence of bugfix):
 INSERT INTO parallel_vacuum_table SELECT i FROM generate_series(1, 10000) i;
-RESET max_parallel_maintenance_workers;
-RESET min_parallel_index_scan_size;
--- Deliberately don't drop table, to get further coverage from tools like
--- pg_amcheck in some testing scenarios
+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/publication.out /tmp/cirrus-ci-build/src/bin/pg_upgrade/tmp_chec...
--- /tmp/cirrus-ci-build/src/test/regress/expected/publication.out	2025-09-15 22:23:06.456096247 +0000
+++ /tmp/cirrus-ci-build/src/bin/pg_upgrade/tmp_check/results/publication.out	2025-09-15 22:30:54.359514534 +0000
@@ -96,1906 +96,10 @@
 RESET client_min_messages;
...

diff -U3 /tmp/cirrus-ci-build/src/test/isolation/expected/lock-update-traversal.out /tmp/cirrus-ci-build/src/test/isolat...
--- /tmp/cirrus-ci-build/src/test/isolation/expected/lock-update-traversal.out	2025-09-15 22:23:06.240096243 +0000
+++ /tmp/cirrus-ci-build/src/test/isolation/output_iso/results/lock-update-traversal.out	2025-09-15 22:28:29.111580817 +...
@@ -1,63 +1,6 @@
 Parsed test spec with 2 sessions
 
 starting permutation: s1b s2b s1s s2u s1l s2c s2d1 s1c
-step s1b: BEGIN ISOLATION LEVEL REPEATABLE READ;
-step s2b: BEGIN;
-step s1s: SELECT * FROM foo;
-key|value
----+-----
-  1|    1
-(1 row)
-
-step s2u: UPDATE foo SET value = 2 WHERE key = 1;
-step s1l: SELECT * FROM foo FOR KEY SHARE;
-key|value
----+-----
-  1|    1
...

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/vacuum_parallel.out /tmp/cirrus-ci-build/src/test/recovery/tmp_c...
--- /tmp/cirrus-ci-build/src/test/regress/expected/vacuum_parallel.out	2025-09-15 22:23:06.484096248 +0000
+++ /tmp/cirrus-ci-build/src/test/recovery/tmp_check/results/vacuum_parallel.out	2025-09-15 22:32:38.367394020 +0000
@@ -43,7 +43,7 @@
 -- Since vacuum_in_leader_small_index uses deduplication, we expect an
 -- assertion failure with bug #17245 (in the absence of bugfix):
 INSERT INTO parallel_vacuum_table SELECT i FROM generate_series(1, 10000) i;
-RESET max_parallel_maintenance_workers;
-RESET min_parallel_index_scan_size;
--- Deliberately don't drop table, to get further coverage from tools like
--- pg_amcheck in some testing scenarios
+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/maintain_every.out /tmp/cirrus-ci-build/src/test/recovery/tmp_ch...
--- /tmp/cirrus-ci-build/src/test/regress/expected/maintain_every.out	2025-09-15 22:23:06.428096247 +0000
+++ /tmp/cirrus-ci-build/src/test/recovery/tmp_check/results/maintain_every.out	2025-09-15 22:32:38.539393857 +0000
@@ -20,14 +20,7 @@
 DROP TABLE past_inh_db_child;
...

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/vacuum_parallel.out /tmp/cirrus-ci-build/src/test/regress/result...
--- /tmp/cirrus-ci-build/src/test/regress/expected/vacuum_parallel.out	2025-09-15 22:23:06.484096248 +0000
+++ /tmp/cirrus-ci-build/src/test/regress/results/vacuum_parallel.out	2025-09-15 22:28:55.919565676 +0000
@@ -43,7 +43,7 @@
 -- Since vacuum_in_leader_small_index uses deduplication, we expect an
 -- assertion failure with bug #17245 (in the absence of bugfix):
 INSERT INTO parallel_vacuum_table SELECT i FROM generate_series(1, 10000) i;
-RESET max_parallel_maintenance_workers;
-RESET min_parallel_index_scan_size;
--- Deliberately don't drop table, to get further coverage from tools like
--- pg_amcheck in some testing scenarios
+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/publication.out /tmp/cirrus-ci-build/src/test/regress/results/pu...
--- /tmp/cirrus-ci-build/src/test/regress/expected/publication.out	2025-09-15 22:23:06.456096247 +0000
+++ /tmp/cirrus-ci-build/src/test/regress/results/publication.out	2025-09-15 22:28:56.679565278 +0000
@@ -59,1943 +59,10 @@
 --- adding tables
...

diff -U3 /home/postgres/postgres/src/test/isolation/expected/lock-update-traversal.out /home/postgres/postgres/build/tes...
--- /home/postgres/postgres/src/test/isolation/expected/lock-update-traversal.out	2025-09-15 22:23:27.151332966 +0000
+++ /home/postgres/postgres/build/testrun/isolation/isolation/results/lock-update-traversal.out	2025-09-15 22:26:29.8718...
@@ -1,63 +1,6 @@
 Parsed test spec with 2 sessions
 
 starting permutation: s1b s2b s1s s2u s1l s2c s2d1 s1c
-step s1b: BEGIN ISOLATION LEVEL REPEATABLE READ;
-step s2b: BEGIN;
-step s1s: SELECT * FROM foo;
-key|value
----+-----
-  1|    1
-(1 row)
-
-step s2u: UPDATE foo SET value = 2 WHERE key = 1;
-step s1l: SELECT * FROM foo FOR KEY SHARE;
-key|value
----+-----
-  1|    1
...

diff -U3 /home/postgres/postgres/src/test/regress/expected/vacuum_parallel.out /home/postgres/postgres/build/testrun/pg_...
--- /home/postgres/postgres/src/test/regress/expected/vacuum_parallel.out	2025-09-15 22:23:28.424991047 +0000
+++ /home/postgres/postgres/build/testrun/pg_upgrade/002_pg_upgrade/data/results/vacuum_parallel.out	2025-09-15 22:26:41...
@@ -43,7 +43,7 @@
 -- Since vacuum_in_leader_small_index uses deduplication, we expect an
 -- assertion failure with bug #17245 (in the absence of bugfix):
 INSERT INTO parallel_vacuum_table SELECT i FROM generate_series(1, 10000) i;
-RESET max_parallel_maintenance_workers;
-RESET min_parallel_index_scan_size;
--- Deliberately don't drop table, to get further coverage from tools like
--- pg_amcheck in some testing scenarios
+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 /home/postgres/postgres/src/test/regress/expected/maintain_every.out /home/postgres/postgres/build/testrun/pg_u...
--- /home/postgres/postgres/src/test/regress/expected/maintain_every.out	2025-09-15 22:23:28.276109321 +0000
+++ /home/postgres/postgres/build/testrun/pg_upgrade/002_pg_upgrade/data/results/maintain_every.out	2025-09-15 22:26:41....
@@ -1,33 +1,3 @@
--- Test maintenance commands that visit every eligible relation.  Run as a
...

diff -U3 /home/postgres/postgres/src/test/regress/expected/vacuum_parallel.out /home/postgres/postgres/build/testrun/rec...
--- /home/postgres/postgres/src/test/regress/expected/vacuum_parallel.out	2025-09-15 22:23:28.424991047 +0000
+++ /home/postgres/postgres/build/testrun/recovery/027_stream_regress/data/results/vacuum_parallel.out	2025-09-15 22:27:...
@@ -43,7 +43,7 @@
 -- Since vacuum_in_leader_small_index uses deduplication, we expect an
 -- assertion failure with bug #17245 (in the absence of bugfix):
 INSERT INTO parallel_vacuum_table SELECT i FROM generate_series(1, 10000) i;
-RESET max_parallel_maintenance_workers;
-RESET min_parallel_index_scan_size;
--- Deliberately don't drop table, to get further coverage from tools like
--- pg_amcheck in some testing scenarios
+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 /home/postgres/postgres/src/test/regress/expected/maintain_every.out /home/postgres/postgres/build/testrun/reco...
--- /home/postgres/postgres/src/test/regress/expected/maintain_every.out	2025-09-15 22:23:28.276109321 +0000
+++ /home/postgres/postgres/build/testrun/recovery/027_stream_regress/data/results/maintain_every.out	2025-09-15 22:27:2...
@@ -1,33 +1,3 @@
--- Test maintenance commands that visit every eligible relation.  Run as a
...

diff -U3 /home/postgres/postgres/src/test/regress/expected/vacuum_parallel.out /home/postgres/postgres/build/testrun/reg...
--- /home/postgres/postgres/src/test/regress/expected/vacuum_parallel.out	2025-09-15 22:23:28.424991047 +0000
+++ /home/postgres/postgres/build/testrun/regress/regress/results/vacuum_parallel.out	2025-09-15 22:26:38.161917338 +000...
@@ -43,7 +43,7 @@
 -- Since vacuum_in_leader_small_index uses deduplication, we expect an
 -- assertion failure with bug #17245 (in the absence of bugfix):
 INSERT INTO parallel_vacuum_table SELECT i FROM generate_series(1, 10000) i;
-RESET max_parallel_maintenance_workers;
-RESET min_parallel_index_scan_size;
--- Deliberately don't drop table, to get further coverage from tools like
--- pg_amcheck in some testing scenarios
+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 /home/postgres/postgres/src/test/regress/expected/maintain_every.out /home/postgres/postgres/build/testrun/regr...
--- /home/postgres/postgres/src/test/regress/expected/maintain_every.out	2025-09-15 22:23:28.276109321 +0000
+++ /home/postgres/postgres/build/testrun/regress/regress/results/maintain_every.out	2025-09-15 22:26:38.307228038 +0000
@@ -1,33 +1 @@
--- Test maintenance commands that visit every eligible relation.  Run as a
...

diff -U3 /home/postgres/postgres/src/test/isolation/expected/timeouts.out /home/postgres/postgres/build/testrun/isolatio...
--- /home/postgres/postgres/src/test/isolation/expected/timeouts.out	2025-09-14 12:36:39.698556003 +0000
+++ /home/postgres/postgres/build/testrun/isolation/isolation/results/timeouts.out	2025-09-14 12:38:55.540584733 +0000
@@ -57,7 +57,7 @@
 step sto: SET statement_timeout = '10ms';
 step update: DELETE FROM accounts WHERE accountid = 'checking'; <waiting ...>
 step update: <... completed>
-ERROR:  canceling statement due to statement timeout
+ERROR:  canceling statement due to user request
 
 starting permutation: wrtbl lto update
 step wrtbl: UPDATE accounts SET balance = balance + 100;

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/stats.out /tmp/cirrus-ci-build/build/testrun/pg_upgrade/002_pg_u...
--- /tmp/cirrus-ci-build/src/test/regress/expected/stats.out	2025-09-13 14:29:46.721120000 +0000
+++ /tmp/cirrus-ci-build/build/testrun/pg_upgrade/002_pg_upgrade/data/results/stats.out	2025-09-13 14:34:42.886730000 +0...
@@ -243,7 +243,7 @@
 SELECT :seq_scan_after > :seq_scan_before;
  ?column? 
 ----------
- t
+ f
 (1 row)
 
 ----

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/stats.out /tmp/cirrus-ci-build/build/testrun/recovery/027_stream...
--- /tmp/cirrus-ci-build/src/test/regress/expected/stats.out	2025-09-13 14:29:46.721120000 +0000
+++ /tmp/cirrus-ci-build/build/testrun/recovery/027_stream_regress/data/results/stats.out	2025-09-13 14:35:50.848669000 ...
@@ -243,7 +243,7 @@
 SELECT :seq_scan_after > :seq_scan_before;
  ?column? 
 ----------
- t
+ f
 (1 row)
 
 ----

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/stats.out /tmp/cirrus-ci-build/build/testrun/regress/regress/res...
--- /tmp/cirrus-ci-build/src/test/regress/expected/stats.out	2025-09-13 14:29:46.721120000 +0000
+++ /tmp/cirrus-ci-build/build/testrun/regress/regress/results/stats.out	2025-09-13 14:34:27.167837000 +0000
@@ -243,7 +243,7 @@
 SELECT :seq_scan_after > :seq_scan_before;
  ?column? 
 ----------
- t
+ f
 (1 row)
 
 ----

diff --strip-trailing-cr -U3 C:/cirrus/src/test/regress/expected/plancache.out C:/cirrus/build/testrun/pg_upgrade/002_pg...
--- C:/cirrus/src/test/regress/expected/plancache.out	2025-09-13 14:19:18.295381500 +0000
+++ C:/cirrus/build/testrun/pg_upgrade/002_pg_upgrade/data/results/plancache.out	2025-09-13 14:22:11.703114900 +0000
@@ -398,3 +398,36 @@
 (1 row)
 
 drop table test_mode;
+-- Check the interference between plan_cache_mode and cursor_options
+-- EXPLAIN (COSTS OFF, GENERIC_PLAN)
+SELECT prepare_spi_plan(NULL, NULL, NULL); -- ERROR
+ERROR:  query text cannot be null
+SELECT prepare_spi_plan(
+  'EXPLAIN (COSTS OFF) SELECT * FROM pcachetest WHERE q1 = $1',
+  NULL, 'integer') AS p1 \gset
+SELECT prepare_spi_plan(
+  'SELECT * FROM pcachetest WHERE q1 = $1 OR q1 = $2',
+  NULL, 'integer', NULL); --ERROR
+ERROR:  type name cannot be NULL
+SELECT prepare_spi_plan(
+  'SELECT * FROM pcachetest WHERE q1 = $1 OR q1 = 3',
...

diff --strip-trailing-cr -U3 C:/cirrus/src/test/regress/expected/plancache.out C:/cirrus/build/testrun/recovery/027_stre...
--- C:/cirrus/src/test/regress/expected/plancache.out	2025-09-13 14:19:18.295381500 +0000
+++ C:/cirrus/build/testrun/recovery/027_stream_regress/data/results/plancache.out	2025-09-13 14:25:08.994530900 +0000
@@ -398,3 +398,36 @@
 (1 row)
 
 drop table test_mode;
+-- Check the interference between plan_cache_mode and cursor_options
+-- EXPLAIN (COSTS OFF, GENERIC_PLAN)
+SELECT prepare_spi_plan(NULL, NULL, NULL); -- ERROR
+ERROR:  query text cannot be null
+SELECT prepare_spi_plan(
+  'EXPLAIN (COSTS OFF) SELECT * FROM pcachetest WHERE q1 = $1',
+  NULL, 'integer') AS p1 \gset
+SELECT prepare_spi_plan(
+  'SELECT * FROM pcachetest WHERE q1 = $1 OR q1 = $2',
+  NULL, 'integer', NULL); --ERROR
+ERROR:  type name cannot be NULL
+SELECT prepare_spi_plan(
+  'SELECT * FROM pcachetest WHERE q1 = $1 OR q1 = 3',
...

diff --strip-trailing-cr -U3 C:/cirrus/src/test/regress/expected/plancache.out C:/cirrus/build/testrun/regress/regress/r...
--- C:/cirrus/src/test/regress/expected/plancache.out	2025-09-13 14:19:18.295381500 +0000
+++ C:/cirrus/build/testrun/regress/regress/results/plancache.out	2025-09-13 14:22:07.814013200 +0000
@@ -398,3 +398,36 @@
 (1 row)
 
 drop table test_mode;
+-- Check the interference between plan_cache_mode and cursor_options
+-- EXPLAIN (COSTS OFF, GENERIC_PLAN)
+SELECT prepare_spi_plan(NULL, NULL, NULL); -- ERROR
+ERROR:  query text cannot be null
+SELECT prepare_spi_plan(
+  'EXPLAIN (COSTS OFF) SELECT * FROM pcachetest WHERE q1 = $1',
+  NULL, 'integer') AS p1 \gset
+SELECT prepare_spi_plan(
+  'SELECT * FROM pcachetest WHERE q1 = $1 OR q1 = $2',
+  NULL, 'integer', NULL); --ERROR
+ERROR:  type name cannot be NULL
+SELECT prepare_spi_plan(
+  'SELECT * FROM pcachetest WHERE q1 = $1 OR q1 = 3',
...

diff --strip-trailing-cr -U3 C:/cirrus/src/test/regress/expected/plancache.out C:/cirrus/build/testrun/pg_upgrade/002_pg...
--- C:/cirrus/src/test/regress/expected/plancache.out	2025-09-13 14:19:12.490663700 +0000
+++ C:/cirrus/build/testrun/pg_upgrade/002_pg_upgrade/data/results/plancache.out	2025-09-13 14:23:41.088210100 +0000
@@ -398,3 +398,36 @@
 (1 row)
 
 drop table test_mode;
+-- Check the interference between plan_cache_mode and cursor_options
+-- EXPLAIN (COSTS OFF, GENERIC_PLAN)
+SELECT prepare_spi_plan(NULL, NULL, NULL); -- ERROR
+ERROR:  query text cannot be null
+SELECT prepare_spi_plan(
+  'EXPLAIN (COSTS OFF) SELECT * FROM pcachetest WHERE q1 = $1',
+  NULL, 'integer') AS p1 \gset
+SELECT prepare_spi_plan(
+  'SELECT * FROM pcachetest WHERE q1 = $1 OR q1 = $2',
+  NULL, 'integer', NULL); --ERROR
+ERROR:  type name cannot be NULL
+SELECT prepare_spi_plan(
+  'SELECT * FROM pcachetest WHERE q1 = $1 OR q1 = 3',
...

diff --strip-trailing-cr -U3 C:/cirrus/src/test/regress/expected/plancache.out C:/cirrus/build/testrun/recovery/027_stre...
--- C:/cirrus/src/test/regress/expected/plancache.out	2025-09-13 14:19:12.490663700 +0000
+++ C:/cirrus/build/testrun/recovery/027_stream_regress/data/results/plancache.out	2025-09-13 14:26:38.130974400 +0000
@@ -398,3 +398,36 @@
 (1 row)
 
 drop table test_mode;
+-- Check the interference between plan_cache_mode and cursor_options
+-- EXPLAIN (COSTS OFF, GENERIC_PLAN)
+SELECT prepare_spi_plan(NULL, NULL, NULL); -- ERROR
+ERROR:  query text cannot be null
+SELECT prepare_spi_plan(
+  'EXPLAIN (COSTS OFF) SELECT * FROM pcachetest WHERE q1 = $1',
+  NULL, 'integer') AS p1 \gset
+SELECT prepare_spi_plan(
+  'SELECT * FROM pcachetest WHERE q1 = $1 OR q1 = $2',
+  NULL, 'integer', NULL); --ERROR
+ERROR:  type name cannot be NULL
+SELECT prepare_spi_plan(
+  'SELECT * FROM pcachetest WHERE q1 = $1 OR q1 = 3',
...

diff --strip-trailing-cr -U3 C:/cirrus/src/test/regress/expected/plancache.out C:/cirrus/build/testrun/regress/regress/r...
--- C:/cirrus/src/test/regress/expected/plancache.out	2025-09-13 14:19:12.490663700 +0000
+++ C:/cirrus/build/testrun/regress/regress/results/plancache.out	2025-09-13 14:23:36.406068800 +0000
@@ -398,3 +398,36 @@
 (1 row)
 
 drop table test_mode;
+-- Check the interference between plan_cache_mode and cursor_options
+-- EXPLAIN (COSTS OFF, GENERIC_PLAN)
+SELECT prepare_spi_plan(NULL, NULL, NULL); -- ERROR
+ERROR:  query text cannot be null
+SELECT prepare_spi_plan(
+  'EXPLAIN (COSTS OFF) SELECT * FROM pcachetest WHERE q1 = $1',
+  NULL, 'integer') AS p1 \gset
+SELECT prepare_spi_plan(
+  'SELECT * FROM pcachetest WHERE q1 = $1 OR q1 = $2',
+  NULL, 'integer', NULL); --ERROR
+ERROR:  type name cannot be NULL
+SELECT prepare_spi_plan(
+  'SELECT * FROM pcachetest WHERE q1 = $1 OR q1 = 3',
...

diff -U3 /Users/admin/pgsql/src/test/regress/expected/plancache.out /Users/admin/pgsql/build/testrun/pg_upgrade/002_pg_u...
--- /Users/admin/pgsql/src/test/regress/expected/plancache.out	2025-09-13 14:18:11
+++ /Users/admin/pgsql/build/testrun/pg_upgrade/002_pg_upgrade/data/results/plancache.out	2025-09-13 14:20:04
@@ -398,3 +398,36 @@
 (1 row)
 
 drop table test_mode;
+-- Check the interference between plan_cache_mode and cursor_options
+-- EXPLAIN (COSTS OFF, GENERIC_PLAN)
+SELECT prepare_spi_plan(NULL, NULL, NULL); -- ERROR
+ERROR:  query text cannot be null
+SELECT prepare_spi_plan(
+  'EXPLAIN (COSTS OFF) SELECT * FROM pcachetest WHERE q1 = $1',
+  NULL, 'integer') AS p1 \gset
+SELECT prepare_spi_plan(
+  'SELECT * FROM pcachetest WHERE q1 = $1 OR q1 = $2',
+  NULL, 'integer', NULL); --ERROR
+ERROR:  type name cannot be NULL
+SELECT prepare_spi_plan(
+  'SELECT * FROM pcachetest WHERE q1 = $1 OR q1 = 3',
...

diff -U3 /Users/admin/pgsql/src/test/regress/expected/plancache.out /Users/admin/pgsql/build/testrun/recovery/027_stream...
--- /Users/admin/pgsql/src/test/regress/expected/plancache.out	2025-09-13 14:18:11
+++ /Users/admin/pgsql/build/testrun/recovery/027_stream_regress/data/results/plancache.out	2025-09-13 14:21:00
@@ -398,3 +398,36 @@
 (1 row)
 
 drop table test_mode;
+-- Check the interference between plan_cache_mode and cursor_options
+-- EXPLAIN (COSTS OFF, GENERIC_PLAN)
+SELECT prepare_spi_plan(NULL, NULL, NULL); -- ERROR
+ERROR:  query text cannot be null
+SELECT prepare_spi_plan(
+  'EXPLAIN (COSTS OFF) SELECT * FROM pcachetest WHERE q1 = $1',
+  NULL, 'integer') AS p1 \gset
+SELECT prepare_spi_plan(
+  'SELECT * FROM pcachetest WHERE q1 = $1 OR q1 = $2',
+  NULL, 'integer', NULL); --ERROR
+ERROR:  type name cannot be NULL
+SELECT prepare_spi_plan(
+  'SELECT * FROM pcachetest WHERE q1 = $1 OR q1 = 3',
...

diff -U3 /Users/admin/pgsql/src/test/regress/expected/plancache.out /Users/admin/pgsql/build/testrun/regress/regress/res...
--- /Users/admin/pgsql/src/test/regress/expected/plancache.out	2025-09-13 14:18:11
+++ /Users/admin/pgsql/build/testrun/regress/regress/results/plancache.out	2025-09-13 14:20:05
@@ -398,3 +398,36 @@
 (1 row)
 
 drop table test_mode;
+-- Check the interference between plan_cache_mode and cursor_options
+-- EXPLAIN (COSTS OFF, GENERIC_PLAN)
+SELECT prepare_spi_plan(NULL, NULL, NULL); -- ERROR
+ERROR:  query text cannot be null
+SELECT prepare_spi_plan(
+  'EXPLAIN (COSTS OFF) SELECT * FROM pcachetest WHERE q1 = $1',
+  NULL, 'integer') AS p1 \gset
+SELECT prepare_spi_plan(
+  'SELECT * FROM pcachetest WHERE q1 = $1 OR q1 = $2',
+  NULL, 'integer', NULL); --ERROR
+ERROR:  type name cannot be NULL
+SELECT prepare_spi_plan(
+  'SELECT * FROM pcachetest WHERE q1 = $1 OR q1 = 3',
...

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/plancache.out /tmp/cirrus-ci-build/build/testrun/pg_upgrade/002_...
--- /tmp/cirrus-ci-build/src/test/regress/expected/plancache.out	2025-09-13 14:19:07.047635078 +0000
+++ /tmp/cirrus-ci-build/build/testrun/pg_upgrade/002_pg_upgrade/data/results/plancache.out	2025-09-13 14:21:28.59652904...
@@ -398,3 +398,36 @@
 (1 row)
 
 drop table test_mode;
+-- Check the interference between plan_cache_mode and cursor_options
+-- EXPLAIN (COSTS OFF, GENERIC_PLAN)
+SELECT prepare_spi_plan(NULL, NULL, NULL); -- ERROR
+ERROR:  query text cannot be null
+SELECT prepare_spi_plan(
+  'EXPLAIN (COSTS OFF) SELECT * FROM pcachetest WHERE q1 = $1',
+  NULL, 'integer') AS p1 \gset
+SELECT prepare_spi_plan(
+  'SELECT * FROM pcachetest WHERE q1 = $1 OR q1 = $2',
+  NULL, 'integer', NULL); --ERROR
+ERROR:  type name cannot be NULL
+SELECT prepare_spi_plan(
+  'SELECT * FROM pcachetest WHERE q1 = $1 OR q1 = 3',
...

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/plancache.out /tmp/cirrus-ci-build/build/testrun/recovery/027_st...
--- /tmp/cirrus-ci-build/src/test/regress/expected/plancache.out	2025-09-13 14:19:07.047635078 +0000
+++ /tmp/cirrus-ci-build/build/testrun/recovery/027_stream_regress/data/results/plancache.out	2025-09-13 14:22:45.091145...
@@ -398,3 +398,36 @@
 (1 row)
 
 drop table test_mode;
+-- Check the interference between plan_cache_mode and cursor_options
+-- EXPLAIN (COSTS OFF, GENERIC_PLAN)
+SELECT prepare_spi_plan(NULL, NULL, NULL); -- ERROR
+ERROR:  query text cannot be null
+SELECT prepare_spi_plan(
+  'EXPLAIN (COSTS OFF) SELECT * FROM pcachetest WHERE q1 = $1',
+  NULL, 'integer') AS p1 \gset
+SELECT prepare_spi_plan(
+  'SELECT * FROM pcachetest WHERE q1 = $1 OR q1 = $2',
+  NULL, 'integer', NULL); --ERROR
+ERROR:  type name cannot be NULL
+SELECT prepare_spi_plan(
+  'SELECT * FROM pcachetest WHERE q1 = $1 OR q1 = 3',
...

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/plancache.out /tmp/cirrus-ci-build/build/testrun/regress/regress...
--- /tmp/cirrus-ci-build/src/test/regress/expected/plancache.out	2025-09-13 14:19:07.047635078 +0000
+++ /tmp/cirrus-ci-build/build/testrun/regress/regress/results/plancache.out	2025-09-13 14:21:30.268579092 +0000
@@ -398,3 +398,36 @@
 (1 row)
 
 drop table test_mode;
+-- Check the interference between plan_cache_mode and cursor_options
+-- EXPLAIN (COSTS OFF, GENERIC_PLAN)
+SELECT prepare_spi_plan(NULL, NULL, NULL); -- ERROR
+ERROR:  query text cannot be null
+SELECT prepare_spi_plan(
+  'EXPLAIN (COSTS OFF) SELECT * FROM pcachetest WHERE q1 = $1',
+  NULL, 'integer') AS p1 \gset
+SELECT prepare_spi_plan(
+  'SELECT * FROM pcachetest WHERE q1 = $1 OR q1 = $2',
+  NULL, 'integer', NULL); --ERROR
+ERROR:  type name cannot be NULL
+SELECT prepare_spi_plan(
+  'SELECT * FROM pcachetest WHERE q1 = $1 OR q1 = 3',
...

diff -U3 /home/postgres/postgres/src/test/regress/expected/plancache.out /home/postgres/postgres/build/testrun/pg_upgrad...
--- /home/postgres/postgres/src/test/regress/expected/plancache.out	Sat Sep 13 14:19:20 2025
+++ /home/postgres/postgres/build/testrun/pg_upgrade/002_pg_upgrade/data/results/plancache.out	Sat Sep 13 14:21:53 2025
@@ -398,3 +398,36 @@
 (1 row)
 
 drop table test_mode;
+-- Check the interference between plan_cache_mode and cursor_options
+-- EXPLAIN (COSTS OFF, GENERIC_PLAN)
+SELECT prepare_spi_plan(NULL, NULL, NULL); -- ERROR
+ERROR:  query text cannot be null
+SELECT prepare_spi_plan(
+  'EXPLAIN (COSTS OFF) SELECT * FROM pcachetest WHERE q1 = $1',
+  NULL, 'integer') AS p1 \gset
+SELECT prepare_spi_plan(
+  'SELECT * FROM pcachetest WHERE q1 = $1 OR q1 = $2',
+  NULL, 'integer', NULL); --ERROR
+ERROR:  type name cannot be NULL
+SELECT prepare_spi_plan(
+  'SELECT * FROM pcachetest WHERE q1 = $1 OR q1 = 3',
...

diff -U3 /home/postgres/postgres/src/test/regress/expected/plancache.out /home/postgres/postgres/build/testrun/recovery/...
--- /home/postgres/postgres/src/test/regress/expected/plancache.out	Sat Sep 13 14:19:20 2025
+++ /home/postgres/postgres/build/testrun/recovery/027_stream_regress/data/results/plancache.out	Sat Sep 13 14:23:45 202...
@@ -398,3 +398,36 @@
 (1 row)
 
 drop table test_mode;
+-- Check the interference between plan_cache_mode and cursor_options
+-- EXPLAIN (COSTS OFF, GENERIC_PLAN)
+SELECT prepare_spi_plan(NULL, NULL, NULL); -- ERROR
+ERROR:  query text cannot be null
+SELECT prepare_spi_plan(
+  'EXPLAIN (COSTS OFF) SELECT * FROM pcachetest WHERE q1 = $1',
+  NULL, 'integer') AS p1 \gset
+SELECT prepare_spi_plan(
+  'SELECT * FROM pcachetest WHERE q1 = $1 OR q1 = $2',
+  NULL, 'integer', NULL); --ERROR
+ERROR:  type name cannot be NULL
+SELECT prepare_spi_plan(
+  'SELECT * FROM pcachetest WHERE q1 = $1 OR q1 = 3',
...

diff -U3 /home/postgres/postgres/src/test/regress/expected/plancache.out /home/postgres/postgres/build/testrun/regress/r...
--- /home/postgres/postgres/src/test/regress/expected/plancache.out	Sat Sep 13 14:19:20 2025
+++ /home/postgres/postgres/build/testrun/regress/regress/results/plancache.out	Sat Sep 13 14:21:46 2025
@@ -398,3 +398,36 @@
 (1 row)
 
 drop table test_mode;
+-- Check the interference between plan_cache_mode and cursor_options
+-- EXPLAIN (COSTS OFF, GENERIC_PLAN)
+SELECT prepare_spi_plan(NULL, NULL, NULL); -- ERROR
+ERROR:  query text cannot be null
+SELECT prepare_spi_plan(
+  'EXPLAIN (COSTS OFF) SELECT * FROM pcachetest WHERE q1 = $1',
+  NULL, 'integer') AS p1 \gset
+SELECT prepare_spi_plan(
+  'SELECT * FROM pcachetest WHERE q1 = $1 OR q1 = $2',
+  NULL, 'integer', NULL); --ERROR
+ERROR:  type name cannot be NULL
+SELECT prepare_spi_plan(
+  'SELECT * FROM pcachetest WHERE q1 = $1 OR q1 = 3',
...

diff -U3 /home/postgres/postgres/src/test/regress/expected/plancache.out /home/postgres/postgres/build/testrun/pg_upgrad...
--- /home/postgres/postgres/src/test/regress/expected/plancache.out	2025-09-13 14:19:34.924300721 +0000
+++ /home/postgres/postgres/build/testrun/pg_upgrade/002_pg_upgrade/data/results/plancache.out	2025-09-13 14:21:46.17111...
@@ -398,3 +398,36 @@
 (1 row)
 
 drop table test_mode;
+-- Check the interference between plan_cache_mode and cursor_options
+-- EXPLAIN (COSTS OFF, GENERIC_PLAN)
+SELECT prepare_spi_plan(NULL, NULL, NULL); -- ERROR
+ERROR:  query text cannot be null
+SELECT prepare_spi_plan(
+  'EXPLAIN (COSTS OFF) SELECT * FROM pcachetest WHERE q1 = $1',
+  NULL, 'integer') AS p1 \gset
+SELECT prepare_spi_plan(
+  'SELECT * FROM pcachetest WHERE q1 = $1 OR q1 = $2',
+  NULL, 'integer', NULL); --ERROR
+ERROR:  type name cannot be NULL
+SELECT prepare_spi_plan(
+  'SELECT * FROM pcachetest WHERE q1 = $1 OR q1 = 3',
...

diff -U3 /home/postgres/postgres/src/test/regress/expected/plancache.out /home/postgres/postgres/build/testrun/recovery/...
--- /home/postgres/postgres/src/test/regress/expected/plancache.out	2025-09-13 14:19:34.924300721 +0000
+++ /home/postgres/postgres/build/testrun/recovery/027_stream_regress/data/results/plancache.out	2025-09-13 14:22:25.325...
@@ -398,3 +398,36 @@
 (1 row)
 
 drop table test_mode;
+-- Check the interference between plan_cache_mode and cursor_options
+-- EXPLAIN (COSTS OFF, GENERIC_PLAN)
+SELECT prepare_spi_plan(NULL, NULL, NULL); -- ERROR
+ERROR:  query text cannot be null
+SELECT prepare_spi_plan(
+  'EXPLAIN (COSTS OFF) SELECT * FROM pcachetest WHERE q1 = $1',
+  NULL, 'integer') AS p1 \gset
+SELECT prepare_spi_plan(
+  'SELECT * FROM pcachetest WHERE q1 = $1 OR q1 = $2',
+  NULL, 'integer', NULL); --ERROR
+ERROR:  type name cannot be NULL
+SELECT prepare_spi_plan(
+  'SELECT * FROM pcachetest WHERE q1 = $1 OR q1 = 3',
...

diff -U3 /home/postgres/postgres/src/test/regress/expected/plancache.out /home/postgres/postgres/build/testrun/regress/r...
--- /home/postgres/postgres/src/test/regress/expected/plancache.out	2025-09-13 14:19:34.924300721 +0000
+++ /home/postgres/postgres/build/testrun/regress/regress/results/plancache.out	2025-09-13 14:21:32.211938306 +0000
@@ -398,3 +398,36 @@
 (1 row)
 
 drop table test_mode;
+-- Check the interference between plan_cache_mode and cursor_options
+-- EXPLAIN (COSTS OFF, GENERIC_PLAN)
+SELECT prepare_spi_plan(NULL, NULL, NULL); -- ERROR
+ERROR:  query text cannot be null
+SELECT prepare_spi_plan(
+  'EXPLAIN (COSTS OFF) SELECT * FROM pcachetest WHERE q1 = $1',
+  NULL, 'integer') AS p1 \gset
+SELECT prepare_spi_plan(
+  'SELECT * FROM pcachetest WHERE q1 = $1 OR q1 = $2',
+  NULL, 'integer', NULL); --ERROR
+ERROR:  type name cannot be NULL
+SELECT prepare_spi_plan(
+  'SELECT * FROM pcachetest WHERE q1 = $1 OR q1 = 3',
...

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/plancache.out /tmp/cirrus-ci-build/src/bin/pg_upgrade/tmp_check/...
--- /tmp/cirrus-ci-build/src/test/regress/expected/plancache.out	2025-09-13 14:19:14.474485178 +0000
+++ /tmp/cirrus-ci-build/src/bin/pg_upgrade/tmp_check/results/plancache.out	2025-09-13 14:25:04.553969177 +0000
@@ -398,3 +398,36 @@
 (1 row)
 
 drop table test_mode;
+-- Check the interference between plan_cache_mode and cursor_options
+-- EXPLAIN (COSTS OFF, GENERIC_PLAN)
+SELECT prepare_spi_plan(NULL, NULL, NULL); -- ERROR
+ERROR:  query text cannot be null
+SELECT prepare_spi_plan(
+  'EXPLAIN (COSTS OFF) SELECT * FROM pcachetest WHERE q1 = $1',
+  NULL, 'integer') AS p1 \gset
+SELECT prepare_spi_plan(
+  'SELECT * FROM pcachetest WHERE q1 = $1 OR q1 = $2',
+  NULL, 'integer', NULL); --ERROR
+ERROR:  type name cannot be NULL
+SELECT prepare_spi_plan(
+  'SELECT * FROM pcachetest WHERE q1 = $1 OR q1 = 3',
...

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/plancache.out /tmp/cirrus-ci-build/src/test/recovery/tmp_check/r...
--- /tmp/cirrus-ci-build/src/test/regress/expected/plancache.out	2025-09-13 14:19:14.474485178 +0000
+++ /tmp/cirrus-ci-build/src/test/recovery/tmp_check/results/plancache.out	2025-09-13 14:27:11.293896895 +0000
@@ -398,3 +398,36 @@
 (1 row)
 
 drop table test_mode;
+-- Check the interference between plan_cache_mode and cursor_options
+-- EXPLAIN (COSTS OFF, GENERIC_PLAN)
+SELECT prepare_spi_plan(NULL, NULL, NULL); -- ERROR
+ERROR:  query text cannot be null
+SELECT prepare_spi_plan(
+  'EXPLAIN (COSTS OFF) SELECT * FROM pcachetest WHERE q1 = $1',
+  NULL, 'integer') AS p1 \gset
+SELECT prepare_spi_plan(
+  'SELECT * FROM pcachetest WHERE q1 = $1 OR q1 = $2',
+  NULL, 'integer', NULL); --ERROR
+ERROR:  type name cannot be NULL
+SELECT prepare_spi_plan(
+  'SELECT * FROM pcachetest WHERE q1 = $1 OR q1 = 3',
...

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/plancache.out /tmp/cirrus-ci-build/src/test/regress/results/plan...
--- /tmp/cirrus-ci-build/src/test/regress/expected/plancache.out	2025-09-13 14:19:14.474485178 +0000
+++ /tmp/cirrus-ci-build/src/test/regress/results/plancache.out	2025-09-13 14:22:28.698104528 +0000
@@ -398,3 +398,36 @@
 (1 row)
 
 drop table test_mode;
+-- Check the interference between plan_cache_mode and cursor_options
+-- EXPLAIN (COSTS OFF, GENERIC_PLAN)
+SELECT prepare_spi_plan(NULL, NULL, NULL); -- ERROR
+ERROR:  query text cannot be null
+SELECT prepare_spi_plan(
+  'EXPLAIN (COSTS OFF) SELECT * FROM pcachetest WHERE q1 = $1',
+  NULL, 'integer') AS p1 \gset
+SELECT prepare_spi_plan(
+  'SELECT * FROM pcachetest WHERE q1 = $1 OR q1 = $2',
+  NULL, 'integer', NULL); --ERROR
+ERROR:  type name cannot be NULL
+SELECT prepare_spi_plan(
+  'SELECT * FROM pcachetest WHERE q1 = $1 OR q1 = 3',
...

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/plancache.out /tmp/cirrus-ci-build/build/testrun/pg_upgrade/002_...
--- /tmp/cirrus-ci-build/src/test/regress/expected/plancache.out	2025-09-13 14:19:06.210786000 +0000
+++ /tmp/cirrus-ci-build/build/testrun/pg_upgrade/002_pg_upgrade/data/results/plancache.out	2025-09-13 14:22:40.88721400...
@@ -398,3 +398,36 @@
 (1 row)
 
 drop table test_mode;
+-- Check the interference between plan_cache_mode and cursor_options
+-- EXPLAIN (COSTS OFF, GENERIC_PLAN)
+SELECT prepare_spi_plan(NULL, NULL, NULL); -- ERROR
+ERROR:  query text cannot be null
+SELECT prepare_spi_plan(
+  'EXPLAIN (COSTS OFF) SELECT * FROM pcachetest WHERE q1 = $1',
+  NULL, 'integer') AS p1 \gset
+SELECT prepare_spi_plan(
+  'SELECT * FROM pcachetest WHERE q1 = $1 OR q1 = $2',
+  NULL, 'integer', NULL); --ERROR
+ERROR:  type name cannot be NULL
+SELECT prepare_spi_plan(
+  'SELECT * FROM pcachetest WHERE q1 = $1 OR q1 = 3',
...

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/plancache.out /tmp/cirrus-ci-build/build/testrun/recovery/027_st...
--- /tmp/cirrus-ci-build/src/test/regress/expected/plancache.out	2025-09-13 14:19:06.210786000 +0000
+++ /tmp/cirrus-ci-build/build/testrun/recovery/027_stream_regress/data/results/plancache.out	2025-09-13 14:24:10.015188...
@@ -398,3 +398,36 @@
 (1 row)
 
 drop table test_mode;
+-- Check the interference between plan_cache_mode and cursor_options
+-- EXPLAIN (COSTS OFF, GENERIC_PLAN)
+SELECT prepare_spi_plan(NULL, NULL, NULL); -- ERROR
+ERROR:  query text cannot be null
+SELECT prepare_spi_plan(
+  'EXPLAIN (COSTS OFF) SELECT * FROM pcachetest WHERE q1 = $1',
+  NULL, 'integer') AS p1 \gset
+SELECT prepare_spi_plan(
+  'SELECT * FROM pcachetest WHERE q1 = $1 OR q1 = $2',
+  NULL, 'integer', NULL); --ERROR
+ERROR:  type name cannot be NULL
+SELECT prepare_spi_plan(
+  'SELECT * FROM pcachetest WHERE q1 = $1 OR q1 = 3',
...

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/plancache.out /tmp/cirrus-ci-build/build/testrun/regress/regress...
--- /tmp/cirrus-ci-build/src/test/regress/expected/plancache.out	2025-09-13 14:19:06.210786000 +0000
+++ /tmp/cirrus-ci-build/build/testrun/regress/regress/results/plancache.out	2025-09-13 14:22:47.244101000 +0000
@@ -398,3 +398,35 @@
 (1 row)
 
 drop table test_mode;
+-- Check the interference between plan_cache_mode and cursor_options
+-- EXPLAIN (COSTS OFF, GENERIC_PLAN)
+SELECT prepare_spi_plan(NULL, NULL, NULL); -- ERROR
+ERROR:  query text cannot be null
+SELECT prepare_spi_plan(
+  'EXPLAIN (COSTS OFF) SELECT * FROM pcachetest WHERE q1 = $1',
+  NULL, 'integer') AS p1 \gset
+SELECT prepare_spi_plan(
+  'SELECT * FROM pcachetest WHERE q1 = $1 OR q1 = $2',
+  NULL, 'integer', NULL); --ERROR
+ERROR:  type name cannot be NULL
+SELECT prepare_spi_plan(
+  'SELECT * FROM pcachetest WHERE q1 = $1 OR q1 = 3',
...

diff -U3 /Users/admin/pgsql/src/test/regress/expected/generated_virtual.out /Users/admin/pgsql/build/testrun/pg_upgrade/...
--- /Users/admin/pgsql/src/test/regress/expected/generated_virtual.out	2025-09-12 12:57:11
+++ /Users/admin/pgsql/build/testrun/pg_upgrade/002_pg_upgrade/data/results/generated_virtual.out	2025-09-12 12:59:39
@@ -768,7 +768,7 @@
 ALTER INDEX gtestparted_a_idx ATTACH PARTITION gtestpart2_a_idx; --ok
 ALTER INDEX gtestparted_a_idx ATTACH PARTITION gtestpart2_a_idx_copy; --error
 ERROR:  cannot attach index "gtestpart2_a_idx_copy" as a partition of index "gtestparted_a_idx"
-DETAIL:  Another index is already attached for partition "gtestpart2".
+DETAIL:  Another index "gtestpart2_a_idx" is already attached for partition "gtestpart2".
 CREATE INDEX gtestparted_a_idx_1 on gtestparted(a);
 --now index gtestpart2_a_idx_copy should attach to the partition tree.
 SELECT * FROM pg_partition_tree('gtestparted_a_idx_1'::regclass);

diff -U3 /Users/admin/pgsql/src/test/regress/expected/generated_virtual.out /Users/admin/pgsql/build/testrun/recovery/02...
--- /Users/admin/pgsql/src/test/regress/expected/generated_virtual.out	2025-09-12 12:57:11
+++ /Users/admin/pgsql/build/testrun/recovery/027_stream_regress/data/results/generated_virtual.out	2025-09-12 13:00:29
@@ -768,7 +768,7 @@
 ALTER INDEX gtestparted_a_idx ATTACH PARTITION gtestpart2_a_idx; --ok
 ALTER INDEX gtestparted_a_idx ATTACH PARTITION gtestpart2_a_idx_copy; --error
 ERROR:  cannot attach index "gtestpart2_a_idx_copy" as a partition of index "gtestparted_a_idx"
-DETAIL:  Another index is already attached for partition "gtestpart2".
+DETAIL:  Another index "gtestpart2_a_idx" is already attached for partition "gtestpart2".
 CREATE INDEX gtestparted_a_idx_1 on gtestparted(a);
 --now index gtestpart2_a_idx_copy should attach to the partition tree.
 SELECT * FROM pg_partition_tree('gtestparted_a_idx_1'::regclass);

diff -U3 /Users/admin/pgsql/src/test/regress/expected/generated_virtual.out /Users/admin/pgsql/build/testrun/regress/reg...
--- /Users/admin/pgsql/src/test/regress/expected/generated_virtual.out	2025-09-12 12:57:11
+++ /Users/admin/pgsql/build/testrun/regress/regress/results/generated_virtual.out	2025-09-12 12:59:39
@@ -768,7 +768,7 @@
 ALTER INDEX gtestparted_a_idx ATTACH PARTITION gtestpart2_a_idx; --ok
 ALTER INDEX gtestparted_a_idx ATTACH PARTITION gtestpart2_a_idx_copy; --error
 ERROR:  cannot attach index "gtestpart2_a_idx_copy" as a partition of index "gtestparted_a_idx"
-DETAIL:  Another index is already attached for partition "gtestpart2".
+DETAIL:  Another index "gtestpart2_a_idx" is already attached for partition "gtestpart2".
 CREATE INDEX gtestparted_a_idx_1 on gtestparted(a);
 --now index gtestpart2_a_idx_copy should attach to the partition tree.
 SELECT * FROM pg_partition_tree('gtestparted_a_idx_1'::regclass);

diff --strip-trailing-cr -U3 C:/cirrus/src/test/regress/expected/generated_virtual.out C:/cirrus/build/testrun/pg_upgrad...
--- C:/cirrus/src/test/regress/expected/generated_virtual.out	2025-09-12 12:58:01.970185800 +0000
+++ C:/cirrus/build/testrun/pg_upgrade/002_pg_upgrade/data/results/generated_virtual.out	2025-09-12 13:01:17.872536400 +...
@@ -768,7 +768,7 @@
 ALTER INDEX gtestparted_a_idx ATTACH PARTITION gtestpart2_a_idx; --ok
 ALTER INDEX gtestparted_a_idx ATTACH PARTITION gtestpart2_a_idx_copy; --error
 ERROR:  cannot attach index "gtestpart2_a_idx_copy" as a partition of index "gtestparted_a_idx"
-DETAIL:  Another index is already attached for partition "gtestpart2".
+DETAIL:  Another index "gtestpart2_a_idx" is already attached for partition "gtestpart2".
 CREATE INDEX gtestparted_a_idx_1 on gtestparted(a);
 --now index gtestpart2_a_idx_copy should attach to the partition tree.
 SELECT * FROM pg_partition_tree('gtestparted_a_idx_1'::regclass);

diff --strip-trailing-cr -U3 C:/cirrus/src/test/regress/expected/generated_virtual.out C:/cirrus/build/testrun/recovery/...
--- C:/cirrus/src/test/regress/expected/generated_virtual.out	2025-09-12 12:58:01.970185800 +0000
+++ C:/cirrus/build/testrun/recovery/027_stream_regress/data/results/generated_virtual.out	2025-09-12 13:04:08.253614400...
@@ -768,7 +768,7 @@
 ALTER INDEX gtestparted_a_idx ATTACH PARTITION gtestpart2_a_idx; --ok
 ALTER INDEX gtestparted_a_idx ATTACH PARTITION gtestpart2_a_idx_copy; --error
 ERROR:  cannot attach index "gtestpart2_a_idx_copy" as a partition of index "gtestparted_a_idx"
-DETAIL:  Another index is already attached for partition "gtestpart2".
+DETAIL:  Another index "gtestpart2_a_idx" is already attached for partition "gtestpart2".
 CREATE INDEX gtestparted_a_idx_1 on gtestparted(a);
 --now index gtestpart2_a_idx_copy should attach to the partition tree.
 SELECT * FROM pg_partition_tree('gtestparted_a_idx_1'::regclass);

diff --strip-trailing-cr -U3 C:/cirrus/src/test/regress/expected/generated_virtual.out C:/cirrus/build/testrun/regress/r...
--- C:/cirrus/src/test/regress/expected/generated_virtual.out	2025-09-12 12:58:01.970185800 +0000
+++ C:/cirrus/build/testrun/regress/regress/results/generated_virtual.out	2025-09-12 13:01:16.165036300 +0000
@@ -768,7 +768,7 @@
 ALTER INDEX gtestparted_a_idx ATTACH PARTITION gtestpart2_a_idx; --ok
 ALTER INDEX gtestparted_a_idx ATTACH PARTITION gtestpart2_a_idx_copy; --error
 ERROR:  cannot attach index "gtestpart2_a_idx_copy" as a partition of index "gtestparted_a_idx"
-DETAIL:  Another index is already attached for partition "gtestpart2".
+DETAIL:  Another index "gtestpart2_a_idx" is already attached for partition "gtestpart2".
 CREATE INDEX gtestparted_a_idx_1 on gtestparted(a);
 --now index gtestpart2_a_idx_copy should attach to the partition tree.
 SELECT * FROM pg_partition_tree('gtestparted_a_idx_1'::regclass);

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/generated_virtual.out /tmp/cirrus-ci-build/build/testrun/pg_upgr...
--- /tmp/cirrus-ci-build/src/test/regress/expected/generated_virtual.out	2025-09-12 12:58:01.003634752 +0000
+++ /tmp/cirrus-ci-build/build/testrun/pg_upgrade/002_pg_upgrade/data/results/generated_virtual.out	2025-09-12 13:03:48....
@@ -768,7 +768,7 @@
 ALTER INDEX gtestparted_a_idx ATTACH PARTITION gtestpart2_a_idx; --ok
 ALTER INDEX gtestparted_a_idx ATTACH PARTITION gtestpart2_a_idx_copy; --error
 ERROR:  cannot attach index "gtestpart2_a_idx_copy" as a partition of index "gtestparted_a_idx"
-DETAIL:  Another index is already attached for partition "gtestpart2".
+DETAIL:  Another index "gtestpart2_a_idx" is already attached for partition "gtestpart2".
 CREATE INDEX gtestparted_a_idx_1 on gtestparted(a);
 --now index gtestpart2_a_idx_copy should attach to the partition tree.
 SELECT * FROM pg_partition_tree('gtestparted_a_idx_1'::regclass);

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/generated_virtual.out /tmp/cirrus-ci-build/build/testrun/recover...
--- /tmp/cirrus-ci-build/src/test/regress/expected/generated_virtual.out	2025-09-12 12:58:01.003634752 +0000
+++ /tmp/cirrus-ci-build/build/testrun/recovery/027_stream_regress/data/results/generated_virtual.out	2025-09-12 13:05:1...
@@ -768,7 +768,7 @@
 ALTER INDEX gtestparted_a_idx ATTACH PARTITION gtestpart2_a_idx; --ok
 ALTER INDEX gtestparted_a_idx ATTACH PARTITION gtestpart2_a_idx_copy; --error
 ERROR:  cannot attach index "gtestpart2_a_idx_copy" as a partition of index "gtestparted_a_idx"
-DETAIL:  Another index is already attached for partition "gtestpart2".
+DETAIL:  Another index "gtestpart2_a_idx" is already attached for partition "gtestpart2".
 CREATE INDEX gtestparted_a_idx_1 on gtestparted(a);
 --now index gtestpart2_a_idx_copy should attach to the partition tree.
 SELECT * FROM pg_partition_tree('gtestparted_a_idx_1'::regclass);

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/generated_virtual.out /tmp/cirrus-ci-build/build/testrun/regress...
--- /tmp/cirrus-ci-build/src/test/regress/expected/generated_virtual.out	2025-09-12 12:58:01.003634752 +0000
+++ /tmp/cirrus-ci-build/build/testrun/regress/regress/results/generated_virtual.out	2025-09-12 13:03:44.986261035 +0000
@@ -768,7 +768,7 @@
 ALTER INDEX gtestparted_a_idx ATTACH PARTITION gtestpart2_a_idx; --ok
 ALTER INDEX gtestparted_a_idx ATTACH PARTITION gtestpart2_a_idx_copy; --error
 ERROR:  cannot attach index "gtestpart2_a_idx_copy" as a partition of index "gtestparted_a_idx"
-DETAIL:  Another index is already attached for partition "gtestpart2".
+DETAIL:  Another index "gtestpart2_a_idx" is already attached for partition "gtestpart2".
 CREATE INDEX gtestparted_a_idx_1 on gtestparted(a);
 --now index gtestpart2_a_idx_copy should attach to the partition tree.
 SELECT * FROM pg_partition_tree('gtestparted_a_idx_1'::regclass);

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/generated_virtual.out /tmp/cirrus-ci-build/src/bin/pg_upgrade/tm...
--- /tmp/cirrus-ci-build/src/test/regress/expected/generated_virtual.out	2025-09-12 12:57:59.028118336 +0000
+++ /tmp/cirrus-ci-build/src/bin/pg_upgrade/tmp_check/results/generated_virtual.out	2025-09-12 13:05:48.993022110 +0000
@@ -768,7 +768,7 @@
 ALTER INDEX gtestparted_a_idx ATTACH PARTITION gtestpart2_a_idx; --ok
 ALTER INDEX gtestparted_a_idx ATTACH PARTITION gtestpart2_a_idx_copy; --error
 ERROR:  cannot attach index "gtestpart2_a_idx_copy" as a partition of index "gtestparted_a_idx"
-DETAIL:  Another index is already attached for partition "gtestpart2".
+DETAIL:  Another index "gtestpart2_a_idx" is already attached for partition "gtestpart2".
 CREATE INDEX gtestparted_a_idx_1 on gtestparted(a);
 --now index gtestpart2_a_idx_copy should attach to the partition tree.
 SELECT * FROM pg_partition_tree('gtestparted_a_idx_1'::regclass);

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/generated_virtual.out /tmp/cirrus-ci-build/src/test/regress/resu...
--- /tmp/cirrus-ci-build/src/test/regress/expected/generated_virtual.out	2025-09-12 12:57:59.028118336 +0000
+++ /tmp/cirrus-ci-build/src/test/regress/results/generated_virtual.out	2025-09-12 13:03:24.310484568 +0000
@@ -768,7 +768,7 @@
 ALTER INDEX gtestparted_a_idx ATTACH PARTITION gtestpart2_a_idx; --ok
 ALTER INDEX gtestparted_a_idx ATTACH PARTITION gtestpart2_a_idx_copy; --error
 ERROR:  cannot attach index "gtestpart2_a_idx_copy" as a partition of index "gtestparted_a_idx"
-DETAIL:  Another index is already attached for partition "gtestpart2".
+DETAIL:  Another index "gtestpart2_a_idx" is already attached for partition "gtestpart2".
 CREATE INDEX gtestparted_a_idx_1 on gtestparted(a);
 --now index gtestpart2_a_idx_copy should attach to the partition tree.
 SELECT * FROM pg_partition_tree('gtestparted_a_idx_1'::regclass);

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/generated_virtual.out /tmp/cirrus-ci-build/build/testrun/pg_upgr...
--- /tmp/cirrus-ci-build/src/test/regress/expected/generated_virtual.out	2025-09-12 12:58:00.250333000 +0000
+++ /tmp/cirrus-ci-build/build/testrun/pg_upgrade/002_pg_upgrade/data/results/generated_virtual.out	2025-09-12 13:01:02....
@@ -768,7 +768,7 @@
 ALTER INDEX gtestparted_a_idx ATTACH PARTITION gtestpart2_a_idx; --ok
 ALTER INDEX gtestparted_a_idx ATTACH PARTITION gtestpart2_a_idx_copy; --error
 ERROR:  cannot attach index "gtestpart2_a_idx_copy" as a partition of index "gtestparted_a_idx"
-DETAIL:  Another index is already attached for partition "gtestpart2".
+DETAIL:  Another index "gtestpart2_a_idx" is already attached for partition "gtestpart2".
 CREATE INDEX gtestparted_a_idx_1 on gtestparted(a);
 --now index gtestpart2_a_idx_copy should attach to the partition tree.
 SELECT * FROM pg_partition_tree('gtestparted_a_idx_1'::regclass);

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/generated_virtual.out /tmp/cirrus-ci-build/build/testrun/recover...
--- /tmp/cirrus-ci-build/src/test/regress/expected/generated_virtual.out	2025-09-12 12:58:00.250333000 +0000
+++ /tmp/cirrus-ci-build/build/testrun/recovery/027_stream_regress/data/results/generated_virtual.out	2025-09-12 13:02:2...
@@ -768,7 +768,7 @@
 ALTER INDEX gtestparted_a_idx ATTACH PARTITION gtestpart2_a_idx; --ok
 ALTER INDEX gtestparted_a_idx ATTACH PARTITION gtestpart2_a_idx_copy; --error
 ERROR:  cannot attach index "gtestpart2_a_idx_copy" as a partition of index "gtestparted_a_idx"
-DETAIL:  Another index is already attached for partition "gtestpart2".
+DETAIL:  Another index "gtestpart2_a_idx" is already attached for partition "gtestpart2".
 CREATE INDEX gtestparted_a_idx_1 on gtestparted(a);
 --now index gtestpart2_a_idx_copy should attach to the partition tree.
 SELECT * FROM pg_partition_tree('gtestparted_a_idx_1'::regclass);

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/generated_virtual.out /tmp/cirrus-ci-build/build/testrun/regress...
--- /tmp/cirrus-ci-build/src/test/regress/expected/generated_virtual.out	2025-09-12 12:58:00.250333000 +0000
+++ /tmp/cirrus-ci-build/build/testrun/regress/regress/results/generated_virtual.out	2025-09-12 13:01:05.017580000 +0000
@@ -768,7 +768,7 @@
 ALTER INDEX gtestparted_a_idx ATTACH PARTITION gtestpart2_a_idx; --ok
 ALTER INDEX gtestparted_a_idx ATTACH PARTITION gtestpart2_a_idx_copy; --error
 ERROR:  cannot attach index "gtestpart2_a_idx_copy" as a partition of index "gtestparted_a_idx"
-DETAIL:  Another index is already attached for partition "gtestpart2".
+DETAIL:  Another index "gtestpart2_a_idx" is already attached for partition "gtestpart2".
 CREATE INDEX gtestparted_a_idx_1 on gtestparted(a);
 --now index gtestpart2_a_idx_copy should attach to the partition tree.
 SELECT * FROM pg_partition_tree('gtestparted_a_idx_1'::regclass);

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	2025-09-12 08:34:03.045896525 +0000
+++ /tmp/cirrus-ci-build/build/testrun/btree_gist/regress/results/without_overlaps.out	2025-09-12 08:40:34.208729902 +00...
@@ -9,84 +9,7 @@
   CONSTRAINT temporal_rng_pk PRIMARY KEY (id, valid_at WITHOUT OVERLAPS)
 );
 \d temporal_rng
-              Table "public.temporal_rng"
-  Column  |   Type    | Collation | Nullable | Default 
-----------+-----------+-----------+----------+---------
- id       | integer   |           | not null | 
- valid_at | daterange |           | not null | 
-Indexes:
-    "temporal_rng_pk" PRIMARY KEY (id, valid_at WITHOUT OVERLAPS)
-
-SELECT pg_get_constraintdef(oid) FROM pg_constraint WHERE conname = 'temporal_rng_pk';
-            pg_get_constraintdef             
----------------------------------------------
- PRIMARY KEY (id, valid_at WITHOUT OVERLAPS)
-(1 row)
...

diff -U3 /tmp/cirrus-ci-build/contrib/earthdistance/expected/earthdistance.out /tmp/cirrus-ci-build/build/testrun/earthd...
--- /tmp/cirrus-ci-build/contrib/earthdistance/expected/earthdistance.out	2025-09-12 08:34:03.065896525 +0000
+++ /tmp/cirrus-ci-build/build/testrun/earthdistance/regress/results/earthdistance.out	2025-09-12 08:40:35.632728015 +00...
@@ -1053,46 +1053,7 @@
 drop extension cube cascade;
 NOTICE:  drop cascades to column f1 of table foo
 \d foo
-                Table "public.foo"
- Column |  Type   | Collation | Nullable | Default 
---------+---------+-----------+----------+---------
- f2     | integer |           |          | 
-
--- list what's installed
-\dT public.*
-     List of data types
- Schema | Name | Description 
---------+------+-------------
-(0 rows)
-
-\df public.*
...

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/bit.out /tmp/cirrus-ci-build/build/testrun/pg_upgrade/002_pg_upg...
--- /tmp/cirrus-ci-build/src/test/regress/expected/bit.out	2025-09-12 08:34:05.017896515 +0000
+++ /tmp/cirrus-ci-build/build/testrun/pg_upgrade/002_pg_upgrade/data/results/bit.out	2025-09-12 08:39:17.580847608 +000...
@@ -772,79 +772,7 @@
   b4 bit varying(5) DEFAULT B'0101'
 );
 \d bit_defaults
-                     Table "public.bit_defaults"
- Column |      Type      | Collation | Nullable |       Default       
---------+----------------+-----------+----------+---------------------
- b1     | bit(4)         |           |          | '1001'::"bit"
- b2     | bit(4)         |           |          | '0101'::"bit"
- b3     | bit varying(5) |           |          | '1001'::bit varying
- b4     | bit varying(5) |           |          | '0101'::"bit"
-
-INSERT INTO bit_defaults DEFAULT VALUES;
-TABLE bit_defaults;
-  b1  |  b2  |  b3  |  b4  
-------+------+------+------
- 1001 | 0101 | 1001 | 0101
...

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	2025-09-12 08:34:03.161896525 +0000
+++ /tmp/cirrus-ci-build/build/testrun/postgres_fdw/regress/results/postgres_fdw.out	2025-09-12 08:40:48.928710712 +0000
@@ -397,12312 +397,7 @@
 
 -- subquery
 SELECT * FROM ft1 t1 WHERE t1.c3 IN (SELECT c3 FROM ft2 t2 WHERE c1 <= 10) ORDER BY c1;
- c1 | c2 |  c3   |              c4              |            c5            | c6 |     c7     | c8  
-----+----+-------+------------------------------+--------------------------+----+------------+-----
-  1 |  1 | 00001 | Fri Jan 02 00:00:00 1970 PST | Fri Jan 02 00:00:00 1970 | 1  | 1          | foo
-  2 |  2 | 00002 | Sat Jan 03 00:00:00 1970 PST | Sat Jan 03 00:00:00 1970 | 2  | 2          | foo
-  3 |  3 | 00003 | Sun Jan 04 00:00:00 1970 PST | Sun Jan 04 00:00:00 1970 | 3  | 3          | foo
-  4 |  4 | 00004 | Mon Jan 05 00:00:00 1970 PST | Mon Jan 05 00:00:00 1970 | 4  | 4          | foo
-  5 |  5 | 00005 | Tue Jan 06 00:00:00 1970 PST | Tue Jan 06 00:00:00 1970 | 5  | 5          | foo
-  6 |  6 | 00006 | Wed Jan 07 00:00:00 1970 PST | Wed Jan 07 00:00:00 1970 | 6  | 6          | foo
-  7 |  7 | 00007 | Thu Jan 08 00:00:00 1970 PST | Thu Jan 08 00:00:00 1970 | 7  | 7          | foo
-  8 |  8 | 00008 | Fri Jan 09 00:00:00 1970 PST | Fri Jan 09 00:00:00 1970 | 8  | 8          | foo
-  9 |  9 | 00009 | Sat Jan 10 00:00:00 1970 PST | Sat Jan 10 00:00:00 1970 | 9  | 9          | foo
- 10 |  0 | 00010 | Sun Jan 11 00:00:00 1970 PST | Sun Jan 11 00:00:00 1970 | 0  | 0          | foo
-(10 rows)
...

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/bit.out /tmp/cirrus-ci-build/build/testrun/recovery/027_stream_r...
--- /tmp/cirrus-ci-build/src/test/regress/expected/bit.out	2025-09-12 08:34:05.017896515 +0000
+++ /tmp/cirrus-ci-build/build/testrun/recovery/027_stream_regress/data/results/bit.out	2025-09-12 08:39:57.204781956 +0...
@@ -772,79 +772,7 @@
   b4 bit varying(5) DEFAULT B'0101'
 );
 \d bit_defaults
-                     Table "public.bit_defaults"
- Column |      Type      | Collation | Nullable |       Default       
---------+----------------+-----------+----------+---------------------
- b1     | bit(4)         |           |          | '1001'::"bit"
- b2     | bit(4)         |           |          | '0101'::"bit"
- b3     | bit varying(5) |           |          | '1001'::bit varying
- b4     | bit varying(5) |           |          | '0101'::"bit"
-
-INSERT INTO bit_defaults DEFAULT VALUES;
-TABLE bit_defaults;
-  b1  |  b2  |  b3  |  b4  
-------+------+------+------
- 1001 | 0101 | 1001 | 0101
...

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/bit.out /tmp/cirrus-ci-build/build/testrun/regress/regress/resul...
--- /tmp/cirrus-ci-build/src/test/regress/expected/bit.out	2025-09-12 08:34:05.017896515 +0000
+++ /tmp/cirrus-ci-build/build/testrun/regress/regress/results/bit.out	2025-09-12 08:39:14.804852779 +0000
@@ -772,79 +772,7 @@
   b4 bit varying(5) DEFAULT B'0101'
 );
 \d bit_defaults
-                     Table "public.bit_defaults"
- Column |      Type      | Collation | Nullable |       Default       
---------+----------------+-----------+----------+---------------------
- b1     | bit(4)         |           |          | '1001'::"bit"
- b2     | bit(4)         |           |          | '0101'::"bit"
- b3     | bit varying(5) |           |          | '1001'::bit varying
- b4     | bit varying(5) |           |          | '0101'::"bit"
-
-INSERT INTO bit_defaults DEFAULT VALUES;
-TABLE bit_defaults;
-  b1  |  b2  |  b3  |  b4  
-------+------+------+------
- 1001 | 0101 | 1001 | 0101
...

diff -U3 /tmp/cirrus-ci-build/contrib/seg/expected/partition.out /tmp/cirrus-ci-build/build/testrun/seg/regress/results/...
--- /tmp/cirrus-ci-build/contrib/seg/expected/partition.out	2025-09-12 08:34:03.169896525 +0000
+++ /tmp/cirrus-ci-build/build/testrun/seg/regress/results/partition.out	2025-09-12 08:40:50.584708593 +0000
@@ -24,31 +24,7 @@
 create table pt34 partition of pt for values in (3,4);
 insert into pt values(4, '-1 .. 1'::seg, 'foo');
 \d+ pt
-                                Partitioned table "public.pt"
-  Column  |  Type   | Collation | Nullable | Default | Storage  | Stats target | Description 
-----------+---------+-----------+----------+---------+----------+--------------+-------------
- category | integer |           |          |         | plain    |              | 
- sdata    | seg     |           |          |         | plain    |              | 
- tdata    | text    |           |          |         | extended |              | 
-Partition key: LIST (category)
-Indexes:
-    "pti1" btree ((mydouble(category) + 1))
-    "pti2" btree (sdata)
-    "pti3" btree (tdata COLLATE mycollation)
-Partitions: pt12 FOR VALUES IN (1, 2),
-            pt34 FOR VALUES IN (3, 4)
...

diff -U3 /tmp/cirrus-ci-build/contrib/test_decoding/expected/ddl.out /tmp/cirrus-ci-build/build/testrun/test_decoding/re...
--- /tmp/cirrus-ci-build/contrib/test_decoding/expected/ddl.out	2025-09-12 08:34:03.189896525 +0000
+++ /tmp/cirrus-ci-build/build/testrun/test_decoding/regress/results/ddl.out	2025-09-12 08:40:53.692704636 +0000
@@ -484,374 +484,7 @@
 WITH (user_catalog_table = true)
 ;
 \d+ replication_metadata
-                                                 Table "public.replication_metadata"
-  Column  |  Type   | Collation | Nullable |                     Default                      | Storage  | Stats target...
-----------+---------+-----------+----------+--------------------------------------------------+----------+-------------...
- id       | integer |           | not null | nextval('replication_metadata_id_seq'::regclass) | plain    |             ...
- relation | name    |           | not null |                                                  | plain    |             ...
- options  | text[]  |           |          |                                                  | extended |             ...
-Indexes:
-    "replication_metadata_pkey" PRIMARY KEY, btree (id)
-Not-null constraints:
-    "replication_metadata_id_not_null" NOT NULL "id"
-    "replication_metadata_relation_not_null" NOT NULL "relation"
-Options: user_catalog_table=true
-
...

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	2025-09-12 05:51:26.825065634 +0000
+++ /tmp/cirrus-ci-build/build/testrun/plperl/regress/results/plperl_setup.out	2025-09-12 05:56:36.572480899 +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:  Must be superuser or member of pg_manage_extensions 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:  Must be superuser or member of pg_manage_extensions 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	2025-09-12 05:51:33.568140300 +0000
+++ C:/cirrus/build/testrun/plperl/regress/results/plperl_setup.out	2025-09-12 05:58:33.349510500 +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:  Must be superuser or member of pg_manage_extensions 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:  Must be superuser or member of pg_manage_extensions 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	2025-09-12 05:51:12
+++ /Users/admin/pgsql/build/testrun/plperl/regress/results/plperl_setup.out	2025-09-12 05:53:49
@@ -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:  Must be superuser or member of pg_manage_extensions 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:  Must be superuser or member of pg_manage_extensions 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	2025-09-12 05:51:26.484063000 +0000
+++ /tmp/cirrus-ci-build/build/testrun/plperl/regress/results/plperl_setup.out	2025-09-12 05:53:51.103558000 +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:  Must be superuser or member of pg_manage_extensions 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:  Must be superuser or member of pg_manage_extensions 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	2025-09-12 05:51:29.123696402 +0000
+++ /tmp/cirrus-ci-build/src/pl/plperl/results/plperl_setup.out	2025-09-12 05:54:07.875838991 +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:  Must be superuser or member of pg_manage_extensions 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:  Must be superuser or member of pg_manage_extensions to create this extension.
 CREATE SCHEMA plperl_setup_scratch;
 SET search_path = plperl_setup_scratch;
...

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	2025-09-12 02:43:13.397307200 +0000
+++ C:/cirrus/build/testrun/pg_upgrade/002_pg_upgrade/data/results/subselect.out	2025-09-12 02:46:05.056890200 +0000
@@ -2884,13 +2884,15 @@
 EXPLAIN (COSTS OFF)
 SELECT * FROM onek, (VALUES('RFAAAA'), ('VJAAAA')) AS v (i)
   WHERE onek.stringu1 = v.i;
-                         QUERY PLAN                          
--------------------------------------------------------------
+                            QUERY PLAN                             
+-------------------------------------------------------------------
  Nested Loop
    ->  Values Scan on "*VALUES*"
-   ->  Index Scan using onek_stringu1 on onek
-         Index Cond: (stringu1 = ("*VALUES*".column1)::text)
-(4 rows)
+   ->  Bitmap Heap Scan on onek
+         Recheck Cond: (stringu1 = ("*VALUES*".column1)::text)
+         ->  Bitmap Index Scan on onek_stringu1
+               Index Cond: (stringu1 = ("*VALUES*".column1)::text)
...

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	2025-09-12 02:43:13.397307200 +0000
+++ C:/cirrus/build/testrun/recovery/027_stream_regress/data/results/subselect.out	2025-09-12 02:48:46.111522800 +0000
@@ -2884,13 +2884,15 @@
 EXPLAIN (COSTS OFF)
 SELECT * FROM onek, (VALUES('RFAAAA'), ('VJAAAA')) AS v (i)
   WHERE onek.stringu1 = v.i;
-                         QUERY PLAN                          
--------------------------------------------------------------
+                            QUERY PLAN                             
+-------------------------------------------------------------------
  Nested Loop
    ->  Values Scan on "*VALUES*"
-   ->  Index Scan using onek_stringu1 on onek
-         Index Cond: (stringu1 = ("*VALUES*".column1)::text)
-(4 rows)
+   ->  Bitmap Heap Scan on onek
+         Recheck Cond: (stringu1 = ("*VALUES*".column1)::text)
+         ->  Bitmap Index Scan on onek_stringu1
+               Index Cond: (stringu1 = ("*VALUES*".column1)::text)
...

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	2025-09-12 02:43:13.397307200 +0000
+++ C:/cirrus/build/testrun/regress/regress/results/subselect.out	2025-09-12 02:45:56.188727000 +0000
@@ -2884,13 +2884,15 @@
 EXPLAIN (COSTS OFF)
 SELECT * FROM onek, (VALUES('RFAAAA'), ('VJAAAA')) AS v (i)
   WHERE onek.stringu1 = v.i;
-                         QUERY PLAN                          
--------------------------------------------------------------
+                            QUERY PLAN                             
+-------------------------------------------------------------------
  Nested Loop
    ->  Values Scan on "*VALUES*"
-   ->  Index Scan using onek_stringu1 on onek
-         Index Cond: (stringu1 = ("*VALUES*".column1)::text)
-(4 rows)
+   ->  Bitmap Heap Scan on onek
+         Recheck Cond: (stringu1 = ("*VALUES*".column1)::text)
+         ->  Bitmap Index Scan on onek_stringu1
+               Index Cond: (stringu1 = ("*VALUES*".column1)::text)
...

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	2025-09-12 02:43:12
+++ /Users/admin/pgsql/build/testrun/pg_upgrade/002_pg_upgrade/data/results/subselect.out	2025-09-12 02:44:59
@@ -2884,13 +2884,15 @@
 EXPLAIN (COSTS OFF)
 SELECT * FROM onek, (VALUES('RFAAAA'), ('VJAAAA')) AS v (i)
   WHERE onek.stringu1 = v.i;
-                         QUERY PLAN                          
--------------------------------------------------------------
+                            QUERY PLAN                             
+-------------------------------------------------------------------
  Nested Loop
    ->  Values Scan on "*VALUES*"
-   ->  Index Scan using onek_stringu1 on onek
-         Index Cond: (stringu1 = ("*VALUES*".column1)::text)
-(4 rows)
+   ->  Bitmap Heap Scan on onek
+         Recheck Cond: (stringu1 = ("*VALUES*".column1)::text)
+         ->  Bitmap Index Scan on onek_stringu1
+               Index Cond: (stringu1 = ("*VALUES*".column1)::text)
...

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	2025-09-12 02:43:12
+++ /Users/admin/pgsql/build/testrun/recovery/027_stream_regress/data/results/subselect.out	2025-09-12 02:45:41
@@ -2884,13 +2884,15 @@
 EXPLAIN (COSTS OFF)
 SELECT * FROM onek, (VALUES('RFAAAA'), ('VJAAAA')) AS v (i)
   WHERE onek.stringu1 = v.i;
-                         QUERY PLAN                          
--------------------------------------------------------------
+                            QUERY PLAN                             
+-------------------------------------------------------------------
  Nested Loop
    ->  Values Scan on "*VALUES*"
-   ->  Index Scan using onek_stringu1 on onek
-         Index Cond: (stringu1 = ("*VALUES*".column1)::text)
-(4 rows)
+   ->  Bitmap Heap Scan on onek
+         Recheck Cond: (stringu1 = ("*VALUES*".column1)::text)
+         ->  Bitmap Index Scan on onek_stringu1
+               Index Cond: (stringu1 = ("*VALUES*".column1)::text)
...

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	2025-09-12 02:43:12
+++ /Users/admin/pgsql/build/testrun/regress/regress/results/subselect.out	2025-09-12 02:44:58
@@ -2884,13 +2884,15 @@
 EXPLAIN (COSTS OFF)
 SELECT * FROM onek, (VALUES('RFAAAA'), ('VJAAAA')) AS v (i)
   WHERE onek.stringu1 = v.i;
-                         QUERY PLAN                          
--------------------------------------------------------------
+                            QUERY PLAN                             
+-------------------------------------------------------------------
  Nested Loop
    ->  Values Scan on "*VALUES*"
-   ->  Index Scan using onek_stringu1 on onek
-         Index Cond: (stringu1 = ("*VALUES*".column1)::text)
-(4 rows)
+   ->  Bitmap Heap Scan on onek
+         Recheck Cond: (stringu1 = ("*VALUES*".column1)::text)
+         ->  Bitmap Index Scan on onek_stringu1
+               Index Cond: (stringu1 = ("*VALUES*".column1)::text)
...

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	2025-09-12 02:43:10.225570905 +0000
+++ /tmp/cirrus-ci-build/build/testrun/pg_upgrade/002_pg_upgrade/data/results/subselect.out	2025-09-12 02:44:52.69778820...
@@ -2884,13 +2884,15 @@
 EXPLAIN (COSTS OFF)
 SELECT * FROM onek, (VALUES('RFAAAA'), ('VJAAAA')) AS v (i)
   WHERE onek.stringu1 = v.i;
-                         QUERY PLAN                          
--------------------------------------------------------------
+                            QUERY PLAN                             
+-------------------------------------------------------------------
  Nested Loop
    ->  Values Scan on "*VALUES*"
-   ->  Index Scan using onek_stringu1 on onek
-         Index Cond: (stringu1 = ("*VALUES*".column1)::text)
-(4 rows)
+   ->  Bitmap Heap Scan on onek
+         Recheck Cond: (stringu1 = ("*VALUES*".column1)::text)
+         ->  Bitmap Index Scan on onek_stringu1
+               Index Cond: (stringu1 = ("*VALUES*".column1)::text)
...

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/subselect.out /tmp/cirrus-ci-build/build/testrun/recovery/027_st...
--- /tmp/cirrus-ci-build/src/test/regress/expected/subselect.out	2025-09-12 02:43:10.225570905 +0000
+++ /tmp/cirrus-ci-build/build/testrun/recovery/027_stream_regress/data/results/subselect.out	2025-09-12 02:46:09.673714...
@@ -2884,13 +2884,15 @@
 EXPLAIN (COSTS OFF)
 SELECT * FROM onek, (VALUES('RFAAAA'), ('VJAAAA')) AS v (i)
   WHERE onek.stringu1 = v.i;
-                         QUERY PLAN                          
--------------------------------------------------------------
+                            QUERY PLAN                             
+-------------------------------------------------------------------
  Nested Loop
    ->  Values Scan on "*VALUES*"
-   ->  Index Scan using onek_stringu1 on onek
-         Index Cond: (stringu1 = ("*VALUES*".column1)::text)
-(4 rows)
+   ->  Bitmap Heap Scan on onek
+         Recheck Cond: (stringu1 = ("*VALUES*".column1)::text)
+         ->  Bitmap Index Scan on onek_stringu1
+               Index Cond: (stringu1 = ("*VALUES*".column1)::text)
...

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/subselect.out /tmp/cirrus-ci-build/build/testrun/regress/regress...
--- /tmp/cirrus-ci-build/src/test/regress/expected/subselect.out	2025-09-12 02:43:10.225570905 +0000
+++ /tmp/cirrus-ci-build/build/testrun/regress/regress/results/subselect.out	2025-09-12 02:44:49.989767871 +0000
@@ -2884,13 +2884,15 @@
 EXPLAIN (COSTS OFF)
 SELECT * FROM onek, (VALUES('RFAAAA'), ('VJAAAA')) AS v (i)
   WHERE onek.stringu1 = v.i;
-                         QUERY PLAN                          
--------------------------------------------------------------
+                            QUERY PLAN                             
+-------------------------------------------------------------------
  Nested Loop
    ->  Values Scan on "*VALUES*"
-   ->  Index Scan using onek_stringu1 on onek
-         Index Cond: (stringu1 = ("*VALUES*".column1)::text)
-(4 rows)
+   ->  Bitmap Heap Scan on onek
+         Recheck Cond: (stringu1 = ("*VALUES*".column1)::text)
+         ->  Bitmap Index Scan on onek_stringu1
+               Index Cond: (stringu1 = ("*VALUES*".column1)::text)
...

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/subselect.out /tmp/cirrus-ci-build/src/bin/pg_upgrade/tmp_check/...
--- /tmp/cirrus-ci-build/src/test/regress/expected/subselect.out	2025-09-12 02:43:09.305913869 +0000
+++ /tmp/cirrus-ci-build/src/bin/pg_upgrade/tmp_check/results/subselect.out	2025-09-12 02:48:51.869183686 +0000
@@ -2884,13 +2884,15 @@
 EXPLAIN (COSTS OFF)
 SELECT * FROM onek, (VALUES('RFAAAA'), ('VJAAAA')) AS v (i)
   WHERE onek.stringu1 = v.i;
-                         QUERY PLAN                          
--------------------------------------------------------------
+                            QUERY PLAN                             
+-------------------------------------------------------------------
  Nested Loop
    ->  Values Scan on "*VALUES*"
-   ->  Index Scan using onek_stringu1 on onek
-         Index Cond: (stringu1 = ("*VALUES*".column1)::text)
-(4 rows)
+   ->  Bitmap Heap Scan on onek
+         Recheck Cond: (stringu1 = ("*VALUES*".column1)::text)
+         ->  Bitmap Index Scan on onek_stringu1
+               Index Cond: (stringu1 = ("*VALUES*".column1)::text)
...

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/subselect.out /tmp/cirrus-ci-build/src/test/recovery/tmp_check/r...
--- /tmp/cirrus-ci-build/src/test/regress/expected/subselect.out	2025-09-12 02:43:09.305913869 +0000
+++ /tmp/cirrus-ci-build/src/test/recovery/tmp_check/results/subselect.out	2025-09-12 02:50:34.169100699 +0000
@@ -2884,13 +2884,15 @@
 EXPLAIN (COSTS OFF)
 SELECT * FROM onek, (VALUES('RFAAAA'), ('VJAAAA')) AS v (i)
   WHERE onek.stringu1 = v.i;
-                         QUERY PLAN                          
--------------------------------------------------------------
+                            QUERY PLAN                             
+-------------------------------------------------------------------
  Nested Loop
    ->  Values Scan on "*VALUES*"
-   ->  Index Scan using onek_stringu1 on onek
-         Index Cond: (stringu1 = ("*VALUES*".column1)::text)
-(4 rows)
+   ->  Bitmap Heap Scan on onek
+         Recheck Cond: (stringu1 = ("*VALUES*".column1)::text)
+         ->  Bitmap Index Scan on onek_stringu1
+               Index Cond: (stringu1 = ("*VALUES*".column1)::text)
...

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/subselect.out /tmp/cirrus-ci-build/src/test/regress/results/subs...
--- /tmp/cirrus-ci-build/src/test/regress/expected/subselect.out	2025-09-12 02:43:09.305913869 +0000
+++ /tmp/cirrus-ci-build/src/test/regress/results/subselect.out	2025-09-12 02:45:13.129467040 +0000
@@ -2884,13 +2884,15 @@
 EXPLAIN (COSTS OFF)
 SELECT * FROM onek, (VALUES('RFAAAA'), ('VJAAAA')) AS v (i)
   WHERE onek.stringu1 = v.i;
-                         QUERY PLAN                          
--------------------------------------------------------------
+                            QUERY PLAN                             
+-------------------------------------------------------------------
  Nested Loop
    ->  Values Scan on "*VALUES*"
-   ->  Index Scan using onek_stringu1 on onek
-         Index Cond: (stringu1 = ("*VALUES*".column1)::text)
-(4 rows)
+   ->  Bitmap Heap Scan on onek
+         Recheck Cond: (stringu1 = ("*VALUES*".column1)::text)
+         ->  Bitmap Index Scan on onek_stringu1
+               Index Cond: (stringu1 = ("*VALUES*".column1)::text)
...

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	2025-09-12 02:43:09.832079000 +0000
+++ /tmp/cirrus-ci-build/build/testrun/pg_upgrade/002_pg_upgrade/data/results/subselect.out	2025-09-12 02:44:42.81041500...
@@ -2884,13 +2884,15 @@
 EXPLAIN (COSTS OFF)
 SELECT * FROM onek, (VALUES('RFAAAA'), ('VJAAAA')) AS v (i)
   WHERE onek.stringu1 = v.i;
-                         QUERY PLAN                          
--------------------------------------------------------------
+                            QUERY PLAN                             
+-------------------------------------------------------------------
  Nested Loop
    ->  Values Scan on "*VALUES*"
-   ->  Index Scan using onek_stringu1 on onek
-         Index Cond: (stringu1 = ("*VALUES*".column1)::text)
-(4 rows)
+   ->  Bitmap Heap Scan on onek
+         Recheck Cond: (stringu1 = ("*VALUES*".column1)::text)
+         ->  Bitmap Index Scan on onek_stringu1
+               Index Cond: (stringu1 = ("*VALUES*".column1)::text)
...

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/subselect.out /tmp/cirrus-ci-build/build/testrun/recovery/027_st...
--- /tmp/cirrus-ci-build/src/test/regress/expected/subselect.out	2025-09-12 02:43:09.832079000 +0000
+++ /tmp/cirrus-ci-build/build/testrun/recovery/027_stream_regress/data/results/subselect.out	2025-09-12 02:45:47.348081...
@@ -2884,13 +2884,15 @@
 EXPLAIN (COSTS OFF)
 SELECT * FROM onek, (VALUES('RFAAAA'), ('VJAAAA')) AS v (i)
   WHERE onek.stringu1 = v.i;
-                         QUERY PLAN                          
--------------------------------------------------------------
+                            QUERY PLAN                             
+-------------------------------------------------------------------
  Nested Loop
    ->  Values Scan on "*VALUES*"
-   ->  Index Scan using onek_stringu1 on onek
-         Index Cond: (stringu1 = ("*VALUES*".column1)::text)
-(4 rows)
+   ->  Bitmap Heap Scan on onek
+         Recheck Cond: (stringu1 = ("*VALUES*".column1)::text)
+         ->  Bitmap Index Scan on onek_stringu1
+               Index Cond: (stringu1 = ("*VALUES*".column1)::text)
...

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/subselect.out /tmp/cirrus-ci-build/build/testrun/regress/regress...
--- /tmp/cirrus-ci-build/src/test/regress/expected/subselect.out	2025-09-12 02:43:09.832079000 +0000
+++ /tmp/cirrus-ci-build/build/testrun/regress/regress/results/subselect.out	2025-09-12 02:44:43.027276000 +0000
@@ -2884,13 +2884,15 @@
 EXPLAIN (COSTS OFF)
 SELECT * FROM onek, (VALUES('RFAAAA'), ('VJAAAA')) AS v (i)
   WHERE onek.stringu1 = v.i;
-                         QUERY PLAN                          
--------------------------------------------------------------
+                            QUERY PLAN                             
+-------------------------------------------------------------------
  Nested Loop
    ->  Values Scan on "*VALUES*"
-   ->  Index Scan using onek_stringu1 on onek
-         Index Cond: (stringu1 = ("*VALUES*".column1)::text)
-(4 rows)
+   ->  Bitmap Heap Scan on onek
+         Recheck Cond: (stringu1 = ("*VALUES*".column1)::text)
+         ->  Bitmap Index Scan on onek_stringu1
+               Index Cond: (stringu1 = ("*VALUES*".column1)::text)
...