PostgreSQL Patch Tester

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	2026-05-29 16:31:51.170036684 +0000
+++ /home/postgres/postgres/build/testrun/isolation/isolation/results/timeouts.out	2026-05-29 16:34:22.569797968 +0000
@@ -50,7 +50,7 @@
 step slto: SET lock_timeout = '10s'; SET statement_timeout = '10ms';
 step locktbl: LOCK TABLE accounts; <waiting ...>
 step locktbl: <... completed>
-ERROR:  canceling statement due to statement timeout
+ERROR:  canceling statement due to user request
 
 starting permutation: wrtbl sto update
 step wrtbl: UPDATE accounts SET balance = balance + 100;

diff --strip-trailing-cr -U3 C:/cirrus/src/test/regress/expected/foreign_key.out C:/cirrus/build/testrun/recovery/027_st...
--- C:/cirrus/src/test/regress/expected/foreign_key.out	2026-05-29 15:40:40.170529000 +0000
+++ C:/cirrus/build/testrun/recovery/027_stream_regress/data/results/foreign_key.out	2026-05-29 15:49:58.351238500 +0000
@@ -899,2816 +899,7 @@
   (1, 1, 1, NULL),
   (1, 2, NULL, 2);
 DELETE FROM PKTABLE WHERE id = 1 OR id = 2;
-SELECT * FROM FKTABLE ORDER BY id;
- tid | id | fk_id_del_set_null | fk_id_del_set_default 
------+----+--------------------+-----------------------
-   1 |  1 |                    |                      
-   1 |  2 |                    |                     0
-(2 rows)
-
-DROP TABLE FKTABLE;
-DROP TABLE PKTABLE;
--- Test some invalid FK definitions
-CREATE TABLE PKTABLE (ptest1 int PRIMARY KEY, someoid oid);
-CREATE TABLE FKTABLE_FAIL1 ( ftest1 int, CONSTRAINT fkfail1 FOREIGN KEY (ftest2) REFERENCES PKTABLE);
-ERROR:  column "ftest2" referenced in foreign key constraint does not exist
...

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/foreign_key.out /tmp/cirrus-ci-build/build-32/testrun/test_plan_...
--- /tmp/cirrus-ci-build/src/test/regress/expected/foreign_key.out	2026-05-29 15:41:00.051234835 +0000
+++ /tmp/cirrus-ci-build/build-32/testrun/test_plan_advice/001_replan_regress/data/results/foreign_key.out	2026-05-29 15...
@@ -262,3453 +262,7 @@
 
 -- Delete another row from PK TABLE
 DELETE FROM PKTABLE WHERE ptest1=5 and ptest2=10;
--- Check FKTABLE (should be no change)
-SELECT * FROM FKTABLE;
- ftest1 | ftest2 | ftest3 
---------+--------+--------
-      1 |      3 |      5
-      2 |      4 |      8
-      3 |      6 |     12
-        |        |      0
-     -1 |     -2 |      4
-(5 rows)
-
--- Update a row from PK TABLE
-UPDATE PKTABLE SET ptest1=1 WHERE ptest1=2;
...

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	2026-05-29 15:40:33.768193000 +0000
+++ /tmp/cirrus-ci-build/build/testrun/postgres_fdw-running/regress/results/postgres_fdw.out	2026-05-29 15:49:21.1661890...
@@ -12983,8 +12983,7 @@
   FROM postgres_fdw_get_connections(true);
  server_name | closed | remote_backend_pid 
 -------------+--------+--------------------
- loopback    | t      | t
-(1 row)
+(0 rows)
 
 -- Clean up
 \set VERBOSITY default

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/foreign_key.out /tmp/cirrus-ci-build/src/test/regress/results/fo...
--- /tmp/cirrus-ci-build/src/test/regress/expected/foreign_key.out	2026-05-29 15:40:46.760478444 +0000
+++ /tmp/cirrus-ci-build/src/test/regress/results/foreign_key.out	2026-05-29 15:45:05.087753792 +0000
@@ -2154,1561 +2154,7 @@
 -- but inserting the row we can make it work:
 INSERT INTO fk_notpartitioned_pk VALUES (2501, 142857);
 UPDATE fk_notpartitioned_pk SET a = 1500 WHERE a = 2502;
-SELECT * FROM fk_partitioned_fk WHERE b = 142857;
-  a   |   b    
-------+--------
- 2501 | 142857
-(1 row)
-
--- ON DELETE SET NULL column_list
-ALTER TABLE fk_partitioned_fk DROP CONSTRAINT fk_partitioned_fk_a_b_fkey;
-ALTER TABLE fk_partitioned_fk ADD FOREIGN KEY (a, b)
-  REFERENCES fk_notpartitioned_pk
-  ON DELETE SET NULL (a);
-BEGIN;
-DELETE FROM fk_notpartitioned_pk WHERE b = 142857;
...

diff --strip-trailing-cr -U3 C:/cirrus/src/test/regress/expected/incremental_matview.out C:/cirrus/build/testrun/pg_upgr...
--- C:/cirrus/src/test/regress/expected/incremental_matview.out	2026-05-29 14:41:30.362669200 +0000
+++ C:/cirrus/build/testrun/pg_upgrade/002_pg_upgrade/data/results/incremental_matview.out	2026-05-29 14:45:40.469482600...
@@ -544,7 +544,7 @@
 ROLLBACK;
 BEGIN;
 CREATE INCREMENTAL MATERIALIZED VIEW mv_ivm_agg(a,b,c) AS SELECT i, SUM(j) FROM mv_base_a GROUP BY i;
-ERROR:  too many column names were specified
+NOTICE:  created index "mv_ivm_agg_index" on materialized view "mv_ivm_agg"
 ROLLBACK;
 -- support self join view and multiple change on the same table
 BEGIN;

diff --strip-trailing-cr -U3 C:/cirrus/src/test/regress/expected/incremental_matview.out C:/cirrus/build/testrun/recover...
--- C:/cirrus/src/test/regress/expected/incremental_matview.out	2026-05-29 14:41:30.362669200 +0000
+++ C:/cirrus/build/testrun/recovery/027_stream_regress/data/results/incremental_matview.out	2026-05-29 14:49:20.9205962...
@@ -544,7 +544,7 @@
 ROLLBACK;
 BEGIN;
 CREATE INCREMENTAL MATERIALIZED VIEW mv_ivm_agg(a,b,c) AS SELECT i, SUM(j) FROM mv_base_a GROUP BY i;
-ERROR:  too many column names were specified
+NOTICE:  created index "mv_ivm_agg_index" on materialized view "mv_ivm_agg"
 ROLLBACK;
 -- support self join view and multiple change on the same table
 BEGIN;

diff --strip-trailing-cr -U3 C:/cirrus/src/test/regress/expected/incremental_matview.out C:/cirrus/build/testrun/regress...
--- C:/cirrus/src/test/regress/expected/incremental_matview.out	2026-05-29 14:41:30.362669200 +0000
+++ C:/cirrus/build/testrun/regress/regress/results/incremental_matview.out	2026-05-29 14:45:35.590039100 +0000
@@ -544,7 +544,7 @@
 ROLLBACK;
 BEGIN;
 CREATE INCREMENTAL MATERIALIZED VIEW mv_ivm_agg(a,b,c) AS SELECT i, SUM(j) FROM mv_base_a GROUP BY i;
-ERROR:  too many column names were specified
+NOTICE:  created index "mv_ivm_agg_index" on materialized view "mv_ivm_agg"
 ROLLBACK;
 -- support self join view and multiple change on the same table
 BEGIN;

diff --strip-trailing-cr -U3 C:/cirrus/src/test/regress/expected/incremental_matview.out C:/cirrus/build/testrun/test_pl...
--- C:/cirrus/src/test/regress/expected/incremental_matview.out	2026-05-29 14:41:30.362669200 +0000
+++ C:/cirrus/build/testrun/test_plan_advice/001_replan_regress/data/results/incremental_matview.out	2026-05-29 14:45:39...
@@ -544,7 +544,7 @@
 ROLLBACK;
 BEGIN;
 CREATE INCREMENTAL MATERIALIZED VIEW mv_ivm_agg(a,b,c) AS SELECT i, SUM(j) FROM mv_base_a GROUP BY i;
-ERROR:  too many column names were specified
+NOTICE:  created index "mv_ivm_agg_index" on materialized view "mv_ivm_agg"
 ROLLBACK;
 -- support self join view and multiple change on the same table
 BEGIN;

diff -U3 /Users/admin/pgsql/src/test/regress/expected/incremental_matview.out /Users/admin/pgsql/build/testrun/pg_upgrad...
--- /Users/admin/pgsql/src/test/regress/expected/incremental_matview.out	2026-05-29 14:44:41
+++ /Users/admin/pgsql/build/testrun/pg_upgrade/002_pg_upgrade/data/results/incremental_matview.out	2026-05-29 14:51:15
@@ -544,7 +544,7 @@
 ROLLBACK;
 BEGIN;
 CREATE INCREMENTAL MATERIALIZED VIEW mv_ivm_agg(a,b,c) AS SELECT i, SUM(j) FROM mv_base_a GROUP BY i;
-ERROR:  too many column names were specified
+NOTICE:  created index "mv_ivm_agg_index" on materialized view "mv_ivm_agg"
 ROLLBACK;
 -- support self join view and multiple change on the same table
 BEGIN;

diff -U3 /Users/admin/pgsql/src/test/regress/expected/incremental_matview.out /Users/admin/pgsql/build/testrun/recovery/...
--- /Users/admin/pgsql/src/test/regress/expected/incremental_matview.out	2026-05-29 14:44:41
+++ /Users/admin/pgsql/build/testrun/recovery/027_stream_regress/data/results/incremental_matview.out	2026-05-29 14:53:5...
@@ -544,7 +544,7 @@
 ROLLBACK;
 BEGIN;
 CREATE INCREMENTAL MATERIALIZED VIEW mv_ivm_agg(a,b,c) AS SELECT i, SUM(j) FROM mv_base_a GROUP BY i;
-ERROR:  too many column names were specified
+NOTICE:  created index "mv_ivm_agg_index" on materialized view "mv_ivm_agg"
 ROLLBACK;
 -- support self join view and multiple change on the same table
 BEGIN;

diff -U3 /Users/admin/pgsql/src/test/regress/expected/incremental_matview.out /Users/admin/pgsql/build/testrun/regress/r...
--- /Users/admin/pgsql/src/test/regress/expected/incremental_matview.out	2026-05-29 14:44:41
+++ /Users/admin/pgsql/build/testrun/regress/regress/results/incremental_matview.out	2026-05-29 14:51:15
@@ -544,7 +544,7 @@
 ROLLBACK;
 BEGIN;
 CREATE INCREMENTAL MATERIALIZED VIEW mv_ivm_agg(a,b,c) AS SELECT i, SUM(j) FROM mv_base_a GROUP BY i;
-ERROR:  too many column names were specified
+NOTICE:  created index "mv_ivm_agg_index" on materialized view "mv_ivm_agg"
 ROLLBACK;
 -- support self join view and multiple change on the same table
 BEGIN;

diff -U3 /Users/admin/pgsql/src/test/regress/expected/incremental_matview.out /Users/admin/pgsql/build/testrun/test_plan...
--- /Users/admin/pgsql/src/test/regress/expected/incremental_matview.out	2026-05-29 14:44:41
+++ /Users/admin/pgsql/build/testrun/test_plan_advice/001_replan_regress/data/results/incremental_matview.out	2026-05-29...
@@ -544,7 +544,7 @@
 ROLLBACK;
 BEGIN;
 CREATE INCREMENTAL MATERIALIZED VIEW mv_ivm_agg(a,b,c) AS SELECT i, SUM(j) FROM mv_base_a GROUP BY i;
-ERROR:  too many column names were specified
+NOTICE:  created index "mv_ivm_agg_index" on materialized view "mv_ivm_agg"
 ROLLBACK;
 -- support self join view and multiple change on the same table
 BEGIN;

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/incremental_matview.out /tmp/cirrus-ci-build/build/testrun/pg_up...
--- /tmp/cirrus-ci-build/src/test/regress/expected/incremental_matview.out	2026-05-29 14:41:25.410770098 +0000
+++ /tmp/cirrus-ci-build/build/testrun/pg_upgrade/002_pg_upgrade/data/results/incremental_matview.out	2026-05-29 14:46:2...
@@ -544,7 +544,7 @@
 ROLLBACK;
 BEGIN;
 CREATE INCREMENTAL MATERIALIZED VIEW mv_ivm_agg(a,b,c) AS SELECT i, SUM(j) FROM mv_base_a GROUP BY i;
-ERROR:  too many column names were specified
+NOTICE:  created index "mv_ivm_agg_index" on materialized view "mv_ivm_agg"
 ROLLBACK;
 -- support self join view and multiple change on the same table
 BEGIN;

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/incremental_matview.out /tmp/cirrus-ci-build/build/testrun/recov...
--- /tmp/cirrus-ci-build/src/test/regress/expected/incremental_matview.out	2026-05-29 14:41:25.410770098 +0000
+++ /tmp/cirrus-ci-build/build/testrun/recovery/027_stream_regress/data/results/incremental_matview.out	2026-05-29 14:47...
@@ -544,7 +544,7 @@
 ROLLBACK;
 BEGIN;
 CREATE INCREMENTAL MATERIALIZED VIEW mv_ivm_agg(a,b,c) AS SELECT i, SUM(j) FROM mv_base_a GROUP BY i;
-ERROR:  too many column names were specified
+NOTICE:  created index "mv_ivm_agg_index" on materialized view "mv_ivm_agg"
 ROLLBACK;
 -- support self join view and multiple change on the same table
 BEGIN;

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/incremental_matview.out /tmp/cirrus-ci-build/build/testrun/regre...
--- /tmp/cirrus-ci-build/src/test/regress/expected/incremental_matview.out	2026-05-29 14:41:25.410770098 +0000
+++ /tmp/cirrus-ci-build/build/testrun/regress/regress/results/incremental_matview.out	2026-05-29 14:46:19.446947121 +00...
@@ -544,7 +544,7 @@
 ROLLBACK;
 BEGIN;
 CREATE INCREMENTAL MATERIALIZED VIEW mv_ivm_agg(a,b,c) AS SELECT i, SUM(j) FROM mv_base_a GROUP BY i;
-ERROR:  too many column names were specified
+NOTICE:  created index "mv_ivm_agg_index" on materialized view "mv_ivm_agg"
 ROLLBACK;
 -- support self join view and multiple change on the same table
 BEGIN;

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/incremental_matview.out /tmp/cirrus-ci-build/build/testrun/test_...
--- /tmp/cirrus-ci-build/src/test/regress/expected/incremental_matview.out	2026-05-29 14:41:25.410770098 +0000
+++ /tmp/cirrus-ci-build/build/testrun/test_plan_advice/001_replan_regress/data/results/incremental_matview.out	2026-05-...
@@ -544,7 +544,7 @@
 ROLLBACK;
 BEGIN;
 CREATE INCREMENTAL MATERIALIZED VIEW mv_ivm_agg(a,b,c) AS SELECT i, SUM(j) FROM mv_base_a GROUP BY i;
-ERROR:  too many column names were specified
+NOTICE:  created index "mv_ivm_agg_index" on materialized view "mv_ivm_agg"
 ROLLBACK;
 -- support self join view and multiple change on the same table
 BEGIN;

diff -U3 /home/postgres/postgres/src/test/regress/expected/incremental_matview.out /home/postgres/postgres/build/testrun...
--- /home/postgres/postgres/src/test/regress/expected/incremental_matview.out	2026-05-29 14:41:50.044723350 +0000
+++ /home/postgres/postgres/build/testrun/pg_upgrade/002_pg_upgrade/data/results/incremental_matview.out	2026-05-29 14:4...
@@ -544,7 +544,7 @@
 ROLLBACK;
 BEGIN;
 CREATE INCREMENTAL MATERIALIZED VIEW mv_ivm_agg(a,b,c) AS SELECT i, SUM(j) FROM mv_base_a GROUP BY i;
-ERROR:  too many column names were specified
+NOTICE:  created index "mv_ivm_agg_index" on materialized view "mv_ivm_agg"
 ROLLBACK;
 -- support self join view and multiple change on the same table
 BEGIN;

diff -U3 /home/postgres/postgres/src/test/regress/expected/incremental_matview.out /home/postgres/postgres/build/testrun...
--- /home/postgres/postgres/src/test/regress/expected/incremental_matview.out	2026-05-29 14:41:50.044723350 +0000
+++ /home/postgres/postgres/build/testrun/recovery/027_stream_regress/data/results/incremental_matview.out	2026-05-29 14...
@@ -544,7 +544,7 @@
 ROLLBACK;
 BEGIN;
 CREATE INCREMENTAL MATERIALIZED VIEW mv_ivm_agg(a,b,c) AS SELECT i, SUM(j) FROM mv_base_a GROUP BY i;
-ERROR:  too many column names were specified
+NOTICE:  created index "mv_ivm_agg_index" on materialized view "mv_ivm_agg"
 ROLLBACK;
 -- support self join view and multiple change on the same table
 BEGIN;

diff -U3 /home/postgres/postgres/src/test/regress/expected/incremental_matview.out /home/postgres/postgres/build/testrun...
--- /home/postgres/postgres/src/test/regress/expected/incremental_matview.out	2026-05-29 14:41:50.044723350 +0000
+++ /home/postgres/postgres/build/testrun/regress/regress/results/incremental_matview.out	2026-05-29 14:44:57.764032036 ...
@@ -544,7 +544,7 @@
 ROLLBACK;
 BEGIN;
 CREATE INCREMENTAL MATERIALIZED VIEW mv_ivm_agg(a,b,c) AS SELECT i, SUM(j) FROM mv_base_a GROUP BY i;
-ERROR:  too many column names were specified
+NOTICE:  created index "mv_ivm_agg_index" on materialized view "mv_ivm_agg"
 ROLLBACK;
 -- support self join view and multiple change on the same table
 BEGIN;

diff -U3 /home/postgres/postgres/src/test/regress/expected/incremental_matview.out /home/postgres/postgres/build/testrun...
--- /home/postgres/postgres/src/test/regress/expected/incremental_matview.out	2026-05-29 14:41:50.044723350 +0000
+++ /home/postgres/postgres/build/testrun/test_plan_advice/001_replan_regress/data/results/incremental_matview.out	2026-...
@@ -544,7 +544,7 @@
 ROLLBACK;
 BEGIN;
 CREATE INCREMENTAL MATERIALIZED VIEW mv_ivm_agg(a,b,c) AS SELECT i, SUM(j) FROM mv_base_a GROUP BY i;
-ERROR:  too many column names were specified
+NOTICE:  created index "mv_ivm_agg_index" on materialized view "mv_ivm_agg"
 ROLLBACK;
 -- support self join view and multiple change on the same table
 BEGIN;

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/incremental_matview.out /tmp/cirrus-ci-build/src/bin/pg_upgrade/...
--- /tmp/cirrus-ci-build/src/test/regress/expected/incremental_matview.out	2026-05-29 14:41:29.947383489 +0000
+++ /tmp/cirrus-ci-build/src/bin/pg_upgrade/tmp_check/results/incremental_matview.out	2026-05-29 14:50:40.158585119 +000...
@@ -544,7 +544,7 @@
 ROLLBACK;
 BEGIN;
 CREATE INCREMENTAL MATERIALIZED VIEW mv_ivm_agg(a,b,c) AS SELECT i, SUM(j) FROM mv_base_a GROUP BY i;
-ERROR:  too many column names were specified
+NOTICE:  created index "mv_ivm_agg_index" on materialized view "mv_ivm_agg"
 ROLLBACK;
 -- support self join view and multiple change on the same table
 BEGIN;

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/incremental_matview.out /tmp/cirrus-ci-build/src/test/modules/te...
--- /tmp/cirrus-ci-build/src/test/regress/expected/incremental_matview.out	2026-05-29 14:41:29.947383489 +0000
+++ /tmp/cirrus-ci-build/src/test/modules/test_plan_advice/tmp_check/results/incremental_matview.out	2026-05-29 14:53:08...
@@ -544,7 +544,7 @@
 ROLLBACK;
 BEGIN;
 CREATE INCREMENTAL MATERIALIZED VIEW mv_ivm_agg(a,b,c) AS SELECT i, SUM(j) FROM mv_base_a GROUP BY i;
-ERROR:  too many column names were specified
+NOTICE:  created index "mv_ivm_agg_index" on materialized view "mv_ivm_agg"
 ROLLBACK;
 -- support self join view and multiple change on the same table
 BEGIN;

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/incremental_matview.out /tmp/cirrus-ci-build/src/test/recovery/t...
--- /tmp/cirrus-ci-build/src/test/regress/expected/incremental_matview.out	2026-05-29 14:41:29.947383489 +0000
+++ /tmp/cirrus-ci-build/src/test/recovery/tmp_check/results/incremental_matview.out	2026-05-29 14:52:23.854505851 +0000
@@ -544,7 +544,7 @@
 ROLLBACK;
 BEGIN;
 CREATE INCREMENTAL MATERIALIZED VIEW mv_ivm_agg(a,b,c) AS SELECT i, SUM(j) FROM mv_base_a GROUP BY i;
-ERROR:  too many column names were specified
+NOTICE:  created index "mv_ivm_agg_index" on materialized view "mv_ivm_agg"
 ROLLBACK;
 -- support self join view and multiple change on the same table
 BEGIN;

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/incremental_matview.out /tmp/cirrus-ci-build/src/test/regress/re...
--- /tmp/cirrus-ci-build/src/test/regress/expected/incremental_matview.out	2026-05-29 14:41:29.947383489 +0000
+++ /tmp/cirrus-ci-build/src/test/regress/results/incremental_matview.out	2026-05-29 14:47:52.482714414 +0000
@@ -544,7 +544,7 @@
 ROLLBACK;
 BEGIN;
 CREATE INCREMENTAL MATERIALIZED VIEW mv_ivm_agg(a,b,c) AS SELECT i, SUM(j) FROM mv_base_a GROUP BY i;
-ERROR:  too many column names were specified
+NOTICE:  created index "mv_ivm_agg_index" on materialized view "mv_ivm_agg"
 ROLLBACK;
 -- support self join view and multiple change on the same table
 BEGIN;

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/incremental_matview.out /tmp/cirrus-ci-build/build/testrun/pg_up...
--- /tmp/cirrus-ci-build/src/test/regress/expected/incremental_matview.out	2026-05-29 14:41:13.804244000 +0000
+++ /tmp/cirrus-ci-build/build/testrun/pg_upgrade/002_pg_upgrade/data/results/incremental_matview.out	2026-05-29 14:45:0...
@@ -544,7 +544,7 @@
 ROLLBACK;
 BEGIN;
 CREATE INCREMENTAL MATERIALIZED VIEW mv_ivm_agg(a,b,c) AS SELECT i, SUM(j) FROM mv_base_a GROUP BY i;
-ERROR:  too many column names were specified
+NOTICE:  created index "mv_ivm_agg_index" on materialized view "mv_ivm_agg"
 ROLLBACK;
 -- support self join view and multiple change on the same table
 BEGIN;

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/incremental_matview.out /tmp/cirrus-ci-build/build/testrun/recov...
--- /tmp/cirrus-ci-build/src/test/regress/expected/incremental_matview.out	2026-05-29 14:41:13.804244000 +0000
+++ /tmp/cirrus-ci-build/build/testrun/recovery/027_stream_regress/data/results/incremental_matview.out	2026-05-29 14:46...
@@ -544,7 +544,7 @@
 ROLLBACK;
 BEGIN;
 CREATE INCREMENTAL MATERIALIZED VIEW mv_ivm_agg(a,b,c) AS SELECT i, SUM(j) FROM mv_base_a GROUP BY i;
-ERROR:  too many column names were specified
+NOTICE:  created index "mv_ivm_agg_index" on materialized view "mv_ivm_agg"
 ROLLBACK;
 -- support self join view and multiple change on the same table
 BEGIN;

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/incremental_matview.out /tmp/cirrus-ci-build/build/testrun/regre...
--- /tmp/cirrus-ci-build/src/test/regress/expected/incremental_matview.out	2026-05-29 14:41:13.804244000 +0000
+++ /tmp/cirrus-ci-build/build/testrun/regress/regress/results/incremental_matview.out	2026-05-29 14:45:00.142497000 +00...
@@ -544,7 +544,7 @@
 ROLLBACK;
 BEGIN;
 CREATE INCREMENTAL MATERIALIZED VIEW mv_ivm_agg(a,b,c) AS SELECT i, SUM(j) FROM mv_base_a GROUP BY i;
-ERROR:  too many column names were specified
+NOTICE:  created index "mv_ivm_agg_index" on materialized view "mv_ivm_agg"
 ROLLBACK;
 -- support self join view and multiple change on the same table
 BEGIN;

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/incremental_matview.out /tmp/cirrus-ci-build/build/testrun/test_...
--- /tmp/cirrus-ci-build/src/test/regress/expected/incremental_matview.out	2026-05-29 14:41:13.804244000 +0000
+++ /tmp/cirrus-ci-build/build/testrun/test_plan_advice/001_replan_regress/data/results/incremental_matview.out	2026-05-...
@@ -544,7 +544,7 @@
 ROLLBACK;
 BEGIN;
 CREATE INCREMENTAL MATERIALIZED VIEW mv_ivm_agg(a,b,c) AS SELECT i, SUM(j) FROM mv_base_a GROUP BY i;
-ERROR:  too many column names were specified
+NOTICE:  created index "mv_ivm_agg_index" on materialized view "mv_ivm_agg"
 ROLLBACK;
 -- support self join view and multiple change on the same table
 BEGIN;

diff --strip-trailing-cr -U3 C:/cirrus/src/pl/plpgsql/src/expected/plpgsql_misc.out C:/cirrus/build/testrun/plpgsql/regr...
--- C:/cirrus/src/pl/plpgsql/src/expected/plpgsql_misc.out	2026-05-29 04:15:50.119810500 +0000
+++ C:/cirrus/build/testrun/plpgsql/regress/results/plpgsql_misc.out	2026-05-29 04:23:56.552652700 +0000
@@ -194,7 +194,7 @@
 end;
 $$ language plpgsql;
 select * from test_order_by_all_return();
- a |  b  |  c
+ a |  b  |  c  
 ---+-----+-----
  1 | bar | 2.5
  1 | qux | 1.5
@@ -210,7 +210,7 @@
 end;
 $$ language plpgsql;
 select * from test_order_by_all_desc_return();
- a |  b  |  c
+ a |  b  |  c  
 ---+-----+-----
  3 | foo | 1.5
...

diff -U3 /Users/admin/pgsql/src/pl/plpgsql/src/expected/plpgsql_misc.out /Users/admin/pgsql/build/testrun/plpgsql/regres...
--- /Users/admin/pgsql/src/pl/plpgsql/src/expected/plpgsql_misc.out	2026-05-29 04:15:16
+++ /Users/admin/pgsql/build/testrun/plpgsql/regress/results/plpgsql_misc.out	2026-05-29 04:20:50
@@ -194,7 +194,7 @@
 end;
 $$ language plpgsql;
 select * from test_order_by_all_return();
- a |  b  |  c
+ a |  b  |  c  
 ---+-----+-----
  1 | bar | 2.5
  1 | qux | 1.5
@@ -210,7 +210,7 @@
 end;
 $$ language plpgsql;
 select * from test_order_by_all_desc_return();
- a |  b  |  c
+ a |  b  |  c  
 ---+-----+-----
  3 | foo | 1.5
...

diff -U3 /tmp/cirrus-ci-build/src/pl/plpgsql/src/expected/plpgsql_misc.out /tmp/cirrus-ci-build/build/testrun/plpgsql/re...
--- /tmp/cirrus-ci-build/src/pl/plpgsql/src/expected/plpgsql_misc.out	2026-05-29 04:16:12.944027376 +0000
+++ /tmp/cirrus-ci-build/build/testrun/plpgsql/regress/results/plpgsql_misc.out	2026-05-29 04:22:47.935802167 +0000
@@ -194,7 +194,7 @@
 end;
 $$ language plpgsql;
 select * from test_order_by_all_return();
- a |  b  |  c
+ a |  b  |  c  
 ---+-----+-----
  1 | bar | 2.5
  1 | qux | 1.5
@@ -210,7 +210,7 @@
 end;
 $$ language plpgsql;
 select * from test_order_by_all_desc_return();
- a |  b  |  c
+ a |  b  |  c  
 ---+-----+-----
  3 | foo | 1.5
...

diff -U3 /home/postgres/postgres/src/pl/plpgsql/src/expected/plpgsql_misc.out /home/postgres/postgres/build/testrun/plpg...
--- /home/postgres/postgres/src/pl/plpgsql/src/expected/plpgsql_misc.out	2026-05-29 04:16:14.222286765 +0000
+++ /home/postgres/postgres/build/testrun/plpgsql/regress/results/plpgsql_misc.out	2026-05-29 04:20:11.431788728 +0000
@@ -194,7 +194,7 @@
 end;
 $$ language plpgsql;
 select * from test_order_by_all_return();
- a |  b  |  c
+ a |  b  |  c  
 ---+-----+-----
  1 | bar | 2.5
  1 | qux | 1.5
@@ -210,7 +210,7 @@
 end;
 $$ language plpgsql;
 select * from test_order_by_all_desc_return();
- a |  b  |  c
+ a |  b  |  c  
 ---+-----+-----
  3 | foo | 1.5
...

diff -U3 /tmp/cirrus-ci-build/src/pl/plpgsql/src/expected/plpgsql_misc.out /tmp/cirrus-ci-build/src/pl/plpgsql/src/resul...
--- /tmp/cirrus-ci-build/src/pl/plpgsql/src/expected/plpgsql_misc.out	2026-05-29 04:15:34.546408934 +0000
+++ /tmp/cirrus-ci-build/src/pl/plpgsql/src/results/plpgsql_misc.out	2026-05-29 04:19:37.441094521 +0000
@@ -194,7 +194,7 @@
 end;
 $$ language plpgsql;
 select * from test_order_by_all_return();
- a |  b  |  c
+ a |  b  |  c  
 ---+-----+-----
  1 | bar | 2.5
  1 | qux | 1.5
@@ -210,7 +210,7 @@
 end;
 $$ language plpgsql;
 select * from test_order_by_all_desc_return();
- a |  b  |  c
+ a |  b  |  c  
 ---+-----+-----
  3 | foo | 1.5
...

diff -U3 /tmp/cirrus-ci-build/src/pl/plpgsql/src/expected/plpgsql_misc.out /tmp/cirrus-ci-build/build/testrun/plpgsql/re...
--- /tmp/cirrus-ci-build/src/pl/plpgsql/src/expected/plpgsql_misc.out	2026-05-29 04:15:53.914402000 +0000
+++ /tmp/cirrus-ci-build/build/testrun/plpgsql/regress/results/plpgsql_misc.out	2026-05-29 04:20:10.074342000 +0000
@@ -194,7 +194,7 @@
 end;
 $$ language plpgsql;
 select * from test_order_by_all_return();
- a |  b  |  c
+ a |  b  |  c  
 ---+-----+-----
  1 | bar | 2.5
  1 | qux | 1.5
@@ -210,7 +210,7 @@
 end;
 $$ language plpgsql;
 select * from test_order_by_all_desc_return();
- a |  b  |  c
+ a |  b  |  c  
 ---+-----+-----
  3 | foo | 1.5
...

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/subselect.out /tmp/cirrus-ci-build/build-32/testrun/recovery/027...
--- /tmp/cirrus-ci-build/src/test/regress/expected/subselect.out	2026-05-29 02:03:12.216255323 +0000
+++ /tmp/cirrus-ci-build/build-32/testrun/recovery/027_stream_regress/data/results/subselect.out	2026-05-29 02:14:43.601...
@@ -2036,159 +2036,82 @@
 --
 BEGIN;
 CREATE TYPE t_rec AS (x numeric);
+ERROR:  type "t_rec" already exists
 CREATE TEMP TABLE pdt (id int, a t_rec);
+ERROR:  current transaction is aborted, commands ignored until end of transaction block
 INSERT INTO pdt VALUES
   (1, ROW(1.00)::t_rec),
   (2, ROW(1.0)::t_rec),
   (3, ROW(2)::t_rec);
+ERROR:  current transaction is aborted, commands ignored until end of transaction block
 -- DISTINCT ON: conflict, qual stays in outer query
 EXPLAIN (COSTS OFF)
 SELECT * FROM (SELECT DISTINCT ON (a) id, a FROM pdt ORDER BY a, id) s
 WHERE a *= ROW(1.0)::t_rec;
-              QUERY PLAN               
...

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/foreign_key.out /tmp/cirrus-ci-build/build/testrun/test_plan_adv...
--- /tmp/cirrus-ci-build/src/test/regress/expected/foreign_key.out	2026-05-27 14:46:57.030826226 +0000
+++ /tmp/cirrus-ci-build/build/testrun/test_plan_advice/001_replan_regress/data/results/foreign_key.out	2026-05-27 14:51...
@@ -262,3453 +262,7 @@
 
 -- Delete another row from PK TABLE
 DELETE FROM PKTABLE WHERE ptest1=5 and ptest2=10;
--- Check FKTABLE (should be no change)
-SELECT * FROM FKTABLE;
- ftest1 | ftest2 | ftest3 
---------+--------+--------
-      1 |      3 |      5
-      2 |      4 |      8
-      3 |      6 |     12
-        |        |      0
-     -1 |     -2 |      4
-(5 rows)
-
--- Update a row from PK TABLE
-UPDATE PKTABLE SET ptest1=1 WHERE ptest1=2;
...

diff --strip-trailing-cr -U3 C:/cirrus/src/test/regress/expected/foreign_key.out C:/cirrus/build/testrun/pg_upgrade/002_...
--- C:/cirrus/src/test/regress/expected/foreign_key.out	2026-05-27 14:47:38.829100200 +0000
+++ C:/cirrus/build/testrun/pg_upgrade/002_pg_upgrade/data/results/foreign_key.out	2026-05-27 14:52:55.150134200 +0000
@@ -1612,2103 +1612,7 @@
 update pp set f1=f1+1;
 insert into cc values(13);
 update pp set f1=f1+1;
-update pp set f1=f1+1; -- fail
-ERROR:  update or delete on table "pp" violates foreign key constraint "cc_f1_fkey" on table "cc"
-DETAIL:  Key (f1)=(13) is still referenced from table "cc".
-delete from pp where f1 = 13; -- fail
-ERROR:  update or delete on table "pp" violates foreign key constraint "cc_f1_fkey" on table "cc"
-DETAIL:  Key (f1)=(13) is still referenced from table "cc".
-drop table pp, cc;
-create temp table pp (f1 int primary key);
-create temp table cc (f1 int references pp on update restrict on delete restrict);
-insert into pp values(12);
-insert into pp values(11);
-update pp set f1=f1+1;
-insert into cc values(13);
...

diff --strip-trailing-cr -U3 C:/cirrus/src/test/regress/expected/graph_table.out C:/cirrus/build/testrun/regress/regress...
--- C:/cirrus/src/test/regress/expected/graph_table.out	2026-05-27 14:47:38.839785400 +0000
+++ C:/cirrus/build/testrun/regress/regress/results/graph_table.out	2026-05-27 14:52:53.775135400 +0000
@@ -890,158 +890,7 @@
 CREATE TABLE ptne1 PARTITION OF ptne FOR VALUES IN (1, 2);
 CREATE TABLE ptne2 PARTITION OF ptne FOR VALUES IN (3);
 INSERT INTO ptne VALUES (1, 1, 2, 100), (2, 2, 3, 200), (3, 3, 1, 300);
-CREATE PROPERTY GRAPH g4
-    VERTEX TABLES (ptnv)
-    EDGE TABLES (
-        ptne
-            SOURCE KEY (src) REFERENCES ptnv(id)
-            DESTINATION KEY (dest) REFERENCES ptnv(id)
-    );
-SELECT * FROM GRAPH_TABLE (g4 MATCH (s IS ptnv)-[e IS ptne]->(d IS ptnv) COLUMNS (s.val, e.val, d.val)) ORDER BY 1, 2, ...
- val | val | val 
------+-----+-----
-  10 | 100 |  20
-  20 | 200 |  30
-  30 | 300 |  10
...

diff -U3 /Users/admin/pgsql/src/test/modules/unsafe_tests/expected/guc_privs.out /Users/admin/pgsql/build/testrun/unsafe...
--- /Users/admin/pgsql/src/test/modules/unsafe_tests/expected/guc_privs.out	2026-05-27 00:15:32
+++ /Users/admin/pgsql/build/testrun/unsafe_tests/regress/results/guc_privs.out	2026-05-27 00:24:52
@@ -590,8 +590,7 @@
 -- Cannot set synchronized_standby_slots to an invalid slot name
 ALTER SYSTEM SET synchronized_standby_slots='invalid*';
 ERROR:  invalid value for parameter "synchronized_standby_slots": "invalid*"
-DETAIL:  replication slot name "invalid*" contains invalid character
-HINT:  Replication slot names may only contain lower case letters, numbers, and the underscore character.
+DETAIL:  syntax error at or near "*"
 -- Can set synchronized_standby_slots to a non-existent slot name
 ALTER SYSTEM SET synchronized_standby_slots='missing';
 -- Reset the GUC

diff --strip-trailing-cr -U3 C:/cirrus/src/test/modules/unsafe_tests/expected/guc_privs.out C:/cirrus/build/testrun/unsa...
--- C:/cirrus/src/test/modules/unsafe_tests/expected/guc_privs.out	2026-05-27 00:15:30.517309000 +0000
+++ C:/cirrus/build/testrun/unsafe_tests/regress/results/guc_privs.out	2026-05-27 00:25:56.348625600 +0000
@@ -590,8 +590,7 @@
 -- Cannot set synchronized_standby_slots to an invalid slot name
 ALTER SYSTEM SET synchronized_standby_slots='invalid*';
 ERROR:  invalid value for parameter "synchronized_standby_slots": "invalid*"
-DETAIL:  replication slot name "invalid*" contains invalid character
-HINT:  Replication slot names may only contain lower case letters, numbers, and the underscore character.
+DETAIL:  syntax error at or near "*"
 -- Can set synchronized_standby_slots to a non-existent slot name
 ALTER SYSTEM SET synchronized_standby_slots='missing';
 -- Reset the GUC

diff -U3 /tmp/cirrus-ci-build/src/test/modules/unsafe_tests/expected/guc_privs.out /tmp/cirrus-ci-build/build/testrun/un...
--- /tmp/cirrus-ci-build/src/test/modules/unsafe_tests/expected/guc_privs.out	2026-05-27 00:15:25.998199470 +0000
+++ /tmp/cirrus-ci-build/build/testrun/unsafe_tests/regress/results/guc_privs.out	2026-05-27 00:20:26.487047682 +0000
@@ -590,8 +590,7 @@
 -- Cannot set synchronized_standby_slots to an invalid slot name
 ALTER SYSTEM SET synchronized_standby_slots='invalid*';
 ERROR:  invalid value for parameter "synchronized_standby_slots": "invalid*"
-DETAIL:  replication slot name "invalid*" contains invalid character
-HINT:  Replication slot names may only contain lower case letters, numbers, and the underscore character.
+DETAIL:  syntax error at or near "*"
 -- Can set synchronized_standby_slots to a non-existent slot name
 ALTER SYSTEM SET synchronized_standby_slots='missing';
 -- Reset the GUC

diff -U3 /tmp/cirrus-ci-build/src/test/modules/unsafe_tests/expected/guc_privs.out /tmp/cirrus-ci-build/src/test/modules...
--- /tmp/cirrus-ci-build/src/test/modules/unsafe_tests/expected/guc_privs.out	2026-05-27 00:15:22.627725212 +0000
+++ /tmp/cirrus-ci-build/src/test/modules/unsafe_tests/results/guc_privs.out	2026-05-27 00:23:37.973482744 +0000
@@ -590,8 +590,7 @@
 -- Cannot set synchronized_standby_slots to an invalid slot name
 ALTER SYSTEM SET synchronized_standby_slots='invalid*';
 ERROR:  invalid value for parameter "synchronized_standby_slots": "invalid*"
-DETAIL:  replication slot name "invalid*" contains invalid character
-HINT:  Replication slot names may only contain lower case letters, numbers, and the underscore character.
+DETAIL:  syntax error at or near "*"
 -- Can set synchronized_standby_slots to a non-existent slot name
 ALTER SYSTEM SET synchronized_standby_slots='missing';
 -- Reset the GUC

diff -U3 /home/postgres/postgres/src/test/modules/unsafe_tests/expected/guc_privs.out /home/postgres/postgres/build/test...
--- /home/postgres/postgres/src/test/modules/unsafe_tests/expected/guc_privs.out	2026-05-27 00:15:41.356344741 +0000
+++ /home/postgres/postgres/build/testrun/unsafe_tests/regress/results/guc_privs.out	2026-05-27 00:18:54.127869599 +0000
@@ -590,8 +590,7 @@
 -- Cannot set synchronized_standby_slots to an invalid slot name
 ALTER SYSTEM SET synchronized_standby_slots='invalid*';
 ERROR:  invalid value for parameter "synchronized_standby_slots": "invalid*"
-DETAIL:  replication slot name "invalid*" contains invalid character
-HINT:  Replication slot names may only contain lower case letters, numbers, and the underscore character.
+DETAIL:  syntax error at or near "*"
 -- Can set synchronized_standby_slots to a non-existent slot name
 ALTER SYSTEM SET synchronized_standby_slots='missing';
 -- Reset the GUC

diff -U3 /tmp/cirrus-ci-build/src/test/modules/unsafe_tests/expected/guc_privs.out /tmp/cirrus-ci-build/build/testrun/un...
--- /tmp/cirrus-ci-build/src/test/modules/unsafe_tests/expected/guc_privs.out	2026-05-27 00:15:25.693159000 +0000
+++ /tmp/cirrus-ci-build/build/testrun/unsafe_tests/regress/results/guc_privs.out	2026-05-27 00:20:23.726020000 +0000
@@ -590,8 +590,7 @@
 -- Cannot set synchronized_standby_slots to an invalid slot name
 ALTER SYSTEM SET synchronized_standby_slots='invalid*';
 ERROR:  invalid value for parameter "synchronized_standby_slots": "invalid*"
-DETAIL:  replication slot name "invalid*" contains invalid character
-HINT:  Replication slot names may only contain lower case letters, numbers, and the underscore character.
+DETAIL:  syntax error at or near "*"
 -- Can set synchronized_standby_slots to a non-existent slot name
 ALTER SYSTEM SET synchronized_standby_slots='missing';
 -- Reset the GUC

diff -U3 /Users/admin/pgsql/src/test/regress/expected/rules.out /Users/admin/pgsql/build/testrun/pg_upgrade/002_pg_upgra...
--- /Users/admin/pgsql/src/test/regress/expected/rules.out	2026-05-25 19:25:24
+++ /Users/admin/pgsql/build/testrun/pg_upgrade/002_pg_upgrade/data/results/rules.out	2026-05-25 19:32:01
@@ -1889,6 +1889,9 @@
     pg_stat_get_checkpointer_sync_time() AS sync_time,
     pg_stat_get_checkpointer_buffers_written() AS buffers_written,
     pg_stat_get_checkpointer_slru_written() AS slru_written,
+    pg_stat_get_checkpointer_segs_added() AS segs_added,
+    pg_stat_get_checkpointer_segs_removed() AS segs_removed,
+    pg_stat_get_checkpointer_segs_recycled() AS segs_recycled,
     pg_stat_get_checkpointer_stat_reset_time() AS stats_reset;
 pg_stat_database| SELECT oid AS datid,
     datname,

diff -U3 /Users/admin/pgsql/src/test/regress/expected/rules.out /Users/admin/pgsql/build/testrun/recovery/027_stream_reg...
--- /Users/admin/pgsql/src/test/regress/expected/rules.out	2026-05-25 19:25:24
+++ /Users/admin/pgsql/build/testrun/recovery/027_stream_regress/data/results/rules.out	2026-05-25 19:33:47
@@ -1889,6 +1889,9 @@
     pg_stat_get_checkpointer_sync_time() AS sync_time,
     pg_stat_get_checkpointer_buffers_written() AS buffers_written,
     pg_stat_get_checkpointer_slru_written() AS slru_written,
+    pg_stat_get_checkpointer_segs_added() AS segs_added,
+    pg_stat_get_checkpointer_segs_removed() AS segs_removed,
+    pg_stat_get_checkpointer_segs_recycled() AS segs_recycled,
     pg_stat_get_checkpointer_stat_reset_time() AS stats_reset;
 pg_stat_database| SELECT oid AS datid,
     datname,

diff -U3 /Users/admin/pgsql/src/test/regress/expected/rules.out /Users/admin/pgsql/build/testrun/regress/regress/results...
--- /Users/admin/pgsql/src/test/regress/expected/rules.out	2026-05-25 19:25:24
+++ /Users/admin/pgsql/build/testrun/regress/regress/results/rules.out	2026-05-25 19:31:58
@@ -1889,6 +1889,9 @@
     pg_stat_get_checkpointer_sync_time() AS sync_time,
     pg_stat_get_checkpointer_buffers_written() AS buffers_written,
     pg_stat_get_checkpointer_slru_written() AS slru_written,
+    pg_stat_get_checkpointer_segs_added() AS segs_added,
+    pg_stat_get_checkpointer_segs_removed() AS segs_removed,
+    pg_stat_get_checkpointer_segs_recycled() AS segs_recycled,
     pg_stat_get_checkpointer_stat_reset_time() AS stats_reset;
 pg_stat_database| SELECT oid AS datid,
     datname,

diff -U3 /Users/admin/pgsql/src/test/regress/expected/rules.out /Users/admin/pgsql/build/testrun/test_plan_advice/001_re...
--- /Users/admin/pgsql/src/test/regress/expected/rules.out	2026-05-25 19:25:24
+++ /Users/admin/pgsql/build/testrun/test_plan_advice/001_replan_regress/data/results/rules.out	2026-05-25 19:32:01
@@ -1889,6 +1889,9 @@
     pg_stat_get_checkpointer_sync_time() AS sync_time,
     pg_stat_get_checkpointer_buffers_written() AS buffers_written,
     pg_stat_get_checkpointer_slru_written() AS slru_written,
+    pg_stat_get_checkpointer_segs_added() AS segs_added,
+    pg_stat_get_checkpointer_segs_removed() AS segs_removed,
+    pg_stat_get_checkpointer_segs_recycled() AS segs_recycled,
     pg_stat_get_checkpointer_stat_reset_time() AS stats_reset;
 pg_stat_database| SELECT oid AS datid,
     datname,

diff --strip-trailing-cr -U3 C:/cirrus/src/test/regress/expected/rules.out C:/cirrus/build/testrun/pg_upgrade/002_pg_upg...
--- C:/cirrus/src/test/regress/expected/rules.out	2026-05-25 19:26:22.567120700 +0000
+++ C:/cirrus/build/testrun/pg_upgrade/002_pg_upgrade/data/results/rules.out	2026-05-25 19:30:19.587412100 +0000
@@ -1889,6 +1889,9 @@
     pg_stat_get_checkpointer_sync_time() AS sync_time,
     pg_stat_get_checkpointer_buffers_written() AS buffers_written,
     pg_stat_get_checkpointer_slru_written() AS slru_written,
+    pg_stat_get_checkpointer_segs_added() AS segs_added,
+    pg_stat_get_checkpointer_segs_removed() AS segs_removed,
+    pg_stat_get_checkpointer_segs_recycled() AS segs_recycled,
     pg_stat_get_checkpointer_stat_reset_time() AS stats_reset;
 pg_stat_database| SELECT oid AS datid,
     datname,

diff --strip-trailing-cr -U3 C:/cirrus/src/test/regress/expected/rules.out C:/cirrus/build/testrun/recovery/027_stream_r...
--- C:/cirrus/src/test/regress/expected/rules.out	2026-05-25 19:26:22.567120700 +0000
+++ C:/cirrus/build/testrun/recovery/027_stream_regress/data/results/rules.out	2026-05-25 19:33:48.821293900 +0000
@@ -1889,6 +1889,9 @@
     pg_stat_get_checkpointer_sync_time() AS sync_time,
     pg_stat_get_checkpointer_buffers_written() AS buffers_written,
     pg_stat_get_checkpointer_slru_written() AS slru_written,
+    pg_stat_get_checkpointer_segs_added() AS segs_added,
+    pg_stat_get_checkpointer_segs_removed() AS segs_removed,
+    pg_stat_get_checkpointer_segs_recycled() AS segs_recycled,
     pg_stat_get_checkpointer_stat_reset_time() AS stats_reset;
 pg_stat_database| SELECT oid AS datid,
     datname,

diff --strip-trailing-cr -U3 C:/cirrus/src/test/regress/expected/rules.out C:/cirrus/build/testrun/regress/regress/resul...
--- C:/cirrus/src/test/regress/expected/rules.out	2026-05-25 19:26:22.567120700 +0000
+++ C:/cirrus/build/testrun/regress/regress/results/rules.out	2026-05-25 19:30:08.469247300 +0000
@@ -1889,6 +1889,9 @@
     pg_stat_get_checkpointer_sync_time() AS sync_time,
     pg_stat_get_checkpointer_buffers_written() AS buffers_written,
     pg_stat_get_checkpointer_slru_written() AS slru_written,
+    pg_stat_get_checkpointer_segs_added() AS segs_added,
+    pg_stat_get_checkpointer_segs_removed() AS segs_removed,
+    pg_stat_get_checkpointer_segs_recycled() AS segs_recycled,
     pg_stat_get_checkpointer_stat_reset_time() AS stats_reset;
 pg_stat_database| SELECT oid AS datid,
     datname,

diff --strip-trailing-cr -U3 C:/cirrus/src/test/regress/expected/rules.out C:/cirrus/build/testrun/test_plan_advice/001_...
--- C:/cirrus/src/test/regress/expected/rules.out	2026-05-25 19:26:22.567120700 +0000
+++ C:/cirrus/build/testrun/test_plan_advice/001_replan_regress/data/results/rules.out	2026-05-25 19:30:13.404303200 +00...
@@ -1889,6 +1889,9 @@
     pg_stat_get_checkpointer_sync_time() AS sync_time,
     pg_stat_get_checkpointer_buffers_written() AS buffers_written,
     pg_stat_get_checkpointer_slru_written() AS slru_written,
+    pg_stat_get_checkpointer_segs_added() AS segs_added,
+    pg_stat_get_checkpointer_segs_removed() AS segs_removed,
+    pg_stat_get_checkpointer_segs_recycled() AS segs_recycled,
     pg_stat_get_checkpointer_stat_reset_time() AS stats_reset;
 pg_stat_database| SELECT oid AS datid,
     datname,

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/rules.out /tmp/cirrus-ci-build/build/testrun/pg_upgrade/002_pg_u...
--- /tmp/cirrus-ci-build/src/test/regress/expected/rules.out	2026-05-25 19:25:12.260263912 +0000
+++ /tmp/cirrus-ci-build/build/testrun/pg_upgrade/002_pg_upgrade/data/results/rules.out	2026-05-25 19:30:16.857921530 +0...
@@ -1889,6 +1889,9 @@
     pg_stat_get_checkpointer_sync_time() AS sync_time,
     pg_stat_get_checkpointer_buffers_written() AS buffers_written,
     pg_stat_get_checkpointer_slru_written() AS slru_written,
+    pg_stat_get_checkpointer_segs_added() AS segs_added,
+    pg_stat_get_checkpointer_segs_removed() AS segs_removed,
+    pg_stat_get_checkpointer_segs_recycled() AS segs_recycled,
     pg_stat_get_checkpointer_stat_reset_time() AS stats_reset;
 pg_stat_database| SELECT oid AS datid,
     datname,

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/rules.out /tmp/cirrus-ci-build/build/testrun/recovery/027_stream...
--- /tmp/cirrus-ci-build/src/test/regress/expected/rules.out	2026-05-25 19:25:12.260263912 +0000
+++ /tmp/cirrus-ci-build/build/testrun/recovery/027_stream_regress/data/results/rules.out	2026-05-25 19:31:49.478009585 ...
@@ -1889,6 +1889,9 @@
     pg_stat_get_checkpointer_sync_time() AS sync_time,
     pg_stat_get_checkpointer_buffers_written() AS buffers_written,
     pg_stat_get_checkpointer_slru_written() AS slru_written,
+    pg_stat_get_checkpointer_segs_added() AS segs_added,
+    pg_stat_get_checkpointer_segs_removed() AS segs_removed,
+    pg_stat_get_checkpointer_segs_recycled() AS segs_recycled,
     pg_stat_get_checkpointer_stat_reset_time() AS stats_reset;
 pg_stat_database| SELECT oid AS datid,
     datname,

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/rules.out /tmp/cirrus-ci-build/build/testrun/regress/regress/res...
--- /tmp/cirrus-ci-build/src/test/regress/expected/rules.out	2026-05-25 19:25:12.260263912 +0000
+++ /tmp/cirrus-ci-build/build/testrun/regress/regress/results/rules.out	2026-05-25 19:30:17.593922505 +0000
@@ -1889,6 +1889,9 @@
     pg_stat_get_checkpointer_sync_time() AS sync_time,
     pg_stat_get_checkpointer_buffers_written() AS buffers_written,
     pg_stat_get_checkpointer_slru_written() AS slru_written,
+    pg_stat_get_checkpointer_segs_added() AS segs_added,
+    pg_stat_get_checkpointer_segs_removed() AS segs_removed,
+    pg_stat_get_checkpointer_segs_recycled() AS segs_recycled,
     pg_stat_get_checkpointer_stat_reset_time() AS stats_reset;
 pg_stat_database| SELECT oid AS datid,
     datname,

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/rules.out /tmp/cirrus-ci-build/build/testrun/test_plan_advice/00...
--- /tmp/cirrus-ci-build/src/test/regress/expected/rules.out	2026-05-25 19:25:12.260263912 +0000
+++ /tmp/cirrus-ci-build/build/testrun/test_plan_advice/001_replan_regress/data/results/rules.out	2026-05-25 19:30:19.55...
@@ -1889,6 +1889,9 @@
     pg_stat_get_checkpointer_sync_time() AS sync_time,
     pg_stat_get_checkpointer_buffers_written() AS buffers_written,
     pg_stat_get_checkpointer_slru_written() AS slru_written,
+    pg_stat_get_checkpointer_segs_added() AS segs_added,
+    pg_stat_get_checkpointer_segs_removed() AS segs_removed,
+    pg_stat_get_checkpointer_segs_recycled() AS segs_recycled,
     pg_stat_get_checkpointer_stat_reset_time() AS stats_reset;
 pg_stat_database| SELECT oid AS datid,
     datname,

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/rules.out /tmp/cirrus-ci-build/build/testrun/pg_upgrade/002_pg_u...
--- /tmp/cirrus-ci-build/src/test/regress/expected/rules.out	2026-05-25 19:25:10.250268000 +0000
+++ /tmp/cirrus-ci-build/build/testrun/pg_upgrade/002_pg_upgrade/data/results/rules.out	2026-05-25 19:29:10.030700000 +0...
@@ -1889,6 +1889,9 @@
     pg_stat_get_checkpointer_sync_time() AS sync_time,
     pg_stat_get_checkpointer_buffers_written() AS buffers_written,
     pg_stat_get_checkpointer_slru_written() AS slru_written,
+    pg_stat_get_checkpointer_segs_added() AS segs_added,
+    pg_stat_get_checkpointer_segs_removed() AS segs_removed,
+    pg_stat_get_checkpointer_segs_recycled() AS segs_recycled,
     pg_stat_get_checkpointer_stat_reset_time() AS stats_reset;
 pg_stat_database| SELECT oid AS datid,
     datname,

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/rules.out /tmp/cirrus-ci-build/build/testrun/recovery/027_stream...
--- /tmp/cirrus-ci-build/src/test/regress/expected/rules.out	2026-05-25 19:25:10.250268000 +0000
+++ /tmp/cirrus-ci-build/build/testrun/recovery/027_stream_regress/data/results/rules.out	2026-05-25 19:30:43.078920000 ...
@@ -1889,6 +1889,9 @@
     pg_stat_get_checkpointer_sync_time() AS sync_time,
     pg_stat_get_checkpointer_buffers_written() AS buffers_written,
     pg_stat_get_checkpointer_slru_written() AS slru_written,
+    pg_stat_get_checkpointer_segs_added() AS segs_added,
+    pg_stat_get_checkpointer_segs_removed() AS segs_removed,
+    pg_stat_get_checkpointer_segs_recycled() AS segs_recycled,
     pg_stat_get_checkpointer_stat_reset_time() AS stats_reset;
 pg_stat_database| SELECT oid AS datid,
     datname,

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/rules.out /tmp/cirrus-ci-build/build/testrun/regress/regress/res...
--- /tmp/cirrus-ci-build/src/test/regress/expected/rules.out	2026-05-25 19:25:10.250268000 +0000
+++ /tmp/cirrus-ci-build/build/testrun/regress/regress/results/rules.out	2026-05-25 19:29:09.928914000 +0000
@@ -1889,6 +1889,9 @@
     pg_stat_get_checkpointer_sync_time() AS sync_time,
     pg_stat_get_checkpointer_buffers_written() AS buffers_written,
     pg_stat_get_checkpointer_slru_written() AS slru_written,
+    pg_stat_get_checkpointer_segs_added() AS segs_added,
+    pg_stat_get_checkpointer_segs_removed() AS segs_removed,
+    pg_stat_get_checkpointer_segs_recycled() AS segs_recycled,
     pg_stat_get_checkpointer_stat_reset_time() AS stats_reset;
 pg_stat_database| SELECT oid AS datid,
     datname,

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/rules.out /tmp/cirrus-ci-build/build/testrun/test_plan_advice/00...
--- /tmp/cirrus-ci-build/src/test/regress/expected/rules.out	2026-05-25 19:25:10.250268000 +0000
+++ /tmp/cirrus-ci-build/build/testrun/test_plan_advice/001_replan_regress/data/results/rules.out	2026-05-25 19:29:09.87...
@@ -1889,6 +1889,9 @@
     pg_stat_get_checkpointer_sync_time() AS sync_time,
     pg_stat_get_checkpointer_buffers_written() AS buffers_written,
     pg_stat_get_checkpointer_slru_written() AS slru_written,
+    pg_stat_get_checkpointer_segs_added() AS segs_added,
+    pg_stat_get_checkpointer_segs_removed() AS segs_removed,
+    pg_stat_get_checkpointer_segs_recycled() AS segs_recycled,
     pg_stat_get_checkpointer_stat_reset_time() AS stats_reset;
 pg_stat_database| SELECT oid AS datid,
     datname,

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/rules.out /tmp/cirrus-ci-build/src/bin/pg_upgrade/tmp_check/resu...
--- /tmp/cirrus-ci-build/src/test/regress/expected/rules.out	2026-05-25 19:25:13.920292372 +0000
+++ /tmp/cirrus-ci-build/src/bin/pg_upgrade/tmp_check/results/rules.out	2026-05-25 19:33:30.446858193 +0000
@@ -1889,6 +1889,9 @@
     pg_stat_get_checkpointer_sync_time() AS sync_time,
     pg_stat_get_checkpointer_buffers_written() AS buffers_written,
     pg_stat_get_checkpointer_slru_written() AS slru_written,
+    pg_stat_get_checkpointer_segs_added() AS segs_added,
+    pg_stat_get_checkpointer_segs_removed() AS segs_removed,
+    pg_stat_get_checkpointer_segs_recycled() AS segs_recycled,
     pg_stat_get_checkpointer_stat_reset_time() AS stats_reset;
 pg_stat_database| SELECT oid AS datid,
     datname,

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/rules.out /tmp/cirrus-ci-build/src/test/modules/test_plan_advice...
--- /tmp/cirrus-ci-build/src/test/regress/expected/rules.out	2026-05-25 19:25:13.920292372 +0000
+++ /tmp/cirrus-ci-build/src/test/modules/test_plan_advice/tmp_check/results/rules.out	2026-05-25 19:35:36.799282777 +00...
@@ -1889,6 +1889,9 @@
     pg_stat_get_checkpointer_sync_time() AS sync_time,
     pg_stat_get_checkpointer_buffers_written() AS buffers_written,
     pg_stat_get_checkpointer_slru_written() AS slru_written,
+    pg_stat_get_checkpointer_segs_added() AS segs_added,
+    pg_stat_get_checkpointer_segs_removed() AS segs_removed,
+    pg_stat_get_checkpointer_segs_recycled() AS segs_recycled,
     pg_stat_get_checkpointer_stat_reset_time() AS stats_reset;
 pg_stat_database| SELECT oid AS datid,
     datname,

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/rules.out /tmp/cirrus-ci-build/src/test/recovery/tmp_check/resul...
--- /tmp/cirrus-ci-build/src/test/regress/expected/rules.out	2026-05-25 19:25:13.920292372 +0000
+++ /tmp/cirrus-ci-build/src/test/recovery/tmp_check/results/rules.out	2026-05-25 19:35:34.723276952 +0000
@@ -1889,6 +1889,9 @@
     pg_stat_get_checkpointer_sync_time() AS sync_time,
     pg_stat_get_checkpointer_buffers_written() AS buffers_written,
     pg_stat_get_checkpointer_slru_written() AS slru_written,
+    pg_stat_get_checkpointer_segs_added() AS segs_added,
+    pg_stat_get_checkpointer_segs_removed() AS segs_removed,
+    pg_stat_get_checkpointer_segs_recycled() AS segs_recycled,
     pg_stat_get_checkpointer_stat_reset_time() AS stats_reset;
 pg_stat_database| SELECT oid AS datid,
     datname,

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/rules.out /tmp/cirrus-ci-build/src/test/regress/results/rules.ou...
--- /tmp/cirrus-ci-build/src/test/regress/expected/rules.out	2026-05-25 19:25:13.920292372 +0000
+++ /tmp/cirrus-ci-build/src/test/regress/results/rules.out	2026-05-25 19:31:27.542170594 +0000
@@ -1889,6 +1889,9 @@
     pg_stat_get_checkpointer_sync_time() AS sync_time,
     pg_stat_get_checkpointer_buffers_written() AS buffers_written,
     pg_stat_get_checkpointer_slru_written() AS slru_written,
+    pg_stat_get_checkpointer_segs_added() AS segs_added,
+    pg_stat_get_checkpointer_segs_removed() AS segs_removed,
+    pg_stat_get_checkpointer_segs_recycled() AS segs_recycled,
     pg_stat_get_checkpointer_stat_reset_time() AS stats_reset;
 pg_stat_database| SELECT oid AS datid,
     datname,

diff -U3 /home/postgres/postgres/src/test/regress/expected/rules.out /home/postgres/postgres/build/testrun/pg_upgrade/00...
--- /home/postgres/postgres/src/test/regress/expected/rules.out	2026-05-25 19:25:59.945520780 +0000
+++ /home/postgres/postgres/build/testrun/pg_upgrade/002_pg_upgrade/data/results/rules.out	2026-05-25 19:29:16.327871888...
@@ -1889,6 +1889,9 @@
     pg_stat_get_checkpointer_sync_time() AS sync_time,
     pg_stat_get_checkpointer_buffers_written() AS buffers_written,
     pg_stat_get_checkpointer_slru_written() AS slru_written,
+    pg_stat_get_checkpointer_segs_added() AS segs_added,
+    pg_stat_get_checkpointer_segs_removed() AS segs_removed,
+    pg_stat_get_checkpointer_segs_recycled() AS segs_recycled,
     pg_stat_get_checkpointer_stat_reset_time() AS stats_reset;
 pg_stat_database| SELECT oid AS datid,
     datname,

diff -U3 /home/postgres/postgres/src/test/regress/expected/rules.out /home/postgres/postgres/build/testrun/recovery/027_...
--- /home/postgres/postgres/src/test/regress/expected/rules.out	2026-05-25 19:25:59.945520780 +0000
+++ /home/postgres/postgres/build/testrun/recovery/027_stream_regress/data/results/rules.out	2026-05-25 19:30:07.8442491...
@@ -1889,6 +1889,9 @@
     pg_stat_get_checkpointer_sync_time() AS sync_time,
     pg_stat_get_checkpointer_buffers_written() AS buffers_written,
     pg_stat_get_checkpointer_slru_written() AS slru_written,
+    pg_stat_get_checkpointer_segs_added() AS segs_added,
+    pg_stat_get_checkpointer_segs_removed() AS segs_removed,
+    pg_stat_get_checkpointer_segs_recycled() AS segs_recycled,
     pg_stat_get_checkpointer_stat_reset_time() AS stats_reset;
 pg_stat_database| SELECT oid AS datid,
     datname,

diff -U3 /home/postgres/postgres/src/test/regress/expected/rules.out /home/postgres/postgres/build/testrun/regress/regre...
--- /home/postgres/postgres/src/test/regress/expected/rules.out	2026-05-25 19:25:59.945520780 +0000
+++ /home/postgres/postgres/build/testrun/regress/regress/results/rules.out	2026-05-25 19:29:15.862858321 +0000
@@ -1889,6 +1889,9 @@
     pg_stat_get_checkpointer_sync_time() AS sync_time,
     pg_stat_get_checkpointer_buffers_written() AS buffers_written,
     pg_stat_get_checkpointer_slru_written() AS slru_written,
+    pg_stat_get_checkpointer_segs_added() AS segs_added,
+    pg_stat_get_checkpointer_segs_removed() AS segs_removed,
+    pg_stat_get_checkpointer_segs_recycled() AS segs_recycled,
     pg_stat_get_checkpointer_stat_reset_time() AS stats_reset;
 pg_stat_database| SELECT oid AS datid,
     datname,

diff -U3 /home/postgres/postgres/src/test/regress/expected/rules.out /home/postgres/postgres/build/testrun/test_plan_adv...
--- /home/postgres/postgres/src/test/regress/expected/rules.out	2026-05-25 19:25:59.945520780 +0000
+++ /home/postgres/postgres/build/testrun/test_plan_advice/001_replan_regress/data/results/rules.out	2026-05-25 19:29:20...
@@ -1889,6 +1889,9 @@
     pg_stat_get_checkpointer_sync_time() AS sync_time,
     pg_stat_get_checkpointer_buffers_written() AS buffers_written,
     pg_stat_get_checkpointer_slru_written() AS slru_written,
+    pg_stat_get_checkpointer_segs_added() AS segs_added,
+    pg_stat_get_checkpointer_segs_removed() AS segs_removed,
+    pg_stat_get_checkpointer_segs_recycled() AS segs_recycled,
     pg_stat_get_checkpointer_stat_reset_time() AS stats_reset;
 pg_stat_database| SELECT oid AS datid,
     datname,

diff --strip-trailing-cr -U3 C:/cirrus/src/test/regress/expected/indexing.out C:/cirrus/build/testrun/pg_upgrade/002_pg_...
--- C:/cirrus/src/test/regress/expected/indexing.out	2026-05-24 11:01:18.279820400 +0000
+++ C:/cirrus/build/testrun/pg_upgrade/002_pg_upgrade/data/results/indexing.out	2026-05-24 11:06:34.633954600 +0000
@@ -559,13 +559,14 @@
 ERROR:  division by zero
 select relname, indisvalid from pg_class join pg_index on indexrelid = oid
    where relname like 'idxpart%' order by relname;
-      relname       | indisvalid 
---------------------+------------
- idxpart11_expr_idx | f
- idxpart1_expr_idx  | f
- idxpart2_expr_idx  | t
- idxpart_expr_idx   | f
-(4 rows)
+         relname          | indisvalid 
+--------------------------+------------
+ idxpart11_expr_idx       | f
+ idxpart11_expr_idx_ccaux | f
+ idxpart1_expr_idx        | f
+ idxpart2_expr_idx        | t
...

diff --strip-trailing-cr -U3 C:/cirrus/src/test/regress/expected/indexing.out C:/cirrus/build/testrun/recovery/027_strea...
--- C:/cirrus/src/test/regress/expected/indexing.out	2026-05-24 11:01:18.279820400 +0000
+++ C:/cirrus/build/testrun/recovery/027_stream_regress/data/results/indexing.out	2026-05-24 11:09:50.552407900 +0000
@@ -559,13 +559,14 @@
 ERROR:  division by zero
 select relname, indisvalid from pg_class join pg_index on indexrelid = oid
    where relname like 'idxpart%' order by relname;
-      relname       | indisvalid 
---------------------+------------
- idxpart11_expr_idx | f
- idxpart1_expr_idx  | f
- idxpart2_expr_idx  | t
- idxpart_expr_idx   | f
-(4 rows)
+         relname          | indisvalid 
+--------------------------+------------
+ idxpart11_expr_idx       | f
+ idxpart11_expr_idx_ccaux | f
+ idxpart1_expr_idx        | f
+ idxpart2_expr_idx        | t
...

diff --strip-trailing-cr -U3 C:/cirrus/src/test/regress/expected/indexing.out C:/cirrus/build/testrun/regress/regress/re...
--- C:/cirrus/src/test/regress/expected/indexing.out	2026-05-24 11:01:18.279820400 +0000
+++ C:/cirrus/build/testrun/regress/regress/results/indexing.out	2026-05-24 11:06:06.139822200 +0000
@@ -559,13 +559,14 @@
 ERROR:  division by zero
 select relname, indisvalid from pg_class join pg_index on indexrelid = oid
    where relname like 'idxpart%' order by relname;
-      relname       | indisvalid 
---------------------+------------
- idxpart11_expr_idx | f
- idxpart1_expr_idx  | f
- idxpart2_expr_idx  | t
- idxpart_expr_idx   | f
-(4 rows)
+         relname          | indisvalid 
+--------------------------+------------
+ idxpart11_expr_idx       | f
+ idxpart11_expr_idx_ccaux | f
+ idxpart1_expr_idx        | f
+ idxpart2_expr_idx        | t
...

diff --strip-trailing-cr -U3 C:/cirrus/src/test/regress/expected/indexing.out C:/cirrus/build/testrun/test_plan_advice/0...
--- C:/cirrus/src/test/regress/expected/indexing.out	2026-05-24 11:01:18.279820400 +0000
+++ C:/cirrus/build/testrun/test_plan_advice/001_replan_regress/data/results/indexing.out	2026-05-24 11:06:28.167646100 ...
@@ -559,13 +559,14 @@
 ERROR:  division by zero
 select relname, indisvalid from pg_class join pg_index on indexrelid = oid
    where relname like 'idxpart%' order by relname;
-      relname       | indisvalid 
---------------------+------------
- idxpart11_expr_idx | f
- idxpart1_expr_idx  | f
- idxpart2_expr_idx  | t
- idxpart_expr_idx   | f
-(4 rows)
+         relname          | indisvalid 
+--------------------------+------------
+ idxpart11_expr_idx       | f
+ idxpart11_expr_idx_ccaux | f
+ idxpart1_expr_idx        | f
+ idxpart2_expr_idx        | t
...

diff -U3 /Users/admin/pgsql/src/test/regress/expected/indexing.out /Users/admin/pgsql/build/testrun/pg_upgrade/002_pg_up...
--- /Users/admin/pgsql/src/test/regress/expected/indexing.out	2026-05-24 11:01:13
+++ /Users/admin/pgsql/build/testrun/pg_upgrade/002_pg_upgrade/data/results/indexing.out	2026-05-24 11:06:47
@@ -559,13 +559,14 @@
 ERROR:  division by zero
 select relname, indisvalid from pg_class join pg_index on indexrelid = oid
    where relname like 'idxpart%' order by relname;
-      relname       | indisvalid 
---------------------+------------
- idxpart11_expr_idx | f
- idxpart1_expr_idx  | f
- idxpart2_expr_idx  | t
- idxpart_expr_idx   | f
-(4 rows)
+         relname          | indisvalid 
+--------------------------+------------
+ idxpart11_expr_idx       | f
+ idxpart11_expr_idx_ccaux | f
+ idxpart1_expr_idx        | f
+ idxpart2_expr_idx        | t
...

diff -U3 /Users/admin/pgsql/src/test/regress/expected/indexing.out /Users/admin/pgsql/build/testrun/recovery/027_stream_...
--- /Users/admin/pgsql/src/test/regress/expected/indexing.out	2026-05-24 11:01:13
+++ /Users/admin/pgsql/build/testrun/recovery/027_stream_regress/data/results/indexing.out	2026-05-24 11:09:06
@@ -559,13 +559,14 @@
 ERROR:  division by zero
 select relname, indisvalid from pg_class join pg_index on indexrelid = oid
    where relname like 'idxpart%' order by relname;
-      relname       | indisvalid 
---------------------+------------
- idxpart11_expr_idx | f
- idxpart1_expr_idx  | f
- idxpart2_expr_idx  | t
- idxpart_expr_idx   | f
-(4 rows)
+         relname          | indisvalid 
+--------------------------+------------
+ idxpart11_expr_idx       | f
+ idxpart11_expr_idx_ccaux | f
+ idxpart1_expr_idx        | f
+ idxpart2_expr_idx        | t
...

diff -U3 /Users/admin/pgsql/src/test/regress/expected/indexing.out /Users/admin/pgsql/build/testrun/regress/regress/resu...
--- /Users/admin/pgsql/src/test/regress/expected/indexing.out	2026-05-24 11:01:13
+++ /Users/admin/pgsql/build/testrun/regress/regress/results/indexing.out	2026-05-24 11:06:47
@@ -559,13 +559,14 @@
 ERROR:  division by zero
 select relname, indisvalid from pg_class join pg_index on indexrelid = oid
    where relname like 'idxpart%' order by relname;
-      relname       | indisvalid 
---------------------+------------
- idxpart11_expr_idx | f
- idxpart1_expr_idx  | f
- idxpart2_expr_idx  | t
- idxpart_expr_idx   | f
-(4 rows)
+         relname          | indisvalid 
+--------------------------+------------
+ idxpart11_expr_idx       | f
+ idxpart11_expr_idx_ccaux | f
+ idxpart1_expr_idx        | f
+ idxpart2_expr_idx        | t
...

diff -U3 /Users/admin/pgsql/src/test/regress/expected/indexing.out /Users/admin/pgsql/build/testrun/test_plan_advice/001...
--- /Users/admin/pgsql/src/test/regress/expected/indexing.out	2026-05-24 11:01:13
+++ /Users/admin/pgsql/build/testrun/test_plan_advice/001_replan_regress/data/results/indexing.out	2026-05-24 11:06:49
@@ -559,13 +559,14 @@
 ERROR:  division by zero
 select relname, indisvalid from pg_class join pg_index on indexrelid = oid
    where relname like 'idxpart%' order by relname;
-      relname       | indisvalid 
---------------------+------------
- idxpart11_expr_idx | f
- idxpart1_expr_idx  | f
- idxpart2_expr_idx  | t
- idxpart_expr_idx   | f
-(4 rows)
+         relname          | indisvalid 
+--------------------------+------------
+ idxpart11_expr_idx       | f
+ idxpart11_expr_idx_ccaux | f
+ idxpart1_expr_idx        | f
+ idxpart2_expr_idx        | t
...

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/indexing.out /tmp/cirrus-ci-build/build/testrun/pg_upgrade/002_p...
--- /tmp/cirrus-ci-build/src/test/regress/expected/indexing.out	2026-05-24 11:01:14.759560371 +0000
+++ /tmp/cirrus-ci-build/build/testrun/pg_upgrade/002_pg_upgrade/data/results/indexing.out	2026-05-24 11:06:58.310831594...
@@ -559,13 +559,14 @@
 ERROR:  division by zero
 select relname, indisvalid from pg_class join pg_index on indexrelid = oid
    where relname like 'idxpart%' order by relname;
-      relname       | indisvalid 
---------------------+------------
- idxpart11_expr_idx | f
- idxpart1_expr_idx  | f
- idxpart2_expr_idx  | t
- idxpart_expr_idx   | f
-(4 rows)
+         relname          | indisvalid 
+--------------------------+------------
+ idxpart11_expr_idx       | f
+ idxpart11_expr_idx_ccaux | f
+ idxpart1_expr_idx        | f
+ idxpart2_expr_idx        | t
...

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/indexing.out /tmp/cirrus-ci-build/build/testrun/recovery/027_str...
--- /tmp/cirrus-ci-build/src/test/regress/expected/indexing.out	2026-05-24 11:01:14.759560371 +0000
+++ /tmp/cirrus-ci-build/build/testrun/recovery/027_stream_regress/data/results/indexing.out	2026-05-24 11:08:39.3547629...
@@ -559,13 +559,14 @@
 ERROR:  division by zero
 select relname, indisvalid from pg_class join pg_index on indexrelid = oid
    where relname like 'idxpart%' order by relname;
-      relname       | indisvalid 
---------------------+------------
- idxpart11_expr_idx | f
- idxpart1_expr_idx  | f
- idxpart2_expr_idx  | t
- idxpart_expr_idx   | f
-(4 rows)
+         relname          | indisvalid 
+--------------------------+------------
+ idxpart11_expr_idx       | f
+ idxpart11_expr_idx_ccaux | f
+ idxpart1_expr_idx        | f
+ idxpart2_expr_idx        | t
...

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/indexing.out /tmp/cirrus-ci-build/build/testrun/regress/regress/...
--- /tmp/cirrus-ci-build/src/test/regress/expected/indexing.out	2026-05-24 11:01:14.759560371 +0000
+++ /tmp/cirrus-ci-build/build/testrun/regress/regress/results/indexing.out	2026-05-24 11:06:58.038831805 +0000
@@ -559,13 +559,14 @@
 ERROR:  division by zero
 select relname, indisvalid from pg_class join pg_index on indexrelid = oid
    where relname like 'idxpart%' order by relname;
-      relname       | indisvalid 
---------------------+------------
- idxpart11_expr_idx | f
- idxpart1_expr_idx  | f
- idxpart2_expr_idx  | t
- idxpart_expr_idx   | f
-(4 rows)
+         relname          | indisvalid 
+--------------------------+------------
+ idxpart11_expr_idx       | f
+ idxpart11_expr_idx_ccaux | f
+ idxpart1_expr_idx        | f
+ idxpart2_expr_idx        | t
...

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/indexing.out /tmp/cirrus-ci-build/build/testrun/test_plan_advice...
--- /tmp/cirrus-ci-build/src/test/regress/expected/indexing.out	2026-05-24 11:01:14.759560371 +0000
+++ /tmp/cirrus-ci-build/build/testrun/test_plan_advice/001_replan_regress/data/results/indexing.out	2026-05-24 11:07:06...
@@ -559,13 +559,14 @@
 ERROR:  division by zero
 select relname, indisvalid from pg_class join pg_index on indexrelid = oid
    where relname like 'idxpart%' order by relname;
-      relname       | indisvalid 
---------------------+------------
- idxpart11_expr_idx | f
- idxpart1_expr_idx  | f
- idxpart2_expr_idx  | t
- idxpart_expr_idx   | f
-(4 rows)
+         relname          | indisvalid 
+--------------------------+------------
+ idxpart11_expr_idx       | f
+ idxpart11_expr_idx_ccaux | f
+ idxpart1_expr_idx        | f
+ idxpart2_expr_idx        | t
...

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/indexing.out /tmp/cirrus-ci-build/build/testrun/pg_upgrade/002_p...
--- /tmp/cirrus-ci-build/src/test/regress/expected/indexing.out	2026-05-24 11:01:14.631983000 +0000
+++ /tmp/cirrus-ci-build/build/testrun/pg_upgrade/002_pg_upgrade/data/results/indexing.out	2026-05-24 11:06:50.781580000...
@@ -559,13 +559,14 @@
 ERROR:  division by zero
 select relname, indisvalid from pg_class join pg_index on indexrelid = oid
    where relname like 'idxpart%' order by relname;
-      relname       | indisvalid 
---------------------+------------
- idxpart11_expr_idx | f
- idxpart1_expr_idx  | f
- idxpart2_expr_idx  | t
- idxpart_expr_idx   | f
-(4 rows)
+         relname          | indisvalid 
+--------------------------+------------
+ idxpart11_expr_idx       | f
+ idxpart11_expr_idx_ccaux | f
+ idxpart1_expr_idx        | f
+ idxpart2_expr_idx        | t
...

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/indexing.out /tmp/cirrus-ci-build/build/testrun/recovery/027_str...
--- /tmp/cirrus-ci-build/src/test/regress/expected/indexing.out	2026-05-24 11:01:14.631983000 +0000
+++ /tmp/cirrus-ci-build/build/testrun/recovery/027_stream_regress/data/results/indexing.out	2026-05-24 11:08:41.6434830...
@@ -559,13 +559,14 @@
 ERROR:  division by zero
 select relname, indisvalid from pg_class join pg_index on indexrelid = oid
    where relname like 'idxpart%' order by relname;
-      relname       | indisvalid 
---------------------+------------
- idxpart11_expr_idx | f
- idxpart1_expr_idx  | f
- idxpart2_expr_idx  | t
- idxpart_expr_idx   | f
-(4 rows)
+         relname          | indisvalid 
+--------------------------+------------
+ idxpart11_expr_idx       | f
+ idxpart11_expr_idx_ccaux | f
+ idxpart1_expr_idx        | f
+ idxpart2_expr_idx        | t
...

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/indexing.out /tmp/cirrus-ci-build/build/testrun/regress/regress/...
--- /tmp/cirrus-ci-build/src/test/regress/expected/indexing.out	2026-05-24 11:01:14.631983000 +0000
+++ /tmp/cirrus-ci-build/build/testrun/regress/regress/results/indexing.out	2026-05-24 11:07:12.354098000 +0000
@@ -559,13 +559,14 @@
 ERROR:  division by zero
 select relname, indisvalid from pg_class join pg_index on indexrelid = oid
    where relname like 'idxpart%' order by relname;
-      relname       | indisvalid 
---------------------+------------
- idxpart11_expr_idx | f
- idxpart1_expr_idx  | f
- idxpart2_expr_idx  | t
- idxpart_expr_idx   | f
-(4 rows)
+         relname          | indisvalid 
+--------------------------+------------
+ idxpart11_expr_idx       | f
+ idxpart11_expr_idx_ccaux | f
+ idxpart1_expr_idx        | f
+ idxpart2_expr_idx        | t
...

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/indexing.out /tmp/cirrus-ci-build/build/testrun/test_plan_advice...
--- /tmp/cirrus-ci-build/src/test/regress/expected/indexing.out	2026-05-24 11:01:14.631983000 +0000
+++ /tmp/cirrus-ci-build/build/testrun/test_plan_advice/001_replan_regress/data/results/indexing.out	2026-05-24 11:07:22...
@@ -559,13 +559,14 @@
 ERROR:  division by zero
 select relname, indisvalid from pg_class join pg_index on indexrelid = oid
    where relname like 'idxpart%' order by relname;
-      relname       | indisvalid 
---------------------+------------
- idxpart11_expr_idx | f
- idxpart1_expr_idx  | f
- idxpart2_expr_idx  | t
- idxpart_expr_idx   | f
-(4 rows)
+         relname          | indisvalid 
+--------------------------+------------
+ idxpart11_expr_idx       | f
+ idxpart11_expr_idx_ccaux | f
+ idxpart1_expr_idx        | f
+ idxpart2_expr_idx        | t
...

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/indexing.out /tmp/cirrus-ci-build/src/bin/pg_upgrade/tmp_check/r...
--- /tmp/cirrus-ci-build/src/test/regress/expected/indexing.out	2026-05-24 11:01:22.352965665 +0000
+++ /tmp/cirrus-ci-build/src/bin/pg_upgrade/tmp_check/results/indexing.out	2026-05-24 11:09:48.709621941 +0000
@@ -559,13 +559,14 @@
 ERROR:  division by zero
 select relname, indisvalid from pg_class join pg_index on indexrelid = oid
    where relname like 'idxpart%' order by relname;
-      relname       | indisvalid 
---------------------+------------
- idxpart11_expr_idx | f
- idxpart1_expr_idx  | f
- idxpart2_expr_idx  | t
- idxpart_expr_idx   | f
-(4 rows)
+         relname          | indisvalid 
+--------------------------+------------
+ idxpart11_expr_idx       | f
+ idxpart11_expr_idx_ccaux | f
+ idxpart1_expr_idx        | f
+ idxpart2_expr_idx        | t
...

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/indexing.out /tmp/cirrus-ci-build/src/test/modules/test_plan_adv...
--- /tmp/cirrus-ci-build/src/test/regress/expected/indexing.out	2026-05-24 11:01:22.352965665 +0000
+++ /tmp/cirrus-ci-build/src/test/modules/test_plan_advice/tmp_check/results/indexing.out	2026-05-24 11:12:36.861554054 ...
@@ -559,13 +559,14 @@
 ERROR:  division by zero
 select relname, indisvalid from pg_class join pg_index on indexrelid = oid
    where relname like 'idxpart%' order by relname;
-      relname       | indisvalid 
---------------------+------------
- idxpart11_expr_idx | f
- idxpart1_expr_idx  | f
- idxpart2_expr_idx  | t
- idxpart_expr_idx   | f
-(4 rows)
+         relname          | indisvalid 
+--------------------------+------------
+ idxpart11_expr_idx       | f
+ idxpart11_expr_idx_ccaux | f
+ idxpart1_expr_idx        | f
+ idxpart2_expr_idx        | t
...

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/indexing.out /tmp/cirrus-ci-build/src/test/recovery/tmp_check/re...
--- /tmp/cirrus-ci-build/src/test/regress/expected/indexing.out	2026-05-24 11:01:22.352965665 +0000
+++ /tmp/cirrus-ci-build/src/test/recovery/tmp_check/results/indexing.out	2026-05-24 11:12:55.049569599 +0000
@@ -559,13 +559,14 @@
 ERROR:  division by zero
 select relname, indisvalid from pg_class join pg_index on indexrelid = oid
    where relname like 'idxpart%' order by relname;
-      relname       | indisvalid 
---------------------+------------
- idxpart11_expr_idx | f
- idxpart1_expr_idx  | f
- idxpart2_expr_idx  | t
- idxpart_expr_idx   | f
-(4 rows)
+         relname          | indisvalid 
+--------------------------+------------
+ idxpart11_expr_idx       | f
+ idxpart11_expr_idx_ccaux | f
+ idxpart1_expr_idx        | f
+ idxpart2_expr_idx        | t
...

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/indexing.out /tmp/cirrus-ci-build/src/test/regress/results/index...
--- /tmp/cirrus-ci-build/src/test/regress/expected/indexing.out	2026-05-24 11:01:22.352965665 +0000
+++ /tmp/cirrus-ci-build/src/test/regress/results/indexing.out	2026-05-24 11:09:49.289620653 +0000
@@ -559,13 +559,14 @@
 ERROR:  division by zero
 select relname, indisvalid from pg_class join pg_index on indexrelid = oid
    where relname like 'idxpart%' order by relname;
-      relname       | indisvalid 
---------------------+------------
- idxpart11_expr_idx | f
- idxpart1_expr_idx  | f
- idxpart2_expr_idx  | t
- idxpart_expr_idx   | f
-(4 rows)
+         relname          | indisvalid 
+--------------------------+------------
+ idxpart11_expr_idx       | f
+ idxpart11_expr_idx_ccaux | f
+ idxpart1_expr_idx        | f
+ idxpart2_expr_idx        | t
...

diff -U3 /home/postgres/postgres/src/test/regress/expected/indexing.out /home/postgres/postgres/build/testrun/pg_upgrade...
--- /home/postgres/postgres/src/test/regress/expected/indexing.out	2026-05-24 11:01:42.700845704 +0000
+++ /home/postgres/postgres/build/testrun/pg_upgrade/002_pg_upgrade/data/results/indexing.out	2026-05-24 11:05:37.730504...
@@ -559,13 +559,14 @@
 ERROR:  division by zero
 select relname, indisvalid from pg_class join pg_index on indexrelid = oid
    where relname like 'idxpart%' order by relname;
-      relname       | indisvalid 
---------------------+------------
- idxpart11_expr_idx | f
- idxpart1_expr_idx  | f
- idxpart2_expr_idx  | t
- idxpart_expr_idx   | f
-(4 rows)
+         relname          | indisvalid 
+--------------------------+------------
+ idxpart11_expr_idx       | f
+ idxpart11_expr_idx_ccaux | f
+ idxpart1_expr_idx        | f
+ idxpart2_expr_idx        | t
...

diff -U3 /home/postgres/postgres/src/test/regress/expected/indexing.out /home/postgres/postgres/build/testrun/recovery/0...
--- /home/postgres/postgres/src/test/regress/expected/indexing.out	2026-05-24 11:01:42.700845704 +0000
+++ /home/postgres/postgres/build/testrun/recovery/027_stream_regress/data/results/indexing.out	2026-05-24 11:06:35.3269...
@@ -559,13 +559,14 @@
 ERROR:  division by zero
 select relname, indisvalid from pg_class join pg_index on indexrelid = oid
    where relname like 'idxpart%' order by relname;
-      relname       | indisvalid 
---------------------+------------
- idxpart11_expr_idx | f
- idxpart1_expr_idx  | f
- idxpart2_expr_idx  | t
- idxpart_expr_idx   | f
-(4 rows)
+         relname          | indisvalid 
+--------------------------+------------
+ idxpart11_expr_idx       | f
+ idxpart11_expr_idx_ccaux | f
+ idxpart1_expr_idx        | f
+ idxpart2_expr_idx        | t
...

diff -U3 /home/postgres/postgres/src/test/regress/expected/indexing.out /home/postgres/postgres/build/testrun/regress/re...
--- /home/postgres/postgres/src/test/regress/expected/indexing.out	2026-05-24 11:01:42.700845704 +0000
+++ /home/postgres/postgres/build/testrun/regress/regress/results/indexing.out	2026-05-24 11:05:31.258216841 +0000
@@ -559,13 +559,14 @@
 ERROR:  division by zero
 select relname, indisvalid from pg_class join pg_index on indexrelid = oid
    where relname like 'idxpart%' order by relname;
-      relname       | indisvalid 
---------------------+------------
- idxpart11_expr_idx | f
- idxpart1_expr_idx  | f
- idxpart2_expr_idx  | t
- idxpart_expr_idx   | f
-(4 rows)
+         relname          | indisvalid 
+--------------------------+------------
+ idxpart11_expr_idx       | f
+ idxpart11_expr_idx_ccaux | f
+ idxpart1_expr_idx        | f
+ idxpart2_expr_idx        | t
...

diff -U3 /home/postgres/postgres/src/test/regress/expected/indexing.out /home/postgres/postgres/build/testrun/test_plan_...
--- /home/postgres/postgres/src/test/regress/expected/indexing.out	2026-05-24 11:01:42.700845704 +0000
+++ /home/postgres/postgres/build/testrun/test_plan_advice/001_replan_regress/data/results/indexing.out	2026-05-24 11:05...
@@ -559,13 +559,14 @@
 ERROR:  division by zero
 select relname, indisvalid from pg_class join pg_index on indexrelid = oid
    where relname like 'idxpart%' order by relname;
-      relname       | indisvalid 
---------------------+------------
- idxpart11_expr_idx | f
- idxpart1_expr_idx  | f
- idxpart2_expr_idx  | t
- idxpart_expr_idx   | f
-(4 rows)
+         relname          | indisvalid 
+--------------------------+------------
+ idxpart11_expr_idx       | f
+ idxpart11_expr_idx_ccaux | f
+ idxpart1_expr_idx        | f
+ idxpart2_expr_idx        | t
...

diff --strip-trailing-cr -U3 C:/cirrus/src/test/regress/expected/indexing.out C:/cirrus/build/testrun/pg_upgrade/002_pg_...
--- C:/cirrus/src/test/regress/expected/indexing.out	2026-05-24 08:43:55.842219800 +0000
+++ C:/cirrus/build/testrun/pg_upgrade/002_pg_upgrade/data/results/indexing.out	2026-05-24 08:49:47.513014100 +0000
@@ -559,41 +559,46 @@
 ERROR:  division by zero
 select relname, indisvalid from pg_class join pg_index on indexrelid = oid
    where relname like 'idxpart%' order by relname;
-      relname       | indisvalid 
---------------------+------------
- idxpart11_expr_idx | f
- idxpart1_expr_idx  | f
- idxpart2_expr_idx  | t
- idxpart_expr_idx   | f
+      relname      | indisvalid 
+-------------------+------------
+ idxpart11_a_b_idx | f
+ idxpart1_a_b_idx  | f
+ idxpart2_a_b_idx  | t
+ idxpart_a_b_idx   | f
 (4 rows)
...

diff --strip-trailing-cr -U3 C:/cirrus/src/test/regress/expected/indexing.out C:/cirrus/build/testrun/recovery/027_strea...
--- C:/cirrus/src/test/regress/expected/indexing.out	2026-05-24 08:43:55.842219800 +0000
+++ C:/cirrus/build/testrun/recovery/027_stream_regress/data/results/indexing.out	2026-05-24 08:53:44.739267600 +0000
@@ -559,41 +559,46 @@
 ERROR:  division by zero
 select relname, indisvalid from pg_class join pg_index on indexrelid = oid
    where relname like 'idxpart%' order by relname;
-      relname       | indisvalid 
---------------------+------------
- idxpart11_expr_idx | f
- idxpart1_expr_idx  | f
- idxpart2_expr_idx  | t
- idxpart_expr_idx   | f
+      relname      | indisvalid 
+-------------------+------------
+ idxpart11_a_b_idx | f
+ idxpart1_a_b_idx  | f
+ idxpart2_a_b_idx  | t
+ idxpart_a_b_idx   | f
 (4 rows)
...

diff --strip-trailing-cr -U3 C:/cirrus/src/test/regress/expected/indexing.out C:/cirrus/build/testrun/regress/regress/re...
--- C:/cirrus/src/test/regress/expected/indexing.out	2026-05-24 08:43:55.842219800 +0000
+++ C:/cirrus/build/testrun/regress/regress/results/indexing.out	2026-05-24 08:49:41.907623400 +0000
@@ -559,41 +559,46 @@
 ERROR:  division by zero
 select relname, indisvalid from pg_class join pg_index on indexrelid = oid
    where relname like 'idxpart%' order by relname;
-      relname       | indisvalid 
---------------------+------------
- idxpart11_expr_idx | f
- idxpart1_expr_idx  | f
- idxpart2_expr_idx  | t
- idxpart_expr_idx   | f
+      relname      | indisvalid 
+-------------------+------------
+ idxpart11_a_b_idx | f
+ idxpart1_a_b_idx  | f
+ idxpart2_a_b_idx  | t
+ idxpart_a_b_idx   | f
 (4 rows)
...

diff --strip-trailing-cr -U3 C:/cirrus/src/test/regress/expected/indexing.out C:/cirrus/build/testrun/test_plan_advice/0...
--- C:/cirrus/src/test/regress/expected/indexing.out	2026-05-24 08:43:55.842219800 +0000
+++ C:/cirrus/build/testrun/test_plan_advice/001_replan_regress/data/results/indexing.out	2026-05-24 08:49:34.868967400 ...
@@ -559,41 +559,46 @@
 ERROR:  division by zero
 select relname, indisvalid from pg_class join pg_index on indexrelid = oid
    where relname like 'idxpart%' order by relname;
-      relname       | indisvalid 
---------------------+------------
- idxpart11_expr_idx | f
- idxpart1_expr_idx  | f
- idxpart2_expr_idx  | t
- idxpart_expr_idx   | f
+      relname      | indisvalid 
+-------------------+------------
+ idxpart11_a_b_idx | f
+ idxpart1_a_b_idx  | f
+ idxpart2_a_b_idx  | t
+ idxpart_a_b_idx   | f
 (4 rows)
...

diff -U3 /Users/admin/pgsql/src/test/regress/expected/indexing.out /Users/admin/pgsql/build/testrun/pg_upgrade/002_pg_up...
--- /Users/admin/pgsql/src/test/regress/expected/indexing.out	2026-05-24 08:43:14
+++ /Users/admin/pgsql/build/testrun/pg_upgrade/002_pg_upgrade/data/results/indexing.out	2026-05-24 08:47:55
@@ -559,41 +559,46 @@
 ERROR:  division by zero
 select relname, indisvalid from pg_class join pg_index on indexrelid = oid
    where relname like 'idxpart%' order by relname;
-      relname       | indisvalid 
---------------------+------------
- idxpart11_expr_idx | f
- idxpart1_expr_idx  | f
- idxpart2_expr_idx  | t
- idxpart_expr_idx   | f
+      relname      | indisvalid 
+-------------------+------------
+ idxpart11_a_b_idx | f
+ idxpart1_a_b_idx  | f
+ idxpart2_a_b_idx  | t
+ idxpart_a_b_idx   | f
 (4 rows)
...

diff -U3 /Users/admin/pgsql/src/test/regress/expected/indexing.out /Users/admin/pgsql/build/testrun/recovery/027_stream_...
--- /Users/admin/pgsql/src/test/regress/expected/indexing.out	2026-05-24 08:43:14
+++ /Users/admin/pgsql/build/testrun/recovery/027_stream_regress/data/results/indexing.out	2026-05-24 08:50:31
@@ -559,41 +559,46 @@
 ERROR:  division by zero
 select relname, indisvalid from pg_class join pg_index on indexrelid = oid
    where relname like 'idxpart%' order by relname;
-      relname       | indisvalid 
---------------------+------------
- idxpart11_expr_idx | f
- idxpart1_expr_idx  | f
- idxpart2_expr_idx  | t
- idxpart_expr_idx   | f
+      relname      | indisvalid 
+-------------------+------------
+ idxpart11_a_b_idx | f
+ idxpart1_a_b_idx  | f
+ idxpart2_a_b_idx  | t
+ idxpart_a_b_idx   | f
 (4 rows)
...

diff -U3 /Users/admin/pgsql/src/test/regress/expected/indexing.out /Users/admin/pgsql/build/testrun/regress/regress/resu...
--- /Users/admin/pgsql/src/test/regress/expected/indexing.out	2026-05-24 08:43:14
+++ /Users/admin/pgsql/build/testrun/regress/regress/results/indexing.out	2026-05-24 08:47:56
@@ -559,41 +559,46 @@
 ERROR:  division by zero
 select relname, indisvalid from pg_class join pg_index on indexrelid = oid
    where relname like 'idxpart%' order by relname;
-      relname       | indisvalid 
---------------------+------------
- idxpart11_expr_idx | f
- idxpart1_expr_idx  | f
- idxpart2_expr_idx  | t
- idxpart_expr_idx   | f
+      relname      | indisvalid 
+-------------------+------------
+ idxpart11_a_b_idx | f
+ idxpart1_a_b_idx  | f
+ idxpart2_a_b_idx  | t
+ idxpart_a_b_idx   | f
 (4 rows)
...

diff -U3 /Users/admin/pgsql/src/test/regress/expected/indexing.out /Users/admin/pgsql/build/testrun/test_plan_advice/001...
--- /Users/admin/pgsql/src/test/regress/expected/indexing.out	2026-05-24 08:43:14
+++ /Users/admin/pgsql/build/testrun/test_plan_advice/001_replan_regress/data/results/indexing.out	2026-05-24 08:48:02
@@ -559,41 +559,46 @@
 ERROR:  division by zero
 select relname, indisvalid from pg_class join pg_index on indexrelid = oid
    where relname like 'idxpart%' order by relname;
-      relname       | indisvalid 
---------------------+------------
- idxpart11_expr_idx | f
- idxpart1_expr_idx  | f
- idxpart2_expr_idx  | t
- idxpart_expr_idx   | f
+      relname      | indisvalid 
+-------------------+------------
+ idxpart11_a_b_idx | f
+ idxpart1_a_b_idx  | f
+ idxpart2_a_b_idx  | t
+ idxpart_a_b_idx   | f
 (4 rows)
...

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/indexing.out /tmp/cirrus-ci-build/build/testrun/pg_upgrade/002_p...
--- /tmp/cirrus-ci-build/src/test/regress/expected/indexing.out	2026-05-24 08:43:44.838754761 +0000
+++ /tmp/cirrus-ci-build/build/testrun/pg_upgrade/002_pg_upgrade/data/results/indexing.out	2026-05-24 08:49:00.380089319...
@@ -559,41 +559,46 @@
 ERROR:  division by zero
 select relname, indisvalid from pg_class join pg_index on indexrelid = oid
    where relname like 'idxpart%' order by relname;
-      relname       | indisvalid 
---------------------+------------
- idxpart11_expr_idx | f
- idxpart1_expr_idx  | f
- idxpart2_expr_idx  | t
- idxpart_expr_idx   | f
+      relname      | indisvalid 
+-------------------+------------
+ idxpart11_a_b_idx | f
+ idxpart1_a_b_idx  | f
+ idxpart2_a_b_idx  | t
+ idxpart_a_b_idx   | f
 (4 rows)
...

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/indexing.out /tmp/cirrus-ci-build/build/testrun/recovery/027_str...
--- /tmp/cirrus-ci-build/src/test/regress/expected/indexing.out	2026-05-24 08:43:44.838754761 +0000
+++ /tmp/cirrus-ci-build/build/testrun/recovery/027_stream_regress/data/results/indexing.out	2026-05-24 08:50:33.9072683...
@@ -559,41 +559,46 @@
 ERROR:  division by zero
 select relname, indisvalid from pg_class join pg_index on indexrelid = oid
    where relname like 'idxpart%' order by relname;
-      relname       | indisvalid 
---------------------+------------
- idxpart11_expr_idx | f
- idxpart1_expr_idx  | f
- idxpart2_expr_idx  | t
- idxpart_expr_idx   | f
+      relname      | indisvalid 
+-------------------+------------
+ idxpart11_a_b_idx | f
+ idxpart1_a_b_idx  | f
+ idxpart2_a_b_idx  | t
+ idxpart_a_b_idx   | f
 (4 rows)
...

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/indexing.out /tmp/cirrus-ci-build/build/testrun/regress/regress/...
--- /tmp/cirrus-ci-build/src/test/regress/expected/indexing.out	2026-05-24 08:43:44.838754761 +0000
+++ /tmp/cirrus-ci-build/build/testrun/regress/regress/results/indexing.out	2026-05-24 08:48:59.576098630 +0000
@@ -559,41 +559,46 @@
 ERROR:  division by zero
 select relname, indisvalid from pg_class join pg_index on indexrelid = oid
    where relname like 'idxpart%' order by relname;
-      relname       | indisvalid 
---------------------+------------
- idxpart11_expr_idx | f
- idxpart1_expr_idx  | f
- idxpart2_expr_idx  | t
- idxpart_expr_idx   | f
+      relname      | indisvalid 
+-------------------+------------
+ idxpart11_a_b_idx | f
+ idxpart1_a_b_idx  | f
+ idxpart2_a_b_idx  | t
+ idxpart_a_b_idx   | f
 (4 rows)
...

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/indexing.out /tmp/cirrus-ci-build/build/testrun/test_plan_advice...
--- /tmp/cirrus-ci-build/src/test/regress/expected/indexing.out	2026-05-24 08:43:44.838754761 +0000
+++ /tmp/cirrus-ci-build/build/testrun/test_plan_advice/001_replan_regress/data/results/indexing.out	2026-05-24 08:49:06...
@@ -559,41 +559,46 @@
 ERROR:  division by zero
 select relname, indisvalid from pg_class join pg_index on indexrelid = oid
    where relname like 'idxpart%' order by relname;
-      relname       | indisvalid 
---------------------+------------
- idxpart11_expr_idx | f
- idxpart1_expr_idx  | f
- idxpart2_expr_idx  | t
- idxpart_expr_idx   | f
+      relname      | indisvalid 
+-------------------+------------
+ idxpart11_a_b_idx | f
+ idxpart1_a_b_idx  | f
+ idxpart2_a_b_idx  | t
+ idxpart_a_b_idx   | f
 (4 rows)
...

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/indexing.out /tmp/cirrus-ci-build/src/bin/pg_upgrade/tmp_check/r...
--- /tmp/cirrus-ci-build/src/test/regress/expected/indexing.out	2026-05-24 08:43:18.402352305 +0000
+++ /tmp/cirrus-ci-build/src/bin/pg_upgrade/tmp_check/results/indexing.out	2026-05-24 08:53:29.515985330 +0000
@@ -559,41 +559,46 @@
 ERROR:  division by zero
 select relname, indisvalid from pg_class join pg_index on indexrelid = oid
    where relname like 'idxpart%' order by relname;
-      relname       | indisvalid 
---------------------+------------
- idxpart11_expr_idx | f
- idxpart1_expr_idx  | f
- idxpart2_expr_idx  | t
- idxpart_expr_idx   | f
+      relname      | indisvalid 
+-------------------+------------
+ idxpart11_a_b_idx | f
+ idxpart1_a_b_idx  | f
+ idxpart2_a_b_idx  | t
+ idxpart_a_b_idx   | f
 (4 rows)
...

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/indexing.out /tmp/cirrus-ci-build/src/test/modules/test_plan_adv...
--- /tmp/cirrus-ci-build/src/test/regress/expected/indexing.out	2026-05-24 08:43:18.402352305 +0000
+++ /tmp/cirrus-ci-build/src/test/modules/test_plan_advice/tmp_check/results/indexing.out	2026-05-24 08:55:32.397937452 ...
@@ -559,41 +559,46 @@
 ERROR:  division by zero
 select relname, indisvalid from pg_class join pg_index on indexrelid = oid
    where relname like 'idxpart%' order by relname;
-      relname       | indisvalid 
---------------------+------------
- idxpart11_expr_idx | f
- idxpart1_expr_idx  | f
- idxpart2_expr_idx  | t
- idxpart_expr_idx   | f
+      relname      | indisvalid 
+-------------------+------------
+ idxpart11_a_b_idx | f
+ idxpart1_a_b_idx  | f
+ idxpart2_a_b_idx  | t
+ idxpart_a_b_idx   | f
 (4 rows)
...

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/indexing.out /tmp/cirrus-ci-build/src/test/recovery/tmp_check/re...
--- /tmp/cirrus-ci-build/src/test/regress/expected/indexing.out	2026-05-24 08:43:18.402352305 +0000
+++ /tmp/cirrus-ci-build/src/test/recovery/tmp_check/results/indexing.out	2026-05-24 08:55:00.853220793 +0000
@@ -559,41 +559,46 @@
 ERROR:  division by zero
 select relname, indisvalid from pg_class join pg_index on indexrelid = oid
    where relname like 'idxpart%' order by relname;
-      relname       | indisvalid 
---------------------+------------
- idxpart11_expr_idx | f
- idxpart1_expr_idx  | f
- idxpart2_expr_idx  | t
- idxpart_expr_idx   | f
+      relname      | indisvalid 
+-------------------+------------
+ idxpart11_a_b_idx | f
+ idxpart1_a_b_idx  | f
+ idxpart2_a_b_idx  | t
+ idxpart_a_b_idx   | f
 (4 rows)
...

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/indexing.out /tmp/cirrus-ci-build/src/test/regress/results/index...
--- /tmp/cirrus-ci-build/src/test/regress/expected/indexing.out	2026-05-24 08:43:18.402352305 +0000
+++ /tmp/cirrus-ci-build/src/test/regress/results/indexing.out	2026-05-24 08:50:21.421872802 +0000
@@ -559,41 +559,46 @@
 ERROR:  division by zero
 select relname, indisvalid from pg_class join pg_index on indexrelid = oid
    where relname like 'idxpart%' order by relname;
-      relname       | indisvalid 
---------------------+------------
- idxpart11_expr_idx | f
- idxpart1_expr_idx  | f
- idxpart2_expr_idx  | t
- idxpart_expr_idx   | f
+      relname      | indisvalid 
+-------------------+------------
+ idxpart11_a_b_idx | f
+ idxpart1_a_b_idx  | f
+ idxpart2_a_b_idx  | t
+ idxpart_a_b_idx   | f
 (4 rows)
...

diff -U3 /home/postgres/postgres/src/test/regress/expected/indexing.out /home/postgres/postgres/build/testrun/pg_upgrade...
--- /home/postgres/postgres/src/test/regress/expected/indexing.out	2026-05-24 08:44:35.224771940 +0000
+++ /home/postgres/postgres/build/testrun/pg_upgrade/002_pg_upgrade/data/results/indexing.out	2026-05-24 08:48:26.487456...
@@ -559,41 +559,46 @@
 ERROR:  division by zero
 select relname, indisvalid from pg_class join pg_index on indexrelid = oid
    where relname like 'idxpart%' order by relname;
-      relname       | indisvalid 
---------------------+------------
- idxpart11_expr_idx | f
- idxpart1_expr_idx  | f
- idxpart2_expr_idx  | t
- idxpart_expr_idx   | f
+      relname      | indisvalid 
+-------------------+------------
+ idxpart11_a_b_idx | f
+ idxpart1_a_b_idx  | f
+ idxpart2_a_b_idx  | t
+ idxpart_a_b_idx   | f
 (4 rows)
...

diff -U3 /home/postgres/postgres/src/test/regress/expected/indexing.out /home/postgres/postgres/build/testrun/recovery/0...
--- /home/postgres/postgres/src/test/regress/expected/indexing.out	2026-05-24 08:44:35.224771940 +0000
+++ /home/postgres/postgres/build/testrun/recovery/027_stream_regress/data/results/indexing.out	2026-05-24 08:49:13.1701...
@@ -559,41 +559,46 @@
 ERROR:  division by zero
 select relname, indisvalid from pg_class join pg_index on indexrelid = oid
    where relname like 'idxpart%' order by relname;
-      relname       | indisvalid 
---------------------+------------
- idxpart11_expr_idx | f
- idxpart1_expr_idx  | f
- idxpart2_expr_idx  | t
- idxpart_expr_idx   | f
+      relname      | indisvalid 
+-------------------+------------
+ idxpart11_a_b_idx | f
+ idxpart1_a_b_idx  | f
+ idxpart2_a_b_idx  | t
+ idxpart_a_b_idx   | f
 (4 rows)
...

diff -U3 /home/postgres/postgres/src/test/regress/expected/indexing.out /home/postgres/postgres/build/testrun/regress/re...
--- /home/postgres/postgres/src/test/regress/expected/indexing.out	2026-05-24 08:44:35.224771940 +0000
+++ /home/postgres/postgres/build/testrun/regress/regress/results/indexing.out	2026-05-24 08:48:15.447190701 +0000
@@ -559,41 +559,46 @@
 ERROR:  division by zero
 select relname, indisvalid from pg_class join pg_index on indexrelid = oid
    where relname like 'idxpart%' order by relname;
-      relname       | indisvalid 
---------------------+------------
- idxpart11_expr_idx | f
- idxpart1_expr_idx  | f
- idxpart2_expr_idx  | t
- idxpart_expr_idx   | f
+      relname      | indisvalid 
+-------------------+------------
+ idxpart11_a_b_idx | f
+ idxpart1_a_b_idx  | f
+ idxpart2_a_b_idx  | t
+ idxpart_a_b_idx   | f
 (4 rows)
...

diff -U3 /home/postgres/postgres/src/test/regress/expected/indexing.out /home/postgres/postgres/build/testrun/test_plan_...
--- /home/postgres/postgres/src/test/regress/expected/indexing.out	2026-05-24 08:44:35.224771940 +0000
+++ /home/postgres/postgres/build/testrun/test_plan_advice/001_replan_regress/data/results/indexing.out	2026-05-24 08:48...
@@ -559,41 +559,46 @@
 ERROR:  division by zero
 select relname, indisvalid from pg_class join pg_index on indexrelid = oid
    where relname like 'idxpart%' order by relname;
-      relname       | indisvalid 
---------------------+------------
- idxpart11_expr_idx | f
- idxpart1_expr_idx  | f
- idxpart2_expr_idx  | t
- idxpart_expr_idx   | f
+      relname      | indisvalid 
+-------------------+------------
+ idxpart11_a_b_idx | f
+ idxpart1_a_b_idx  | f
+ idxpart2_a_b_idx  | t
+ idxpart_a_b_idx   | f
 (4 rows)
...

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/indexing.out /tmp/cirrus-ci-build/build/testrun/pg_upgrade/002_p...
--- /tmp/cirrus-ci-build/src/test/regress/expected/indexing.out	2026-05-24 08:43:46.276595000 +0000
+++ /tmp/cirrus-ci-build/build/testrun/pg_upgrade/002_pg_upgrade/data/results/indexing.out	2026-05-24 08:49:55.651272000...
@@ -559,41 +559,46 @@
 ERROR:  division by zero
 select relname, indisvalid from pg_class join pg_index on indexrelid = oid
    where relname like 'idxpart%' order by relname;
-      relname       | indisvalid 
---------------------+------------
- idxpart11_expr_idx | f
- idxpart1_expr_idx  | f
- idxpart2_expr_idx  | t
- idxpart_expr_idx   | f
+      relname      | indisvalid 
+-------------------+------------
+ idxpart11_a_b_idx | f
+ idxpart1_a_b_idx  | f
+ idxpart2_a_b_idx  | t
+ idxpart_a_b_idx   | f
 (4 rows)
...

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/indexing.out /tmp/cirrus-ci-build/build/testrun/recovery/027_str...
--- /tmp/cirrus-ci-build/src/test/regress/expected/indexing.out	2026-05-24 08:43:46.276595000 +0000
+++ /tmp/cirrus-ci-build/build/testrun/recovery/027_stream_regress/data/results/indexing.out	2026-05-24 08:51:20.8855050...
@@ -559,41 +559,46 @@
 ERROR:  division by zero
 select relname, indisvalid from pg_class join pg_index on indexrelid = oid
    where relname like 'idxpart%' order by relname;
-      relname       | indisvalid 
---------------------+------------
- idxpart11_expr_idx | f
- idxpart1_expr_idx  | f
- idxpart2_expr_idx  | t
- idxpart_expr_idx   | f
+      relname      | indisvalid 
+-------------------+------------
+ idxpart11_a_b_idx | f
+ idxpart1_a_b_idx  | f
+ idxpart2_a_b_idx  | t
+ idxpart_a_b_idx   | f
 (4 rows)
...

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/indexing.out /tmp/cirrus-ci-build/build/testrun/regress/regress/...
--- /tmp/cirrus-ci-build/src/test/regress/expected/indexing.out	2026-05-24 08:43:46.276595000 +0000
+++ /tmp/cirrus-ci-build/build/testrun/regress/regress/results/indexing.out	2026-05-24 08:49:51.307955000 +0000
@@ -559,41 +559,46 @@
 ERROR:  division by zero
 select relname, indisvalid from pg_class join pg_index on indexrelid = oid
    where relname like 'idxpart%' order by relname;
-      relname       | indisvalid 
---------------------+------------
- idxpart11_expr_idx | f
- idxpart1_expr_idx  | f
- idxpart2_expr_idx  | t
- idxpart_expr_idx   | f
+      relname      | indisvalid 
+-------------------+------------
+ idxpart11_a_b_idx | f
+ idxpart1_a_b_idx  | f
+ idxpart2_a_b_idx  | t
+ idxpart_a_b_idx   | f
 (4 rows)
...

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/indexing.out /tmp/cirrus-ci-build/build/testrun/test_plan_advice...
--- /tmp/cirrus-ci-build/src/test/regress/expected/indexing.out	2026-05-24 08:43:46.276595000 +0000
+++ /tmp/cirrus-ci-build/build/testrun/test_plan_advice/001_replan_regress/data/results/indexing.out	2026-05-24 08:50:04...
@@ -559,41 +559,46 @@
 ERROR:  division by zero
 select relname, indisvalid from pg_class join pg_index on indexrelid = oid
    where relname like 'idxpart%' order by relname;
-      relname       | indisvalid 
---------------------+------------
- idxpart11_expr_idx | f
- idxpart1_expr_idx  | f
- idxpart2_expr_idx  | t
- idxpart_expr_idx   | f
+      relname      | indisvalid 
+-------------------+------------
+ idxpart11_a_b_idx | f
+ idxpart1_a_b_idx  | f
+ idxpart2_a_b_idx  | t
+ idxpart_a_b_idx   | f
 (4 rows)
...

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/collate.icu.utf8.out /tmp/cirrus-ci-build/build/testrun/pg_upgra...
--- /tmp/cirrus-ci-build/src/test/regress/expected/collate.icu.utf8.out	2026-05-15 22:13:00.003948155 +0000
+++ /tmp/cirrus-ci-build/build/testrun/pg_upgrade/002_pg_upgrade/data/results/collate.icu.utf8.out	2026-05-15 22:16:20.8...
@@ -3321,15 +3321,18 @@
   FROM eager_agg_t1 t1
   JOIN eager_agg_t2 t2 ON t1.val = t2.val COLLATE "C"
 GROUP BY t1.id;
-                       QUERY PLAN                       
---------------------------------------------------------
- HashAggregate
+                         QUERY PLAN                         
+------------------------------------------------------------
+ GroupAggregate
    Group Key: t1.id
-   ->  Nested Loop
-         Join Filter: ((t1.val)::text = (t2.val)::text)
-         ->  Seq Scan on eager_agg_t2 t2
-         ->  Seq Scan on eager_agg_t1 t1
-(6 rows)
+   ->  Sort
...

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/collate.icu.utf8.out /tmp/cirrus-ci-build/build/testrun/recovery...
--- /tmp/cirrus-ci-build/src/test/regress/expected/collate.icu.utf8.out	2026-05-15 22:13:00.003948155 +0000
+++ /tmp/cirrus-ci-build/build/testrun/recovery/027_stream_regress/data/results/collate.icu.utf8.out	2026-05-15 22:17:55...
@@ -3321,15 +3321,18 @@
   FROM eager_agg_t1 t1
   JOIN eager_agg_t2 t2 ON t1.val = t2.val COLLATE "C"
 GROUP BY t1.id;
-                       QUERY PLAN                       
---------------------------------------------------------
- HashAggregate
+                         QUERY PLAN                         
+------------------------------------------------------------
+ GroupAggregate
    Group Key: t1.id
-   ->  Nested Loop
-         Join Filter: ((t1.val)::text = (t2.val)::text)
-         ->  Seq Scan on eager_agg_t2 t2
-         ->  Seq Scan on eager_agg_t1 t1
-(6 rows)
+   ->  Sort
...

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/collate.icu.utf8.out /tmp/cirrus-ci-build/build/testrun/regress/...
--- /tmp/cirrus-ci-build/src/test/regress/expected/collate.icu.utf8.out	2026-05-15 22:13:00.003948155 +0000
+++ /tmp/cirrus-ci-build/build/testrun/regress/regress/results/collate.icu.utf8.out	2026-05-15 22:16:17.094675949 +0000
@@ -3321,15 +3321,18 @@
   FROM eager_agg_t1 t1
   JOIN eager_agg_t2 t2 ON t1.val = t2.val COLLATE "C"
 GROUP BY t1.id;
-                       QUERY PLAN                       
---------------------------------------------------------
- HashAggregate
+                         QUERY PLAN                         
+------------------------------------------------------------
+ GroupAggregate
    Group Key: t1.id
-   ->  Nested Loop
-         Join Filter: ((t1.val)::text = (t2.val)::text)
-         ->  Seq Scan on eager_agg_t2 t2
-         ->  Seq Scan on eager_agg_t1 t1
-(6 rows)
+   ->  Sort
...

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/collate.icu.utf8.out /tmp/cirrus-ci-build/build/testrun/test_pla...
--- /tmp/cirrus-ci-build/src/test/regress/expected/collate.icu.utf8.out	2026-05-15 22:13:00.003948155 +0000
+++ /tmp/cirrus-ci-build/build/testrun/test_plan_advice/001_replan_regress/data/results/collate.icu.utf8.out	2026-05-15 ...
@@ -3321,15 +3321,18 @@
   FROM eager_agg_t1 t1
   JOIN eager_agg_t2 t2 ON t1.val = t2.val COLLATE "C"
 GROUP BY t1.id;
-                       QUERY PLAN                       
---------------------------------------------------------
- HashAggregate
+                         QUERY PLAN                         
+------------------------------------------------------------
+ GroupAggregate
    Group Key: t1.id
-   ->  Nested Loop
-         Join Filter: ((t1.val)::text = (t2.val)::text)
-         ->  Seq Scan on eager_agg_t2 t2
-         ->  Seq Scan on eager_agg_t1 t1
-(6 rows)
+   ->  Sort
...

diff -U3 /Users/admin/pgsql/src/test/regress/expected/collate.icu.utf8.out /Users/admin/pgsql/build/testrun/pg_upgrade/0...
--- /Users/admin/pgsql/src/test/regress/expected/collate.icu.utf8.out	2026-05-15 22:13:01
+++ /Users/admin/pgsql/build/testrun/pg_upgrade/002_pg_upgrade/data/results/collate.icu.utf8.out	2026-05-15 22:17:35
@@ -3321,15 +3321,18 @@
   FROM eager_agg_t1 t1
   JOIN eager_agg_t2 t2 ON t1.val = t2.val COLLATE "C"
 GROUP BY t1.id;
-                       QUERY PLAN                       
---------------------------------------------------------
- HashAggregate
+                         QUERY PLAN                         
+------------------------------------------------------------
+ GroupAggregate
    Group Key: t1.id
-   ->  Nested Loop
-         Join Filter: ((t1.val)::text = (t2.val)::text)
-         ->  Seq Scan on eager_agg_t2 t2
-         ->  Seq Scan on eager_agg_t1 t1
-(6 rows)
+   ->  Sort
...

diff -U3 /Users/admin/pgsql/src/test/regress/expected/collate.icu.utf8.out /Users/admin/pgsql/build/testrun/recovery/027...
--- /Users/admin/pgsql/src/test/regress/expected/collate.icu.utf8.out	2026-05-15 22:13:01
+++ /Users/admin/pgsql/build/testrun/recovery/027_stream_regress/data/results/collate.icu.utf8.out	2026-05-15 22:20:49
@@ -3321,15 +3321,18 @@
   FROM eager_agg_t1 t1
   JOIN eager_agg_t2 t2 ON t1.val = t2.val COLLATE "C"
 GROUP BY t1.id;
-                       QUERY PLAN                       
---------------------------------------------------------
- HashAggregate
+                         QUERY PLAN                         
+------------------------------------------------------------
+ GroupAggregate
    Group Key: t1.id
-   ->  Nested Loop
-         Join Filter: ((t1.val)::text = (t2.val)::text)
-         ->  Seq Scan on eager_agg_t2 t2
-         ->  Seq Scan on eager_agg_t1 t1
-(6 rows)
+   ->  Sort
...

diff -U3 /Users/admin/pgsql/src/test/regress/expected/collate.icu.utf8.out /Users/admin/pgsql/build/testrun/regress/regr...
--- /Users/admin/pgsql/src/test/regress/expected/collate.icu.utf8.out	2026-05-15 22:13:01
+++ /Users/admin/pgsql/build/testrun/regress/regress/results/collate.icu.utf8.out	2026-05-15 22:17:29
@@ -3321,15 +3321,18 @@
   FROM eager_agg_t1 t1
   JOIN eager_agg_t2 t2 ON t1.val = t2.val COLLATE "C"
 GROUP BY t1.id;
-                       QUERY PLAN                       
---------------------------------------------------------
- HashAggregate
+                         QUERY PLAN                         
+------------------------------------------------------------
+ GroupAggregate
    Group Key: t1.id
-   ->  Nested Loop
-         Join Filter: ((t1.val)::text = (t2.val)::text)
-         ->  Seq Scan on eager_agg_t2 t2
-         ->  Seq Scan on eager_agg_t1 t1
-(6 rows)
+   ->  Sort
...

diff -U3 /Users/admin/pgsql/src/test/regress/expected/collate.icu.utf8.out /Users/admin/pgsql/build/testrun/test_plan_ad...
--- /Users/admin/pgsql/src/test/regress/expected/collate.icu.utf8.out	2026-05-15 22:13:01
+++ /Users/admin/pgsql/build/testrun/test_plan_advice/001_replan_regress/data/results/collate.icu.utf8.out	2026-05-15 22...
@@ -3321,15 +3321,18 @@
   FROM eager_agg_t1 t1
   JOIN eager_agg_t2 t2 ON t1.val = t2.val COLLATE "C"
 GROUP BY t1.id;
-                       QUERY PLAN                       
---------------------------------------------------------
- HashAggregate
+                         QUERY PLAN                         
+------------------------------------------------------------
+ GroupAggregate
    Group Key: t1.id
-   ->  Nested Loop
-         Join Filter: ((t1.val)::text = (t2.val)::text)
-         ->  Seq Scan on eager_agg_t2 t2
-         ->  Seq Scan on eager_agg_t1 t1
-(6 rows)
+   ->  Sort
...

diff -U3 /home/postgres/postgres/src/test/regress/expected/collate.icu.utf8.out /home/postgres/postgres/build/testrun/pg...
--- /home/postgres/postgres/src/test/regress/expected/collate.icu.utf8.out	2026-05-15 22:13:28.525096246 +0000
+++ /home/postgres/postgres/build/testrun/pg_upgrade/002_pg_upgrade/data/results/collate.icu.utf8.out	2026-05-15 22:16:1...
@@ -3321,15 +3321,18 @@
   FROM eager_agg_t1 t1
   JOIN eager_agg_t2 t2 ON t1.val = t2.val COLLATE "C"
 GROUP BY t1.id;
-                       QUERY PLAN                       
---------------------------------------------------------
- HashAggregate
+                         QUERY PLAN                         
+------------------------------------------------------------
+ GroupAggregate
    Group Key: t1.id
-   ->  Nested Loop
-         Join Filter: ((t1.val)::text = (t2.val)::text)
-         ->  Seq Scan on eager_agg_t2 t2
-         ->  Seq Scan on eager_agg_t1 t1
-(6 rows)
+   ->  Sort
...

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/collate.icu.utf8.out /tmp/cirrus-ci-build/build/testrun/pg_upgra...
--- /tmp/cirrus-ci-build/src/test/regress/expected/collate.icu.utf8.out	2026-05-15 22:13:16.985472000 +0000
+++ /tmp/cirrus-ci-build/build/testrun/pg_upgrade/002_pg_upgrade/data/results/collate.icu.utf8.out	2026-05-15 22:16:28.9...
@@ -3321,15 +3321,18 @@
   FROM eager_agg_t1 t1
   JOIN eager_agg_t2 t2 ON t1.val = t2.val COLLATE "C"
 GROUP BY t1.id;
-                       QUERY PLAN                       
---------------------------------------------------------
- HashAggregate
+                         QUERY PLAN                         
+------------------------------------------------------------
+ GroupAggregate
    Group Key: t1.id
-   ->  Nested Loop
-         Join Filter: ((t1.val)::text = (t2.val)::text)
-         ->  Seq Scan on eager_agg_t2 t2
-         ->  Seq Scan on eager_agg_t1 t1
-(6 rows)
+   ->  Sort
...

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/collate.icu.utf8.out /tmp/cirrus-ci-build/build/testrun/recovery...
--- /tmp/cirrus-ci-build/src/test/regress/expected/collate.icu.utf8.out	2026-05-15 22:13:16.985472000 +0000
+++ /tmp/cirrus-ci-build/build/testrun/recovery/027_stream_regress/data/results/collate.icu.utf8.out	2026-05-15 22:18:10...
@@ -3321,15 +3321,18 @@
   FROM eager_agg_t1 t1
   JOIN eager_agg_t2 t2 ON t1.val = t2.val COLLATE "C"
 GROUP BY t1.id;
-                       QUERY PLAN                       
---------------------------------------------------------
- HashAggregate
+                         QUERY PLAN                         
+------------------------------------------------------------
+ GroupAggregate
    Group Key: t1.id
-   ->  Nested Loop
-         Join Filter: ((t1.val)::text = (t2.val)::text)
-         ->  Seq Scan on eager_agg_t2 t2
-         ->  Seq Scan on eager_agg_t1 t1
-(6 rows)
+   ->  Sort
...

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/collate.icu.utf8.out /tmp/cirrus-ci-build/build/testrun/regress/...
--- /tmp/cirrus-ci-build/src/test/regress/expected/collate.icu.utf8.out	2026-05-15 22:13:16.985472000 +0000
+++ /tmp/cirrus-ci-build/build/testrun/regress/regress/results/collate.icu.utf8.out	2026-05-15 22:16:23.767570000 +0000
@@ -3321,15 +3321,18 @@
   FROM eager_agg_t1 t1
   JOIN eager_agg_t2 t2 ON t1.val = t2.val COLLATE "C"
 GROUP BY t1.id;
-                       QUERY PLAN                       
---------------------------------------------------------
- HashAggregate
+                         QUERY PLAN                         
+------------------------------------------------------------
+ GroupAggregate
    Group Key: t1.id
-   ->  Nested Loop
-         Join Filter: ((t1.val)::text = (t2.val)::text)
-         ->  Seq Scan on eager_agg_t2 t2
-         ->  Seq Scan on eager_agg_t1 t1
-(6 rows)
+   ->  Sort
...

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/collate.icu.utf8.out /tmp/cirrus-ci-build/build/testrun/test_pla...
--- /tmp/cirrus-ci-build/src/test/regress/expected/collate.icu.utf8.out	2026-05-15 22:13:16.985472000 +0000
+++ /tmp/cirrus-ci-build/build/testrun/test_plan_advice/001_replan_regress/data/results/collate.icu.utf8.out	2026-05-15 ...
@@ -3321,15 +3321,18 @@
   FROM eager_agg_t1 t1
   JOIN eager_agg_t2 t2 ON t1.val = t2.val COLLATE "C"
 GROUP BY t1.id;
-                       QUERY PLAN                       
---------------------------------------------------------
- HashAggregate
+                         QUERY PLAN                         
+------------------------------------------------------------
+ GroupAggregate
    Group Key: t1.id
-   ->  Nested Loop
-         Join Filter: ((t1.val)::text = (t2.val)::text)
-         ->  Seq Scan on eager_agg_t2 t2
-         ->  Seq Scan on eager_agg_t1 t1
-(6 rows)
+   ->  Sort
...

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/collate.icu.utf8.out /tmp/cirrus-ci-build/src/bin/pg_upgrade/tmp...
--- /tmp/cirrus-ci-build/src/test/regress/expected/collate.icu.utf8.out	2026-05-15 22:13:14.141404063 +0000
+++ /tmp/cirrus-ci-build/src/bin/pg_upgrade/tmp_check/results/collate.icu.utf8.out	2026-05-15 22:20:41.984142334 +0000
@@ -3321,15 +3321,18 @@
   FROM eager_agg_t1 t1
   JOIN eager_agg_t2 t2 ON t1.val = t2.val COLLATE "C"
 GROUP BY t1.id;
-                       QUERY PLAN                       
---------------------------------------------------------
- HashAggregate
+                         QUERY PLAN                         
+------------------------------------------------------------
+ GroupAggregate
    Group Key: t1.id
-   ->  Nested Loop
-         Join Filter: ((t1.val)::text = (t2.val)::text)
-         ->  Seq Scan on eager_agg_t2 t2
-         ->  Seq Scan on eager_agg_t1 t1
-(6 rows)
+   ->  Sort
...

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/collate.icu.utf8.out /tmp/cirrus-ci-build/src/test/modules/test_...
--- /tmp/cirrus-ci-build/src/test/regress/expected/collate.icu.utf8.out	2026-05-15 22:13:14.141404063 +0000
+++ /tmp/cirrus-ci-build/src/test/modules/test_plan_advice/tmp_check/results/collate.icu.utf8.out	2026-05-15 22:23:21.26...
@@ -3321,15 +3321,18 @@
   FROM eager_agg_t1 t1
   JOIN eager_agg_t2 t2 ON t1.val = t2.val COLLATE "C"
 GROUP BY t1.id;
-                       QUERY PLAN                       
---------------------------------------------------------
- HashAggregate
+                         QUERY PLAN                         
+------------------------------------------------------------
+ GroupAggregate
    Group Key: t1.id
-   ->  Nested Loop
-         Join Filter: ((t1.val)::text = (t2.val)::text)
-         ->  Seq Scan on eager_agg_t2 t2
-         ->  Seq Scan on eager_agg_t1 t1
-(6 rows)
+   ->  Sort
...

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/collate.icu.utf8.out /tmp/cirrus-ci-build/src/test/recovery/tmp_...
--- /tmp/cirrus-ci-build/src/test/regress/expected/collate.icu.utf8.out	2026-05-15 22:13:14.141404063 +0000
+++ /tmp/cirrus-ci-build/src/test/recovery/tmp_check/results/collate.icu.utf8.out	2026-05-15 22:22:11.244103875 +0000
@@ -3321,15 +3321,18 @@
   FROM eager_agg_t1 t1
   JOIN eager_agg_t2 t2 ON t1.val = t2.val COLLATE "C"
 GROUP BY t1.id;
-                       QUERY PLAN                       
---------------------------------------------------------
- HashAggregate
+                         QUERY PLAN                         
+------------------------------------------------------------
+ GroupAggregate
    Group Key: t1.id
-   ->  Nested Loop
-         Join Filter: ((t1.val)::text = (t2.val)::text)
-         ->  Seq Scan on eager_agg_t2 t2
-         ->  Seq Scan on eager_agg_t1 t1
-(6 rows)
+   ->  Sort
...

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/collate.icu.utf8.out /tmp/cirrus-ci-build/src/test/regress/resul...
--- /tmp/cirrus-ci-build/src/test/regress/expected/collate.icu.utf8.out	2026-05-15 22:13:14.141404063 +0000
+++ /tmp/cirrus-ci-build/src/test/regress/results/collate.icu.utf8.out	2026-05-15 22:18:02.308055377 +0000
@@ -3321,15 +3321,18 @@
   FROM eager_agg_t1 t1
   JOIN eager_agg_t2 t2 ON t1.val = t2.val COLLATE "C"
 GROUP BY t1.id;
-                       QUERY PLAN                       
---------------------------------------------------------
- HashAggregate
+                         QUERY PLAN                         
+------------------------------------------------------------
+ GroupAggregate
    Group Key: t1.id
-   ->  Nested Loop
-         Join Filter: ((t1.val)::text = (t2.val)::text)
-         ->  Seq Scan on eager_agg_t2 t2
-         ->  Seq Scan on eager_agg_t1 t1
-(6 rows)
+   ->  Sort
...

diff -U3 /Users/admin/pgsql/src/test/regress/expected/for_portion_of.out /Users/admin/pgsql/build/testrun/pg_upgrade/002...
--- /Users/admin/pgsql/src/test/regress/expected/for_portion_of.out	2026-05-05 07:10:48
+++ /Users/admin/pgsql/build/testrun/pg_upgrade/002_pg_upgrade/data/results/for_portion_of.out	2026-05-05 07:13:30
@@ -1099,8 +1099,6 @@
   FOR PORTION OF valid_at FROM '2000-01-01' TO '2001-01-11'
   SET name = 'one^3'
   WHERE id = 1;
-ERROR:  new row for relation "for_portion_of_test2" violates check constraint "fpo2_check"
-DETAIL:  Failing row contains (1, [2000-01-01,2001-01-11), one^3).
 ALTER TABLE for_portion_of_test2 DROP CONSTRAINT fpo2_check;
 -- test inserts violating CHECK constraints
 ALTER TABLE for_portion_of_test2
@@ -1115,12 +1113,13 @@
 SELECT * FROM for_portion_of_test2 WHERE id = 1 ORDER BY valid_at;
  id |        valid_at         | name  
 ----+-------------------------+-------
-  1 | [2000-01-01,2010-01-01) | one
+  1 | [2000-01-01,2001-01-11) | one^3
+  1 | [2001-01-11,2010-01-01) | one
   1 | [2010-01-01,2010-01-05) | one^1
...

diff -U3 /Users/admin/pgsql/src/test/regress/expected/for_portion_of.out /Users/admin/pgsql/build/testrun/recovery/027_s...
--- /Users/admin/pgsql/src/test/regress/expected/for_portion_of.out	2026-05-05 07:10:48
+++ /Users/admin/pgsql/build/testrun/recovery/027_stream_regress/data/results/for_portion_of.out	2026-05-05 07:14:55
@@ -1099,8 +1099,6 @@
   FOR PORTION OF valid_at FROM '2000-01-01' TO '2001-01-11'
   SET name = 'one^3'
   WHERE id = 1;
-ERROR:  new row for relation "for_portion_of_test2" violates check constraint "fpo2_check"
-DETAIL:  Failing row contains (1, [2000-01-01,2001-01-11), one^3).
 ALTER TABLE for_portion_of_test2 DROP CONSTRAINT fpo2_check;
 -- test inserts violating CHECK constraints
 ALTER TABLE for_portion_of_test2
@@ -1115,12 +1113,13 @@
 SELECT * FROM for_portion_of_test2 WHERE id = 1 ORDER BY valid_at;
  id |        valid_at         | name  
 ----+-------------------------+-------
-  1 | [2000-01-01,2010-01-01) | one
+  1 | [2000-01-01,2001-01-11) | one^3
+  1 | [2001-01-11,2010-01-01) | one
   1 | [2010-01-01,2010-01-05) | one^1
...

diff -U3 /Users/admin/pgsql/src/test/regress/expected/for_portion_of.out /Users/admin/pgsql/build/testrun/regress/regres...
--- /Users/admin/pgsql/src/test/regress/expected/for_portion_of.out	2026-05-05 07:10:48
+++ /Users/admin/pgsql/build/testrun/regress/regress/results/for_portion_of.out	2026-05-05 07:13:25
@@ -1099,8 +1099,6 @@
   FOR PORTION OF valid_at FROM '2000-01-01' TO '2001-01-11'
   SET name = 'one^3'
   WHERE id = 1;
-ERROR:  new row for relation "for_portion_of_test2" violates check constraint "fpo2_check"
-DETAIL:  Failing row contains (1, [2000-01-01,2001-01-11), one^3).
 ALTER TABLE for_portion_of_test2 DROP CONSTRAINT fpo2_check;
 -- test inserts violating CHECK constraints
 ALTER TABLE for_portion_of_test2
@@ -1115,12 +1113,13 @@
 SELECT * FROM for_portion_of_test2 WHERE id = 1 ORDER BY valid_at;
  id |        valid_at         | name  
 ----+-------------------------+-------
-  1 | [2000-01-01,2010-01-01) | one
+  1 | [2000-01-01,2001-01-11) | one^3
+  1 | [2001-01-11,2010-01-01) | one
   1 | [2010-01-01,2010-01-05) | one^1
...

diff -U3 /Users/admin/pgsql/src/test/regress/expected/for_portion_of.out /Users/admin/pgsql/build/testrun/test_plan_advi...
--- /Users/admin/pgsql/src/test/regress/expected/for_portion_of.out	2026-05-05 07:10:48
+++ /Users/admin/pgsql/build/testrun/test_plan_advice/001_replan_regress/data/results/for_portion_of.out	2026-05-05 07:1...
@@ -1099,8 +1099,6 @@
   FOR PORTION OF valid_at FROM '2000-01-01' TO '2001-01-11'
   SET name = 'one^3'
   WHERE id = 1;
-ERROR:  new row for relation "for_portion_of_test2" violates check constraint "fpo2_check"
-DETAIL:  Failing row contains (1, [2000-01-01,2001-01-11), one^3).
 ALTER TABLE for_portion_of_test2 DROP CONSTRAINT fpo2_check;
 -- test inserts violating CHECK constraints
 ALTER TABLE for_portion_of_test2
@@ -1115,12 +1113,13 @@
 SELECT * FROM for_portion_of_test2 WHERE id = 1 ORDER BY valid_at;
  id |        valid_at         | name  
 ----+-------------------------+-------
-  1 | [2000-01-01,2010-01-01) | one
+  1 | [2000-01-01,2001-01-11) | one^3
+  1 | [2001-01-11,2010-01-01) | one
   1 | [2010-01-01,2010-01-05) | one^1
...

diff --strip-trailing-cr -U3 C:/cirrus/src/test/regress/expected/for_portion_of.out C:/cirrus/build/testrun/pg_upgrade/0...
--- C:/cirrus/src/test/regress/expected/for_portion_of.out	2026-05-05 07:12:28.222315600 +0000
+++ C:/cirrus/build/testrun/pg_upgrade/002_pg_upgrade/data/results/for_portion_of.out	2026-05-05 07:15:51.836766400 +000...
@@ -1099,8 +1099,6 @@
   FOR PORTION OF valid_at FROM '2000-01-01' TO '2001-01-11'
   SET name = 'one^3'
   WHERE id = 1;
-ERROR:  new row for relation "for_portion_of_test2" violates check constraint "fpo2_check"
-DETAIL:  Failing row contains (1, [2000-01-01,2001-01-11), one^3).
 ALTER TABLE for_portion_of_test2 DROP CONSTRAINT fpo2_check;
 -- test inserts violating CHECK constraints
 ALTER TABLE for_portion_of_test2
@@ -1115,12 +1113,13 @@
 SELECT * FROM for_portion_of_test2 WHERE id = 1 ORDER BY valid_at;
  id |        valid_at         | name  
 ----+-------------------------+-------
-  1 | [2000-01-01,2010-01-01) | one
+  1 | [2000-01-01,2001-01-11) | one^3
+  1 | [2001-01-11,2010-01-01) | one
   1 | [2010-01-01,2010-01-05) | one^1
...

diff --strip-trailing-cr -U3 C:/cirrus/src/test/regress/expected/for_portion_of.out C:/cirrus/build/testrun/recovery/027...
--- C:/cirrus/src/test/regress/expected/for_portion_of.out	2026-05-05 07:12:28.222315600 +0000
+++ C:/cirrus/build/testrun/recovery/027_stream_regress/data/results/for_portion_of.out	2026-05-05 07:19:49.775743200 +0...
@@ -1099,8 +1099,6 @@
   FOR PORTION OF valid_at FROM '2000-01-01' TO '2001-01-11'
   SET name = 'one^3'
   WHERE id = 1;
-ERROR:  new row for relation "for_portion_of_test2" violates check constraint "fpo2_check"
-DETAIL:  Failing row contains (1, [2000-01-01,2001-01-11), one^3).
 ALTER TABLE for_portion_of_test2 DROP CONSTRAINT fpo2_check;
 -- test inserts violating CHECK constraints
 ALTER TABLE for_portion_of_test2
@@ -1115,12 +1113,13 @@
 SELECT * FROM for_portion_of_test2 WHERE id = 1 ORDER BY valid_at;
  id |        valid_at         | name  
 ----+-------------------------+-------
-  1 | [2000-01-01,2010-01-01) | one
+  1 | [2000-01-01,2001-01-11) | one^3
+  1 | [2001-01-11,2010-01-01) | one
   1 | [2010-01-01,2010-01-05) | one^1
...

diff --strip-trailing-cr -U3 C:/cirrus/src/test/regress/expected/for_portion_of.out C:/cirrus/build/testrun/regress/regr...
--- C:/cirrus/src/test/regress/expected/for_portion_of.out	2026-05-05 07:12:28.222315600 +0000
+++ C:/cirrus/build/testrun/regress/regress/results/for_portion_of.out	2026-05-05 07:15:37.093581800 +0000
@@ -1099,8 +1099,6 @@
   FOR PORTION OF valid_at FROM '2000-01-01' TO '2001-01-11'
   SET name = 'one^3'
   WHERE id = 1;
-ERROR:  new row for relation "for_portion_of_test2" violates check constraint "fpo2_check"
-DETAIL:  Failing row contains (1, [2000-01-01,2001-01-11), one^3).
 ALTER TABLE for_portion_of_test2 DROP CONSTRAINT fpo2_check;
 -- test inserts violating CHECK constraints
 ALTER TABLE for_portion_of_test2
@@ -1115,12 +1113,13 @@
 SELECT * FROM for_portion_of_test2 WHERE id = 1 ORDER BY valid_at;
  id |        valid_at         | name  
 ----+-------------------------+-------
-  1 | [2000-01-01,2010-01-01) | one
+  1 | [2000-01-01,2001-01-11) | one^3
+  1 | [2001-01-11,2010-01-01) | one
   1 | [2010-01-01,2010-01-05) | one^1
...

diff --strip-trailing-cr -U3 C:/cirrus/src/test/regress/expected/for_portion_of.out C:/cirrus/build/testrun/test_plan_ad...
--- C:/cirrus/src/test/regress/expected/for_portion_of.out	2026-05-05 07:12:28.222315600 +0000
+++ C:/cirrus/build/testrun/test_plan_advice/001_replan_regress/data/results/for_portion_of.out	2026-05-05 07:15:42.1458...
@@ -1099,8 +1099,6 @@
   FOR PORTION OF valid_at FROM '2000-01-01' TO '2001-01-11'
   SET name = 'one^3'
   WHERE id = 1;
-ERROR:  new row for relation "for_portion_of_test2" violates check constraint "fpo2_check"
-DETAIL:  Failing row contains (1, [2000-01-01,2001-01-11), one^3).
 ALTER TABLE for_portion_of_test2 DROP CONSTRAINT fpo2_check;
 -- test inserts violating CHECK constraints
 ALTER TABLE for_portion_of_test2
@@ -1115,12 +1113,13 @@
 SELECT * FROM for_portion_of_test2 WHERE id = 1 ORDER BY valid_at;
  id |        valid_at         | name  
 ----+-------------------------+-------
-  1 | [2000-01-01,2010-01-01) | one
+  1 | [2000-01-01,2001-01-11) | one^3
+  1 | [2001-01-11,2010-01-01) | one
   1 | [2010-01-01,2010-01-05) | one^1
...

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/for_portion_of.out /tmp/cirrus-ci-build/build/testrun/pg_upgrade...
--- /tmp/cirrus-ci-build/src/test/regress/expected/for_portion_of.out	2026-05-05 07:11:09.594871958 +0000
+++ /tmp/cirrus-ci-build/build/testrun/pg_upgrade/002_pg_upgrade/data/results/for_portion_of.out	2026-05-05 07:14:54.484...
@@ -1099,8 +1099,6 @@
   FOR PORTION OF valid_at FROM '2000-01-01' TO '2001-01-11'
   SET name = 'one^3'
   WHERE id = 1;
-ERROR:  new row for relation "for_portion_of_test2" violates check constraint "fpo2_check"
-DETAIL:  Failing row contains (1, [2000-01-01,2001-01-11), one^3).
 ALTER TABLE for_portion_of_test2 DROP CONSTRAINT fpo2_check;
 -- test inserts violating CHECK constraints
 ALTER TABLE for_portion_of_test2
@@ -1115,12 +1113,13 @@
 SELECT * FROM for_portion_of_test2 WHERE id = 1 ORDER BY valid_at;
  id |        valid_at         | name  
 ----+-------------------------+-------
-  1 | [2000-01-01,2010-01-01) | one
+  1 | [2000-01-01,2001-01-11) | one^3
+  1 | [2001-01-11,2010-01-01) | one
   1 | [2010-01-01,2010-01-05) | one^1
...

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/for_portion_of.out /tmp/cirrus-ci-build/build/testrun/recovery/0...
--- /tmp/cirrus-ci-build/src/test/regress/expected/for_portion_of.out	2026-05-05 07:11:09.594871958 +0000
+++ /tmp/cirrus-ci-build/build/testrun/recovery/027_stream_regress/data/results/for_portion_of.out	2026-05-05 07:16:41.8...
@@ -1099,8 +1099,6 @@
   FOR PORTION OF valid_at FROM '2000-01-01' TO '2001-01-11'
   SET name = 'one^3'
   WHERE id = 1;
-ERROR:  new row for relation "for_portion_of_test2" violates check constraint "fpo2_check"
-DETAIL:  Failing row contains (1, [2000-01-01,2001-01-11), one^3).
 ALTER TABLE for_portion_of_test2 DROP CONSTRAINT fpo2_check;
 -- test inserts violating CHECK constraints
 ALTER TABLE for_portion_of_test2
@@ -1115,12 +1113,13 @@
 SELECT * FROM for_portion_of_test2 WHERE id = 1 ORDER BY valid_at;
  id |        valid_at         | name  
 ----+-------------------------+-------
-  1 | [2000-01-01,2010-01-01) | one
+  1 | [2000-01-01,2001-01-11) | one^3
+  1 | [2001-01-11,2010-01-01) | one
   1 | [2010-01-01,2010-01-05) | one^1
...

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/for_portion_of.out /tmp/cirrus-ci-build/build/testrun/regress/re...
--- /tmp/cirrus-ci-build/src/test/regress/expected/for_portion_of.out	2026-05-05 07:11:09.594871958 +0000
+++ /tmp/cirrus-ci-build/build/testrun/regress/regress/results/for_portion_of.out	2026-05-05 07:14:54.676257881 +0000
@@ -1099,8 +1099,6 @@
   FOR PORTION OF valid_at FROM '2000-01-01' TO '2001-01-11'
   SET name = 'one^3'
   WHERE id = 1;
-ERROR:  new row for relation "for_portion_of_test2" violates check constraint "fpo2_check"
-DETAIL:  Failing row contains (1, [2000-01-01,2001-01-11), one^3).
 ALTER TABLE for_portion_of_test2 DROP CONSTRAINT fpo2_check;
 -- test inserts violating CHECK constraints
 ALTER TABLE for_portion_of_test2
@@ -1115,12 +1113,13 @@
 SELECT * FROM for_portion_of_test2 WHERE id = 1 ORDER BY valid_at;
  id |        valid_at         | name  
 ----+-------------------------+-------
-  1 | [2000-01-01,2010-01-01) | one
+  1 | [2000-01-01,2001-01-11) | one^3
+  1 | [2001-01-11,2010-01-01) | one
   1 | [2010-01-01,2010-01-05) | one^1
...

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/for_portion_of.out /tmp/cirrus-ci-build/build/testrun/test_plan_...
--- /tmp/cirrus-ci-build/src/test/regress/expected/for_portion_of.out	2026-05-05 07:11:09.594871958 +0000
+++ /tmp/cirrus-ci-build/build/testrun/test_plan_advice/001_replan_regress/data/results/for_portion_of.out	2026-05-05 07...
@@ -1099,8 +1099,6 @@
   FOR PORTION OF valid_at FROM '2000-01-01' TO '2001-01-11'
   SET name = 'one^3'
   WHERE id = 1;
-ERROR:  new row for relation "for_portion_of_test2" violates check constraint "fpo2_check"
-DETAIL:  Failing row contains (1, [2000-01-01,2001-01-11), one^3).
 ALTER TABLE for_portion_of_test2 DROP CONSTRAINT fpo2_check;
 -- test inserts violating CHECK constraints
 ALTER TABLE for_portion_of_test2
@@ -1115,12 +1113,13 @@
 SELECT * FROM for_portion_of_test2 WHERE id = 1 ORDER BY valid_at;
  id |        valid_at         | name  
 ----+-------------------------+-------
-  1 | [2000-01-01,2010-01-01) | one
+  1 | [2000-01-01,2001-01-11) | one^3
+  1 | [2001-01-11,2010-01-01) | one
   1 | [2010-01-01,2010-01-05) | one^1
...

diff -U3 /home/postgres/postgres/src/test/regress/expected/for_portion_of.out /home/postgres/postgres/build/testrun/pg_u...
--- /home/postgres/postgres/src/test/regress/expected/for_portion_of.out	Tue May  5 07:11:28 2026
+++ /home/postgres/postgres/build/testrun/pg_upgrade/002_pg_upgrade/data/results/for_portion_of.out	Tue May  5 07:14:54 ...
@@ -1099,8 +1099,6 @@
   FOR PORTION OF valid_at FROM '2000-01-01' TO '2001-01-11'
   SET name = 'one^3'
   WHERE id = 1;
-ERROR:  new row for relation "for_portion_of_test2" violates check constraint "fpo2_check"
-DETAIL:  Failing row contains (1, [2000-01-01,2001-01-11), one^3).
 ALTER TABLE for_portion_of_test2 DROP CONSTRAINT fpo2_check;
 -- test inserts violating CHECK constraints
 ALTER TABLE for_portion_of_test2
@@ -1115,12 +1113,13 @@
 SELECT * FROM for_portion_of_test2 WHERE id = 1 ORDER BY valid_at;
  id |        valid_at         | name  
 ----+-------------------------+-------
-  1 | [2000-01-01,2010-01-01) | one
+  1 | [2000-01-01,2001-01-11) | one^3
+  1 | [2001-01-11,2010-01-01) | one
   1 | [2010-01-01,2010-01-05) | one^1
...

diff -U3 /home/postgres/postgres/src/test/regress/expected/for_portion_of.out /home/postgres/postgres/build/testrun/reco...
--- /home/postgres/postgres/src/test/regress/expected/for_portion_of.out	Tue May  5 07:11:28 2026
+++ /home/postgres/postgres/build/testrun/recovery/027_stream_regress/data/results/for_portion_of.out	Tue May  5 07:17:1...
@@ -1099,8 +1099,6 @@
   FOR PORTION OF valid_at FROM '2000-01-01' TO '2001-01-11'
   SET name = 'one^3'
   WHERE id = 1;
-ERROR:  new row for relation "for_portion_of_test2" violates check constraint "fpo2_check"
-DETAIL:  Failing row contains (1, [2000-01-01,2001-01-11), one^3).
 ALTER TABLE for_portion_of_test2 DROP CONSTRAINT fpo2_check;
 -- test inserts violating CHECK constraints
 ALTER TABLE for_portion_of_test2
@@ -1115,12 +1113,13 @@
 SELECT * FROM for_portion_of_test2 WHERE id = 1 ORDER BY valid_at;
  id |        valid_at         | name  
 ----+-------------------------+-------
-  1 | [2000-01-01,2010-01-01) | one
+  1 | [2000-01-01,2001-01-11) | one^3
+  1 | [2001-01-11,2010-01-01) | one
   1 | [2010-01-01,2010-01-05) | one^1
...

diff -U3 /home/postgres/postgres/src/test/regress/expected/for_portion_of.out /home/postgres/postgres/build/testrun/regr...
--- /home/postgres/postgres/src/test/regress/expected/for_portion_of.out	Tue May  5 07:11:28 2026
+++ /home/postgres/postgres/build/testrun/regress/regress/results/for_portion_of.out	Tue May  5 07:14:47 2026
@@ -1099,8 +1099,6 @@
   FOR PORTION OF valid_at FROM '2000-01-01' TO '2001-01-11'
   SET name = 'one^3'
   WHERE id = 1;
-ERROR:  new row for relation "for_portion_of_test2" violates check constraint "fpo2_check"
-DETAIL:  Failing row contains (1, [2000-01-01,2001-01-11), one^3).
 ALTER TABLE for_portion_of_test2 DROP CONSTRAINT fpo2_check;
 -- test inserts violating CHECK constraints
 ALTER TABLE for_portion_of_test2
@@ -1115,12 +1113,13 @@
 SELECT * FROM for_portion_of_test2 WHERE id = 1 ORDER BY valid_at;
  id |        valid_at         | name  
 ----+-------------------------+-------
-  1 | [2000-01-01,2010-01-01) | one
+  1 | [2000-01-01,2001-01-11) | one^3
+  1 | [2001-01-11,2010-01-01) | one
   1 | [2010-01-01,2010-01-05) | one^1
...

diff -U3 /home/postgres/postgres/src/test/regress/expected/for_portion_of.out /home/postgres/postgres/build/testrun/test...
--- /home/postgres/postgres/src/test/regress/expected/for_portion_of.out	Tue May  5 07:11:28 2026
+++ /home/postgres/postgres/build/testrun/test_plan_advice/001_replan_regress/data/results/for_portion_of.out	Tue May  5...
@@ -1099,8 +1099,6 @@
   FOR PORTION OF valid_at FROM '2000-01-01' TO '2001-01-11'
   SET name = 'one^3'
   WHERE id = 1;
-ERROR:  new row for relation "for_portion_of_test2" violates check constraint "fpo2_check"
-DETAIL:  Failing row contains (1, [2000-01-01,2001-01-11), one^3).
 ALTER TABLE for_portion_of_test2 DROP CONSTRAINT fpo2_check;
 -- test inserts violating CHECK constraints
 ALTER TABLE for_portion_of_test2
@@ -1115,12 +1113,13 @@
 SELECT * FROM for_portion_of_test2 WHERE id = 1 ORDER BY valid_at;
  id |        valid_at         | name  
 ----+-------------------------+-------
-  1 | [2000-01-01,2010-01-01) | one
+  1 | [2000-01-01,2001-01-11) | one^3
+  1 | [2001-01-11,2010-01-01) | one
   1 | [2010-01-01,2010-01-05) | one^1
...

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/for_portion_of.out /tmp/cirrus-ci-build/src/bin/pg_upgrade/tmp_c...
--- /tmp/cirrus-ci-build/src/test/regress/expected/for_portion_of.out	2026-05-05 07:12:03.251281978 +0000
+++ /tmp/cirrus-ci-build/src/bin/pg_upgrade/tmp_check/results/for_portion_of.out	2026-05-05 07:19:09.003976079 +0000
@@ -1099,8 +1099,6 @@
   FOR PORTION OF valid_at FROM '2000-01-01' TO '2001-01-11'
   SET name = 'one^3'
   WHERE id = 1;
-ERROR:  new row for relation "for_portion_of_test2" violates check constraint "fpo2_check"
-DETAIL:  Failing row contains (1, [2000-01-01,2001-01-11), one^3).
 ALTER TABLE for_portion_of_test2 DROP CONSTRAINT fpo2_check;
 -- test inserts violating CHECK constraints
 ALTER TABLE for_portion_of_test2
@@ -1115,12 +1113,13 @@
 SELECT * FROM for_portion_of_test2 WHERE id = 1 ORDER BY valid_at;
  id |        valid_at         | name  
 ----+-------------------------+-------
-  1 | [2000-01-01,2010-01-01) | one
+  1 | [2000-01-01,2001-01-11) | one^3
+  1 | [2001-01-11,2010-01-01) | one
   1 | [2010-01-01,2010-01-05) | one^1
...

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/for_portion_of.out /tmp/cirrus-ci-build/src/test/modules/test_pl...
--- /tmp/cirrus-ci-build/src/test/regress/expected/for_portion_of.out	2026-05-05 07:12:03.251281978 +0000
+++ /tmp/cirrus-ci-build/src/test/modules/test_plan_advice/tmp_check/results/for_portion_of.out	2026-05-05 07:20:58.2588...
@@ -1099,8 +1099,6 @@
   FOR PORTION OF valid_at FROM '2000-01-01' TO '2001-01-11'
   SET name = 'one^3'
   WHERE id = 1;
-ERROR:  new row for relation "for_portion_of_test2" violates check constraint "fpo2_check"
-DETAIL:  Failing row contains (1, [2000-01-01,2001-01-11), one^3).
 ALTER TABLE for_portion_of_test2 DROP CONSTRAINT fpo2_check;
 -- test inserts violating CHECK constraints
 ALTER TABLE for_portion_of_test2
@@ -1115,12 +1113,13 @@
 SELECT * FROM for_portion_of_test2 WHERE id = 1 ORDER BY valid_at;
  id |        valid_at         | name  
 ----+-------------------------+-------
-  1 | [2000-01-01,2010-01-01) | one
+  1 | [2000-01-01,2001-01-11) | one^3
+  1 | [2001-01-11,2010-01-01) | one
   1 | [2010-01-01,2010-01-05) | one^1
...

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/for_portion_of.out /tmp/cirrus-ci-build/src/test/recovery/tmp_ch...
--- /tmp/cirrus-ci-build/src/test/regress/expected/for_portion_of.out	2026-05-05 07:12:03.251281978 +0000
+++ /tmp/cirrus-ci-build/src/test/recovery/tmp_check/results/for_portion_of.out	2026-05-05 07:20:40.450907440 +0000
@@ -1099,8 +1099,6 @@
   FOR PORTION OF valid_at FROM '2000-01-01' TO '2001-01-11'
   SET name = 'one^3'
   WHERE id = 1;
-ERROR:  new row for relation "for_portion_of_test2" violates check constraint "fpo2_check"
-DETAIL:  Failing row contains (1, [2000-01-01,2001-01-11), one^3).
 ALTER TABLE for_portion_of_test2 DROP CONSTRAINT fpo2_check;
 -- test inserts violating CHECK constraints
 ALTER TABLE for_portion_of_test2
@@ -1115,12 +1113,13 @@
 SELECT * FROM for_portion_of_test2 WHERE id = 1 ORDER BY valid_at;
  id |        valid_at         | name  
 ----+-------------------------+-------
-  1 | [2000-01-01,2010-01-01) | one
+  1 | [2000-01-01,2001-01-11) | one^3
+  1 | [2001-01-11,2010-01-01) | one
   1 | [2010-01-01,2010-01-05) | one^1
...

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/for_portion_of.out /tmp/cirrus-ci-build/src/test/regress/results...
--- /tmp/cirrus-ci-build/src/test/regress/expected/for_portion_of.out	2026-05-05 07:12:03.251281978 +0000
+++ /tmp/cirrus-ci-build/src/test/regress/results/for_portion_of.out	2026-05-05 07:16:50.062217867 +0000
@@ -1099,8 +1099,6 @@
   FOR PORTION OF valid_at FROM '2000-01-01' TO '2001-01-11'
   SET name = 'one^3'
   WHERE id = 1;
-ERROR:  new row for relation "for_portion_of_test2" violates check constraint "fpo2_check"
-DETAIL:  Failing row contains (1, [2000-01-01,2001-01-11), one^3).
 ALTER TABLE for_portion_of_test2 DROP CONSTRAINT fpo2_check;
 -- test inserts violating CHECK constraints
 ALTER TABLE for_portion_of_test2
@@ -1115,12 +1113,13 @@
 SELECT * FROM for_portion_of_test2 WHERE id = 1 ORDER BY valid_at;
  id |        valid_at         | name  
 ----+-------------------------+-------
-  1 | [2000-01-01,2010-01-01) | one
+  1 | [2000-01-01,2001-01-11) | one^3
+  1 | [2001-01-11,2010-01-01) | one
   1 | [2010-01-01,2010-01-05) | one^1
...

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/for_portion_of.out /tmp/cirrus-ci-build/build/testrun/pg_upgrade...
--- /tmp/cirrus-ci-build/src/test/regress/expected/for_portion_of.out	2026-05-05 07:11:03.195678000 +0000
+++ /tmp/cirrus-ci-build/build/testrun/pg_upgrade/002_pg_upgrade/data/results/for_portion_of.out	2026-05-05 07:13:14.356...
@@ -1099,8 +1099,6 @@
   FOR PORTION OF valid_at FROM '2000-01-01' TO '2001-01-11'
   SET name = 'one^3'
   WHERE id = 1;
-ERROR:  new row for relation "for_portion_of_test2" violates check constraint "fpo2_check"
-DETAIL:  Failing row contains (1, [2000-01-01,2001-01-11), one^3).
 ALTER TABLE for_portion_of_test2 DROP CONSTRAINT fpo2_check;
 -- test inserts violating CHECK constraints
 ALTER TABLE for_portion_of_test2
@@ -1115,12 +1113,13 @@
 SELECT * FROM for_portion_of_test2 WHERE id = 1 ORDER BY valid_at;
  id |        valid_at         | name  
 ----+-------------------------+-------
-  1 | [2000-01-01,2010-01-01) | one
+  1 | [2000-01-01,2001-01-11) | one^3
+  1 | [2001-01-11,2010-01-01) | one
   1 | [2010-01-01,2010-01-05) | one^1
...

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/for_portion_of.out /tmp/cirrus-ci-build/build/testrun/recovery/0...
--- /tmp/cirrus-ci-build/src/test/regress/expected/for_portion_of.out	2026-05-05 07:11:03.195678000 +0000
+++ /tmp/cirrus-ci-build/build/testrun/recovery/027_stream_regress/data/results/for_portion_of.out	2026-05-05 07:14:37.3...
@@ -1099,8 +1099,6 @@
   FOR PORTION OF valid_at FROM '2000-01-01' TO '2001-01-11'
   SET name = 'one^3'
   WHERE id = 1;
-ERROR:  new row for relation "for_portion_of_test2" violates check constraint "fpo2_check"
-DETAIL:  Failing row contains (1, [2000-01-01,2001-01-11), one^3).
 ALTER TABLE for_portion_of_test2 DROP CONSTRAINT fpo2_check;
 -- test inserts violating CHECK constraints
 ALTER TABLE for_portion_of_test2
@@ -1115,12 +1113,13 @@
 SELECT * FROM for_portion_of_test2 WHERE id = 1 ORDER BY valid_at;
  id |        valid_at         | name  
 ----+-------------------------+-------
-  1 | [2000-01-01,2010-01-01) | one
+  1 | [2000-01-01,2001-01-11) | one^3
+  1 | [2001-01-11,2010-01-01) | one
   1 | [2010-01-01,2010-01-05) | one^1
...

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/for_portion_of.out /tmp/cirrus-ci-build/build/testrun/regress/re...
--- /tmp/cirrus-ci-build/src/test/regress/expected/for_portion_of.out	2026-05-05 07:11:03.195678000 +0000
+++ /tmp/cirrus-ci-build/build/testrun/regress/regress/results/for_portion_of.out	2026-05-05 07:13:15.914564000 +0000
@@ -1099,8 +1099,6 @@
   FOR PORTION OF valid_at FROM '2000-01-01' TO '2001-01-11'
   SET name = 'one^3'
   WHERE id = 1;
-ERROR:  new row for relation "for_portion_of_test2" violates check constraint "fpo2_check"
-DETAIL:  Failing row contains (1, [2000-01-01,2001-01-11), one^3).
 ALTER TABLE for_portion_of_test2 DROP CONSTRAINT fpo2_check;
 -- test inserts violating CHECK constraints
 ALTER TABLE for_portion_of_test2
@@ -1115,12 +1113,13 @@
 SELECT * FROM for_portion_of_test2 WHERE id = 1 ORDER BY valid_at;
  id |        valid_at         | name  
 ----+-------------------------+-------
-  1 | [2000-01-01,2010-01-01) | one
+  1 | [2000-01-01,2001-01-11) | one^3
+  1 | [2001-01-11,2010-01-01) | one
   1 | [2010-01-01,2010-01-05) | one^1
...

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/for_portion_of.out /tmp/cirrus-ci-build/build/testrun/test_plan_...
--- /tmp/cirrus-ci-build/src/test/regress/expected/for_portion_of.out	2026-05-05 07:11:03.195678000 +0000
+++ /tmp/cirrus-ci-build/build/testrun/test_plan_advice/001_replan_regress/data/results/for_portion_of.out	2026-05-05 07...
@@ -1099,8 +1099,6 @@
   FOR PORTION OF valid_at FROM '2000-01-01' TO '2001-01-11'
   SET name = 'one^3'
   WHERE id = 1;
-ERROR:  new row for relation "for_portion_of_test2" violates check constraint "fpo2_check"
-DETAIL:  Failing row contains (1, [2000-01-01,2001-01-11), one^3).
 ALTER TABLE for_portion_of_test2 DROP CONSTRAINT fpo2_check;
 -- test inserts violating CHECK constraints
 ALTER TABLE for_portion_of_test2
@@ -1115,12 +1113,13 @@
 SELECT * FROM for_portion_of_test2 WHERE id = 1 ORDER BY valid_at;
  id |        valid_at         | name  
 ----+-------------------------+-------
-  1 | [2000-01-01,2010-01-01) | one
+  1 | [2000-01-01,2001-01-11) | one^3
+  1 | [2001-01-11,2010-01-01) | one
   1 | [2010-01-01,2010-01-05) | one^1
...

diff -U3 /home/postgres/postgres/src/test/regress/expected/for_portion_of.out /home/postgres/postgres/build/testrun/pg_u...
--- /home/postgres/postgres/src/test/regress/expected/for_portion_of.out	2026-05-05 07:12:29.328544742 +0000
+++ /home/postgres/postgres/build/testrun/pg_upgrade/002_pg_upgrade/data/results/for_portion_of.out	2026-05-05 07:14:56....
@@ -1099,8 +1099,6 @@
   FOR PORTION OF valid_at FROM '2000-01-01' TO '2001-01-11'
   SET name = 'one^3'
   WHERE id = 1;
-ERROR:  new row for relation "for_portion_of_test2" violates check constraint "fpo2_check"
-DETAIL:  Failing row contains (1, [2000-01-01,2001-01-11), one^3).
 ALTER TABLE for_portion_of_test2 DROP CONSTRAINT fpo2_check;
 -- test inserts violating CHECK constraints
 ALTER TABLE for_portion_of_test2
@@ -1115,12 +1113,13 @@
 SELECT * FROM for_portion_of_test2 WHERE id = 1 ORDER BY valid_at;
  id |        valid_at         | name  
 ----+-------------------------+-------
-  1 | [2000-01-01,2010-01-01) | one
+  1 | [2000-01-01,2001-01-11) | one^3
+  1 | [2001-01-11,2010-01-01) | one
   1 | [2010-01-01,2010-01-05) | one^1
...

diff -U3 /home/postgres/postgres/src/test/regress/expected/for_portion_of.out /home/postgres/postgres/build/testrun/reco...
--- /home/postgres/postgres/src/test/regress/expected/for_portion_of.out	2026-05-05 07:12:29.328544742 +0000
+++ /home/postgres/postgres/build/testrun/recovery/027_stream_regress/data/results/for_portion_of.out	2026-05-05 07:15:4...
@@ -1099,8 +1099,6 @@
   FOR PORTION OF valid_at FROM '2000-01-01' TO '2001-01-11'
   SET name = 'one^3'
   WHERE id = 1;
-ERROR:  new row for relation "for_portion_of_test2" violates check constraint "fpo2_check"
-DETAIL:  Failing row contains (1, [2000-01-01,2001-01-11), one^3).
 ALTER TABLE for_portion_of_test2 DROP CONSTRAINT fpo2_check;
 -- test inserts violating CHECK constraints
 ALTER TABLE for_portion_of_test2
@@ -1115,12 +1113,13 @@
 SELECT * FROM for_portion_of_test2 WHERE id = 1 ORDER BY valid_at;
  id |        valid_at         | name  
 ----+-------------------------+-------
-  1 | [2000-01-01,2010-01-01) | one
+  1 | [2000-01-01,2001-01-11) | one^3
+  1 | [2001-01-11,2010-01-01) | one
   1 | [2010-01-01,2010-01-05) | one^1
...

diff -U3 /home/postgres/postgres/src/test/regress/expected/for_portion_of.out /home/postgres/postgres/build/testrun/regr...
--- /home/postgres/postgres/src/test/regress/expected/for_portion_of.out	2026-05-05 07:12:29.328544742 +0000
+++ /home/postgres/postgres/build/testrun/regress/regress/results/for_portion_of.out	2026-05-05 07:14:56.619044013 +0000
@@ -1099,8 +1099,6 @@
   FOR PORTION OF valid_at FROM '2000-01-01' TO '2001-01-11'
   SET name = 'one^3'
   WHERE id = 1;
-ERROR:  new row for relation "for_portion_of_test2" violates check constraint "fpo2_check"
-DETAIL:  Failing row contains (1, [2000-01-01,2001-01-11), one^3).
 ALTER TABLE for_portion_of_test2 DROP CONSTRAINT fpo2_check;
 -- test inserts violating CHECK constraints
 ALTER TABLE for_portion_of_test2
@@ -1115,12 +1113,13 @@
 SELECT * FROM for_portion_of_test2 WHERE id = 1 ORDER BY valid_at;
  id |        valid_at         | name  
 ----+-------------------------+-------
-  1 | [2000-01-01,2010-01-01) | one
+  1 | [2000-01-01,2001-01-11) | one^3
+  1 | [2001-01-11,2010-01-01) | one
   1 | [2010-01-01,2010-01-05) | one^1
...

diff -U3 /home/postgres/postgres/src/test/regress/expected/for_portion_of.out /home/postgres/postgres/build/testrun/test...
--- /home/postgres/postgres/src/test/regress/expected/for_portion_of.out	2026-05-05 07:12:29.328544742 +0000
+++ /home/postgres/postgres/build/testrun/test_plan_advice/001_replan_regress/data/results/for_portion_of.out	2026-05-05...
@@ -1099,8 +1099,6 @@
   FOR PORTION OF valid_at FROM '2000-01-01' TO '2001-01-11'
   SET name = 'one^3'
   WHERE id = 1;
-ERROR:  new row for relation "for_portion_of_test2" violates check constraint "fpo2_check"
-DETAIL:  Failing row contains (1, [2000-01-01,2001-01-11), one^3).
 ALTER TABLE for_portion_of_test2 DROP CONSTRAINT fpo2_check;
 -- test inserts violating CHECK constraints
 ALTER TABLE for_portion_of_test2
@@ -1115,12 +1113,13 @@
 SELECT * FROM for_portion_of_test2 WHERE id = 1 ORDER BY valid_at;
  id |        valid_at         | name  
 ----+-------------------------+-------
-  1 | [2000-01-01,2010-01-01) | one
+  1 | [2000-01-01,2001-01-11) | one^3
+  1 | [2001-01-11,2010-01-01) | one
   1 | [2010-01-01,2010-01-05) | one^1
...

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/union.out /tmp/cirrus-ci-build/build/testrun/recovery/027_stream...
--- /tmp/cirrus-ci-build/src/test/regress/expected/union.out	2026-05-04 11:33:35.379872000 +0000
+++ /tmp/cirrus-ci-build/build/testrun/recovery/027_stream_regress/data/results/union.out	2026-05-04 11:37:15.586826000 ...
@@ -550,9 +550,9 @@
 select x from (values (array[1, 2]), (array[1, 3])) _(x) union select x from (values (array[1, 2]), (array[1, 4])) _(x)...
    x   
 -------
+ {1,2}
  {1,4}
  {1,3}
- {1,2}
 (3 rows)
 
 explain (costs off)

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	2026-05-03 07:41:03.831515400 +0000
+++ C:/cirrus/build/testrun/pg_upgrade/002_pg_upgrade/data/results/generated_virtual.out	2026-05-03 07:45:12.669426200 +...
@@ -1154,9 +1154,10 @@
  f2     | bigint |           |          |                              | plain   |              | 
  f3     | bigint |           |          | generated always as (f2 * 2) | plain   |              | 
 Partition key: RANGE (f3)
-Partitions: gtest_part_key1_0 FOR VALUES FROM ('20') TO ('30'),
-            gtest_part_key1_1 FOR VALUES FROM ('30') TO ('50'),
-            gtest_part_key1_2 FOR VALUES FROM ('50') TO ('100')
+Partitions:
+    gtest_part_key1_0 FOR VALUES FROM ('20') TO ('30')
+    gtest_part_key1_1 FOR VALUES FROM ('30') TO ('50')
+    gtest_part_key1_2 FOR VALUES FROM ('50') TO ('100')
 
 INSERT INTO gtest_part_key1(f2) VALUES (9);     -- error
 ERROR:  no partition of relation "gtest_part_key1" found for row

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	2026-05-03 07:41:03.831515400 +0000
+++ C:/cirrus/build/testrun/recovery/027_stream_regress/data/results/generated_virtual.out	2026-05-03 07:49:15.916023400...
@@ -1154,9 +1154,10 @@
  f2     | bigint |           |          |                              | plain   |              | 
  f3     | bigint |           |          | generated always as (f2 * 2) | plain   |              | 
 Partition key: RANGE (f3)
-Partitions: gtest_part_key1_0 FOR VALUES FROM ('20') TO ('30'),
-            gtest_part_key1_1 FOR VALUES FROM ('30') TO ('50'),
-            gtest_part_key1_2 FOR VALUES FROM ('50') TO ('100')
+Partitions:
+    gtest_part_key1_0 FOR VALUES FROM ('20') TO ('30')
+    gtest_part_key1_1 FOR VALUES FROM ('30') TO ('50')
+    gtest_part_key1_2 FOR VALUES FROM ('50') TO ('100')
 
 INSERT INTO gtest_part_key1(f2) VALUES (9);     -- error
 ERROR:  no partition of relation "gtest_part_key1" found for row

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	2026-05-03 07:41:03.831515400 +0000
+++ C:/cirrus/build/testrun/regress/regress/results/generated_virtual.out	2026-05-03 07:45:05.280775600 +0000
@@ -1154,9 +1154,10 @@
  f2     | bigint |           |          |                              | plain   |              | 
  f3     | bigint |           |          | generated always as (f2 * 2) | plain   |              | 
 Partition key: RANGE (f3)
-Partitions: gtest_part_key1_0 FOR VALUES FROM ('20') TO ('30'),
-            gtest_part_key1_1 FOR VALUES FROM ('30') TO ('50'),
-            gtest_part_key1_2 FOR VALUES FROM ('50') TO ('100')
+Partitions:
+    gtest_part_key1_0 FOR VALUES FROM ('20') TO ('30')
+    gtest_part_key1_1 FOR VALUES FROM ('30') TO ('50')
+    gtest_part_key1_2 FOR VALUES FROM ('50') TO ('100')
 
 INSERT INTO gtest_part_key1(f2) VALUES (9);     -- error
 ERROR:  no partition of relation "gtest_part_key1" found for row

diff --strip-trailing-cr -U3 C:/cirrus/src/test/regress/expected/generated_virtual.out C:/cirrus/build/testrun/test_plan...
--- C:/cirrus/src/test/regress/expected/generated_virtual.out	2026-05-03 07:41:03.831515400 +0000
+++ C:/cirrus/build/testrun/test_plan_advice/001_replan_regress/data/results/generated_virtual.out	2026-05-03 07:45:08.1...
@@ -1154,9 +1154,10 @@
  f2     | bigint |           |          |                              | plain   |              | 
  f3     | bigint |           |          | generated always as (f2 * 2) | plain   |              | 
 Partition key: RANGE (f3)
-Partitions: gtest_part_key1_0 FOR VALUES FROM ('20') TO ('30'),
-            gtest_part_key1_1 FOR VALUES FROM ('30') TO ('50'),
-            gtest_part_key1_2 FOR VALUES FROM ('50') TO ('100')
+Partitions:
+    gtest_part_key1_0 FOR VALUES FROM ('20') TO ('30')
+    gtest_part_key1_1 FOR VALUES FROM ('30') TO ('50')
+    gtest_part_key1_2 FOR VALUES FROM ('50') TO ('100')
 
 INSERT INTO gtest_part_key1(f2) VALUES (9);     -- error
 ERROR:  no partition of relation "gtest_part_key1" found for row

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	2026-05-03 07:40:57.065096072 +0000
+++ /tmp/cirrus-ci-build/build/testrun/pg_upgrade/002_pg_upgrade/data/results/generated_virtual.out	2026-05-03 07:45:38....
@@ -1154,9 +1154,10 @@
  f2     | bigint |           |          |                              | plain   |              | 
  f3     | bigint |           |          | generated always as (f2 * 2) | plain   |              | 
 Partition key: RANGE (f3)
-Partitions: gtest_part_key1_0 FOR VALUES FROM ('20') TO ('30'),
-            gtest_part_key1_1 FOR VALUES FROM ('30') TO ('50'),
-            gtest_part_key1_2 FOR VALUES FROM ('50') TO ('100')
+Partitions:
+    gtest_part_key1_0 FOR VALUES FROM ('20') TO ('30')
+    gtest_part_key1_1 FOR VALUES FROM ('30') TO ('50')
+    gtest_part_key1_2 FOR VALUES FROM ('50') TO ('100')
 
 INSERT INTO gtest_part_key1(f2) VALUES (9);     -- error
 ERROR:  no partition of relation "gtest_part_key1" found for row

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	2026-05-03 07:40:57.065096072 +0000
+++ /tmp/cirrus-ci-build/build/testrun/recovery/027_stream_regress/data/results/generated_virtual.out	2026-05-03 07:47:1...
@@ -1154,9 +1154,10 @@
  f2     | bigint |           |          |                              | plain   |              | 
  f3     | bigint |           |          | generated always as (f2 * 2) | plain   |              | 
 Partition key: RANGE (f3)
-Partitions: gtest_part_key1_0 FOR VALUES FROM ('20') TO ('30'),
-            gtest_part_key1_1 FOR VALUES FROM ('30') TO ('50'),
-            gtest_part_key1_2 FOR VALUES FROM ('50') TO ('100')
+Partitions:
+    gtest_part_key1_0 FOR VALUES FROM ('20') TO ('30')
+    gtest_part_key1_1 FOR VALUES FROM ('30') TO ('50')
+    gtest_part_key1_2 FOR VALUES FROM ('50') TO ('100')
 
 INSERT INTO gtest_part_key1(f2) VALUES (9);     -- error
 ERROR:  no partition of relation "gtest_part_key1" found for row

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	2026-05-03 07:40:57.065096072 +0000
+++ /tmp/cirrus-ci-build/build/testrun/regress/regress/results/generated_virtual.out	2026-05-03 07:45:36.936387384 +0000
@@ -1154,9 +1154,10 @@
  f2     | bigint |           |          |                              | plain   |              | 
  f3     | bigint |           |          | generated always as (f2 * 2) | plain   |              | 
 Partition key: RANGE (f3)
-Partitions: gtest_part_key1_0 FOR VALUES FROM ('20') TO ('30'),
-            gtest_part_key1_1 FOR VALUES FROM ('30') TO ('50'),
-            gtest_part_key1_2 FOR VALUES FROM ('50') TO ('100')
+Partitions:
+    gtest_part_key1_0 FOR VALUES FROM ('20') TO ('30')
+    gtest_part_key1_1 FOR VALUES FROM ('30') TO ('50')
+    gtest_part_key1_2 FOR VALUES FROM ('50') TO ('100')
 
 INSERT INTO gtest_part_key1(f2) VALUES (9);     -- error
 ERROR:  no partition of relation "gtest_part_key1" found for row

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/generated_virtual.out /tmp/cirrus-ci-build/build/testrun/test_pl...
--- /tmp/cirrus-ci-build/src/test/regress/expected/generated_virtual.out	2026-05-03 07:40:57.065096072 +0000
+++ /tmp/cirrus-ci-build/build/testrun/test_plan_advice/001_replan_regress/data/results/generated_virtual.out	2026-05-03...
@@ -1154,9 +1154,10 @@
  f2     | bigint |           |          |                              | plain   |              | 
  f3     | bigint |           |          | generated always as (f2 * 2) | plain   |              | 
 Partition key: RANGE (f3)
-Partitions: gtest_part_key1_0 FOR VALUES FROM ('20') TO ('30'),
-            gtest_part_key1_1 FOR VALUES FROM ('30') TO ('50'),
-            gtest_part_key1_2 FOR VALUES FROM ('50') TO ('100')
+Partitions:
+    gtest_part_key1_0 FOR VALUES FROM ('20') TO ('30')
+    gtest_part_key1_1 FOR VALUES FROM ('30') TO ('50')
+    gtest_part_key1_2 FOR VALUES FROM ('50') TO ('100')
 
 INSERT INTO gtest_part_key1(f2) VALUES (9);     -- error
 ERROR:  no partition of relation "gtest_part_key1" found for row

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	2026-05-03 07:41:02
+++ /Users/admin/pgsql/build/testrun/pg_upgrade/002_pg_upgrade/data/results/generated_virtual.out	2026-05-03 07:45:57
@@ -1154,9 +1154,10 @@
  f2     | bigint |           |          |                              | plain   |              | 
  f3     | bigint |           |          | generated always as (f2 * 2) | plain   |              | 
 Partition key: RANGE (f3)
-Partitions: gtest_part_key1_0 FOR VALUES FROM ('20') TO ('30'),
-            gtest_part_key1_1 FOR VALUES FROM ('30') TO ('50'),
-            gtest_part_key1_2 FOR VALUES FROM ('50') TO ('100')
+Partitions:
+    gtest_part_key1_0 FOR VALUES FROM ('20') TO ('30')
+    gtest_part_key1_1 FOR VALUES FROM ('30') TO ('50')
+    gtest_part_key1_2 FOR VALUES FROM ('50') TO ('100')
 
 INSERT INTO gtest_part_key1(f2) VALUES (9);     -- error
 ERROR:  no partition of relation "gtest_part_key1" found for row

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	2026-05-03 07:41:02
+++ /Users/admin/pgsql/build/testrun/recovery/027_stream_regress/data/results/generated_virtual.out	2026-05-03 07:48:49
@@ -1154,9 +1154,10 @@
  f2     | bigint |           |          |                              | plain   |              | 
  f3     | bigint |           |          | generated always as (f2 * 2) | plain   |              | 
 Partition key: RANGE (f3)
-Partitions: gtest_part_key1_0 FOR VALUES FROM ('20') TO ('30'),
-            gtest_part_key1_1 FOR VALUES FROM ('30') TO ('50'),
-            gtest_part_key1_2 FOR VALUES FROM ('50') TO ('100')
+Partitions:
+    gtest_part_key1_0 FOR VALUES FROM ('20') TO ('30')
+    gtest_part_key1_1 FOR VALUES FROM ('30') TO ('50')
+    gtest_part_key1_2 FOR VALUES FROM ('50') TO ('100')
 
 INSERT INTO gtest_part_key1(f2) VALUES (9);     -- error
 ERROR:  no partition of relation "gtest_part_key1" found for row

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	2026-05-03 07:41:02
+++ /Users/admin/pgsql/build/testrun/regress/regress/results/generated_virtual.out	2026-05-03 07:45:46
@@ -1154,9 +1154,10 @@
  f2     | bigint |           |          |                              | plain   |              | 
  f3     | bigint |           |          | generated always as (f2 * 2) | plain   |              | 
 Partition key: RANGE (f3)
-Partitions: gtest_part_key1_0 FOR VALUES FROM ('20') TO ('30'),
-            gtest_part_key1_1 FOR VALUES FROM ('30') TO ('50'),
-            gtest_part_key1_2 FOR VALUES FROM ('50') TO ('100')
+Partitions:
+    gtest_part_key1_0 FOR VALUES FROM ('20') TO ('30')
+    gtest_part_key1_1 FOR VALUES FROM ('30') TO ('50')
+    gtest_part_key1_2 FOR VALUES FROM ('50') TO ('100')
 
 INSERT INTO gtest_part_key1(f2) VALUES (9);     -- error
 ERROR:  no partition of relation "gtest_part_key1" found for row

diff -U3 /Users/admin/pgsql/src/test/regress/expected/generated_virtual.out /Users/admin/pgsql/build/testrun/test_plan_a...
--- /Users/admin/pgsql/src/test/regress/expected/generated_virtual.out	2026-05-03 07:41:02
+++ /Users/admin/pgsql/build/testrun/test_plan_advice/001_replan_regress/data/results/generated_virtual.out	2026-05-03 0...
@@ -1154,9 +1154,10 @@
  f2     | bigint |           |          |                              | plain   |              | 
  f3     | bigint |           |          | generated always as (f2 * 2) | plain   |              | 
 Partition key: RANGE (f3)
-Partitions: gtest_part_key1_0 FOR VALUES FROM ('20') TO ('30'),
-            gtest_part_key1_1 FOR VALUES FROM ('30') TO ('50'),
-            gtest_part_key1_2 FOR VALUES FROM ('50') TO ('100')
+Partitions:
+    gtest_part_key1_0 FOR VALUES FROM ('20') TO ('30')
+    gtest_part_key1_1 FOR VALUES FROM ('30') TO ('50')
+    gtest_part_key1_2 FOR VALUES FROM ('50') TO ('100')
 
 INSERT INTO gtest_part_key1(f2) VALUES (9);     -- error
 ERROR:  no partition of relation "gtest_part_key1" found for row

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	2026-05-03 07:40:57.063863157 +0000
+++ /tmp/cirrus-ci-build/src/bin/pg_upgrade/tmp_check/results/generated_virtual.out	2026-05-03 07:49:48.390548551 +0000
@@ -1154,9 +1154,10 @@
  f2     | bigint |           |          |                              | plain   |              | 
  f3     | bigint |           |          | generated always as (f2 * 2) | plain   |              | 
 Partition key: RANGE (f3)
-Partitions: gtest_part_key1_0 FOR VALUES FROM ('20') TO ('30'),
-            gtest_part_key1_1 FOR VALUES FROM ('30') TO ('50'),
-            gtest_part_key1_2 FOR VALUES FROM ('50') TO ('100')
+Partitions:
+    gtest_part_key1_0 FOR VALUES FROM ('20') TO ('30')
+    gtest_part_key1_1 FOR VALUES FROM ('30') TO ('50')
+    gtest_part_key1_2 FOR VALUES FROM ('50') TO ('100')
 
 INSERT INTO gtest_part_key1(f2) VALUES (9);     -- error
 ERROR:  no partition of relation "gtest_part_key1" found for row

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/generated_virtual.out /tmp/cirrus-ci-build/src/test/modules/test...
--- /tmp/cirrus-ci-build/src/test/regress/expected/generated_virtual.out	2026-05-03 07:40:57.063863157 +0000
+++ /tmp/cirrus-ci-build/src/test/modules/test_plan_advice/tmp_check/results/generated_virtual.out	2026-05-03 07:52:13.1...
@@ -1154,9 +1154,10 @@
  f2     | bigint |           |          |                              | plain   |              | 
  f3     | bigint |           |          | generated always as (f2 * 2) | plain   |              | 
 Partition key: RANGE (f3)
-Partitions: gtest_part_key1_0 FOR VALUES FROM ('20') TO ('30'),
-            gtest_part_key1_1 FOR VALUES FROM ('30') TO ('50'),
-            gtest_part_key1_2 FOR VALUES FROM ('50') TO ('100')
+Partitions:
+    gtest_part_key1_0 FOR VALUES FROM ('20') TO ('30')
+    gtest_part_key1_1 FOR VALUES FROM ('30') TO ('50')
+    gtest_part_key1_2 FOR VALUES FROM ('50') TO ('100')
 
 INSERT INTO gtest_part_key1(f2) VALUES (9);     -- error
 ERROR:  no partition of relation "gtest_part_key1" found for row

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	2026-05-03 07:40:57.063863157 +0000
+++ /tmp/cirrus-ci-build/src/test/recovery/tmp_check/results/generated_virtual.out	2026-05-03 07:51:54.406346782 +0000
@@ -1154,9 +1154,10 @@
  f2     | bigint |           |          |                              | plain   |              | 
  f3     | bigint |           |          | generated always as (f2 * 2) | plain   |              | 
 Partition key: RANGE (f3)
-Partitions: gtest_part_key1_0 FOR VALUES FROM ('20') TO ('30'),
-            gtest_part_key1_1 FOR VALUES FROM ('30') TO ('50'),
-            gtest_part_key1_2 FOR VALUES FROM ('50') TO ('100')
+Partitions:
+    gtest_part_key1_0 FOR VALUES FROM ('20') TO ('30')
+    gtest_part_key1_1 FOR VALUES FROM ('30') TO ('50')
+    gtest_part_key1_2 FOR VALUES FROM ('50') TO ('100')
 
 INSERT INTO gtest_part_key1(f2) VALUES (9);     -- error
 ERROR:  no partition of relation "gtest_part_key1" found for row

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	2026-05-03 07:40:57.063863157 +0000
+++ /tmp/cirrus-ci-build/src/test/regress/results/generated_virtual.out	2026-05-03 07:46:59.157855013 +0000
@@ -1154,9 +1154,10 @@
  f2     | bigint |           |          |                              | plain   |              | 
  f3     | bigint |           |          | generated always as (f2 * 2) | plain   |              | 
 Partition key: RANGE (f3)
-Partitions: gtest_part_key1_0 FOR VALUES FROM ('20') TO ('30'),
-            gtest_part_key1_1 FOR VALUES FROM ('30') TO ('50'),
-            gtest_part_key1_2 FOR VALUES FROM ('50') TO ('100')
+Partitions:
+    gtest_part_key1_0 FOR VALUES FROM ('20') TO ('30')
+    gtest_part_key1_1 FOR VALUES FROM ('30') TO ('50')
+    gtest_part_key1_2 FOR VALUES FROM ('50') TO ('100')
 
 INSERT INTO gtest_part_key1(f2) VALUES (9);     -- error
 ERROR:  no partition of relation "gtest_part_key1" found for row

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	Sun May  3 07:41:12 2026
+++ /home/postgres/postgres/build/testrun/pg_upgrade/002_pg_upgrade/data/results/generated_virtual.out	Sun May  3 07:45:...
@@ -1154,9 +1154,10 @@
  f2     | bigint |           |          |                              | plain   |              | 
  f3     | bigint |           |          | generated always as (f2 * 2) | plain   |              | 
 Partition key: RANGE (f3)
-Partitions: gtest_part_key1_0 FOR VALUES FROM ('20') TO ('30'),
-            gtest_part_key1_1 FOR VALUES FROM ('30') TO ('50'),
-            gtest_part_key1_2 FOR VALUES FROM ('50') TO ('100')
+Partitions:
+    gtest_part_key1_0 FOR VALUES FROM ('20') TO ('30')
+    gtest_part_key1_1 FOR VALUES FROM ('30') TO ('50')
+    gtest_part_key1_2 FOR VALUES FROM ('50') TO ('100')
 
 INSERT INTO gtest_part_key1(f2) VALUES (9);     -- error
 ERROR:  no partition of relation "gtest_part_key1" found for row

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	Sun May  3 07:41:12 2026
+++ /home/postgres/postgres/build/testrun/recovery/027_stream_regress/data/results/generated_virtual.out	Sun May  3 07:4...
@@ -1154,9 +1154,10 @@
  f2     | bigint |           |          |                              | plain   |              | 
  f3     | bigint |           |          | generated always as (f2 * 2) | plain   |              | 
 Partition key: RANGE (f3)
-Partitions: gtest_part_key1_0 FOR VALUES FROM ('20') TO ('30'),
-            gtest_part_key1_1 FOR VALUES FROM ('30') TO ('50'),
-            gtest_part_key1_2 FOR VALUES FROM ('50') TO ('100')
+Partitions:
+    gtest_part_key1_0 FOR VALUES FROM ('20') TO ('30')
+    gtest_part_key1_1 FOR VALUES FROM ('30') TO ('50')
+    gtest_part_key1_2 FOR VALUES FROM ('50') TO ('100')
 
 INSERT INTO gtest_part_key1(f2) VALUES (9);     -- error
 ERROR:  no partition of relation "gtest_part_key1" found for row

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	Sun May  3 07:41:12 2026
+++ /home/postgres/postgres/build/testrun/regress/regress/results/generated_virtual.out	Sun May  3 07:45:19 2026
@@ -1154,9 +1154,10 @@
  f2     | bigint |           |          |                              | plain   |              | 
  f3     | bigint |           |          | generated always as (f2 * 2) | plain   |              | 
 Partition key: RANGE (f3)
-Partitions: gtest_part_key1_0 FOR VALUES FROM ('20') TO ('30'),
-            gtest_part_key1_1 FOR VALUES FROM ('30') TO ('50'),
-            gtest_part_key1_2 FOR VALUES FROM ('50') TO ('100')
+Partitions:
+    gtest_part_key1_0 FOR VALUES FROM ('20') TO ('30')
+    gtest_part_key1_1 FOR VALUES FROM ('30') TO ('50')
+    gtest_part_key1_2 FOR VALUES FROM ('50') TO ('100')
 
 INSERT INTO gtest_part_key1(f2) VALUES (9);     -- error
 ERROR:  no partition of relation "gtest_part_key1" found for row

diff -U3 /home/postgres/postgres/src/test/regress/expected/generated_virtual.out /home/postgres/postgres/build/testrun/t...
--- /home/postgres/postgres/src/test/regress/expected/generated_virtual.out	Sun May  3 07:41:12 2026
+++ /home/postgres/postgres/build/testrun/test_plan_advice/001_replan_regress/data/results/generated_virtual.out	Sun May...
@@ -1154,9 +1154,10 @@
  f2     | bigint |           |          |                              | plain   |              | 
  f3     | bigint |           |          | generated always as (f2 * 2) | plain   |              | 
 Partition key: RANGE (f3)
-Partitions: gtest_part_key1_0 FOR VALUES FROM ('20') TO ('30'),
-            gtest_part_key1_1 FOR VALUES FROM ('30') TO ('50'),
-            gtest_part_key1_2 FOR VALUES FROM ('50') TO ('100')
+Partitions:
+    gtest_part_key1_0 FOR VALUES FROM ('20') TO ('30')
+    gtest_part_key1_1 FOR VALUES FROM ('30') TO ('50')
+    gtest_part_key1_2 FOR VALUES FROM ('50') TO ('100')
 
 INSERT INTO gtest_part_key1(f2) VALUES (9);     -- error
 ERROR:  no partition of relation "gtest_part_key1" found for row

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	2026-05-03 07:41:21.058498400 +0000
+++ /home/postgres/postgres/build/testrun/pg_upgrade/002_pg_upgrade/data/results/generated_virtual.out	2026-05-03 07:44:...
@@ -1154,9 +1154,10 @@
  f2     | bigint |           |          |                              | plain   |              | 
  f3     | bigint |           |          | generated always as (f2 * 2) | plain   |              | 
 Partition key: RANGE (f3)
-Partitions: gtest_part_key1_0 FOR VALUES FROM ('20') TO ('30'),
-            gtest_part_key1_1 FOR VALUES FROM ('30') TO ('50'),
-            gtest_part_key1_2 FOR VALUES FROM ('50') TO ('100')
+Partitions:
+    gtest_part_key1_0 FOR VALUES FROM ('20') TO ('30')
+    gtest_part_key1_1 FOR VALUES FROM ('30') TO ('50')
+    gtest_part_key1_2 FOR VALUES FROM ('50') TO ('100')
 
 INSERT INTO gtest_part_key1(f2) VALUES (9);     -- error
 ERROR:  no partition of relation "gtest_part_key1" found for row

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	2026-05-03 07:41:21.058498400 +0000
+++ /home/postgres/postgres/build/testrun/recovery/027_stream_regress/data/results/generated_virtual.out	2026-05-03 07:4...
@@ -1154,9 +1154,10 @@
  f2     | bigint |           |          |                              | plain   |              | 
  f3     | bigint |           |          | generated always as (f2 * 2) | plain   |              | 
 Partition key: RANGE (f3)
-Partitions: gtest_part_key1_0 FOR VALUES FROM ('20') TO ('30'),
-            gtest_part_key1_1 FOR VALUES FROM ('30') TO ('50'),
-            gtest_part_key1_2 FOR VALUES FROM ('50') TO ('100')
+Partitions:
+    gtest_part_key1_0 FOR VALUES FROM ('20') TO ('30')
+    gtest_part_key1_1 FOR VALUES FROM ('30') TO ('50')
+    gtest_part_key1_2 FOR VALUES FROM ('50') TO ('100')
 
 INSERT INTO gtest_part_key1(f2) VALUES (9);     -- error
 ERROR:  no partition of relation "gtest_part_key1" found for row

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	2026-05-03 07:41:21.058498400 +0000
+++ /home/postgres/postgres/build/testrun/regress/regress/results/generated_virtual.out	2026-05-03 07:44:23.666184256 +0...
@@ -1154,9 +1154,10 @@
  f2     | bigint |           |          |                              | plain   |              | 
  f3     | bigint |           |          | generated always as (f2 * 2) | plain   |              | 
 Partition key: RANGE (f3)
-Partitions: gtest_part_key1_0 FOR VALUES FROM ('20') TO ('30'),
-            gtest_part_key1_1 FOR VALUES FROM ('30') TO ('50'),
-            gtest_part_key1_2 FOR VALUES FROM ('50') TO ('100')
+Partitions:
+    gtest_part_key1_0 FOR VALUES FROM ('20') TO ('30')
+    gtest_part_key1_1 FOR VALUES FROM ('30') TO ('50')
+    gtest_part_key1_2 FOR VALUES FROM ('50') TO ('100')
 
 INSERT INTO gtest_part_key1(f2) VALUES (9);     -- error
 ERROR:  no partition of relation "gtest_part_key1" found for row

diff -U3 /home/postgres/postgres/src/test/regress/expected/generated_virtual.out /home/postgres/postgres/build/testrun/t...
--- /home/postgres/postgres/src/test/regress/expected/generated_virtual.out	2026-05-03 07:41:21.058498400 +0000
+++ /home/postgres/postgres/build/testrun/test_plan_advice/001_replan_regress/data/results/generated_virtual.out	2026-05...
@@ -1154,9 +1154,10 @@
  f2     | bigint |           |          |                              | plain   |              | 
  f3     | bigint |           |          | generated always as (f2 * 2) | plain   |              | 
 Partition key: RANGE (f3)
-Partitions: gtest_part_key1_0 FOR VALUES FROM ('20') TO ('30'),
-            gtest_part_key1_1 FOR VALUES FROM ('30') TO ('50'),
-            gtest_part_key1_2 FOR VALUES FROM ('50') TO ('100')
+Partitions:
+    gtest_part_key1_0 FOR VALUES FROM ('20') TO ('30')
+    gtest_part_key1_1 FOR VALUES FROM ('30') TO ('50')
+    gtest_part_key1_2 FOR VALUES FROM ('50') TO ('100')
 
 INSERT INTO gtest_part_key1(f2) VALUES (9);     -- error
 ERROR:  no partition of relation "gtest_part_key1" found for row

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	2026-05-03 07:40:52.548813000 +0000
+++ /tmp/cirrus-ci-build/build/testrun/pg_upgrade/002_pg_upgrade/data/results/generated_virtual.out	2026-05-03 07:44:20....
@@ -1154,9 +1154,10 @@
  f2     | bigint |           |          |                              | plain   |              | 
  f3     | bigint |           |          | generated always as (f2 * 2) | plain   |              | 
 Partition key: RANGE (f3)
-Partitions: gtest_part_key1_0 FOR VALUES FROM ('20') TO ('30'),
-            gtest_part_key1_1 FOR VALUES FROM ('30') TO ('50'),
-            gtest_part_key1_2 FOR VALUES FROM ('50') TO ('100')
+Partitions:
+    gtest_part_key1_0 FOR VALUES FROM ('20') TO ('30')
+    gtest_part_key1_1 FOR VALUES FROM ('30') TO ('50')
+    gtest_part_key1_2 FOR VALUES FROM ('50') TO ('100')
 
 INSERT INTO gtest_part_key1(f2) VALUES (9);     -- error
 ERROR:  no partition of relation "gtest_part_key1" found for row

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	2026-05-03 07:40:52.548813000 +0000
+++ /tmp/cirrus-ci-build/build/testrun/recovery/027_stream_regress/data/results/generated_virtual.out	2026-05-03 07:45:5...
@@ -1154,9 +1154,10 @@
  f2     | bigint |           |          |                              | plain   |              | 
  f3     | bigint |           |          | generated always as (f2 * 2) | plain   |              | 
 Partition key: RANGE (f3)
-Partitions: gtest_part_key1_0 FOR VALUES FROM ('20') TO ('30'),
-            gtest_part_key1_1 FOR VALUES FROM ('30') TO ('50'),
-            gtest_part_key1_2 FOR VALUES FROM ('50') TO ('100')
+Partitions:
+    gtest_part_key1_0 FOR VALUES FROM ('20') TO ('30')
+    gtest_part_key1_1 FOR VALUES FROM ('30') TO ('50')
+    gtest_part_key1_2 FOR VALUES FROM ('50') TO ('100')
 
 INSERT INTO gtest_part_key1(f2) VALUES (9);     -- error
 ERROR:  no partition of relation "gtest_part_key1" found for row

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	2026-05-03 07:40:52.548813000 +0000
+++ /tmp/cirrus-ci-build/build/testrun/regress/regress/results/generated_virtual.out	2026-05-03 07:44:31.513586000 +0000
@@ -1154,9 +1154,10 @@
  f2     | bigint |           |          |                              | plain   |              | 
  f3     | bigint |           |          | generated always as (f2 * 2) | plain   |              | 
 Partition key: RANGE (f3)
-Partitions: gtest_part_key1_0 FOR VALUES FROM ('20') TO ('30'),
-            gtest_part_key1_1 FOR VALUES FROM ('30') TO ('50'),
-            gtest_part_key1_2 FOR VALUES FROM ('50') TO ('100')
+Partitions:
+    gtest_part_key1_0 FOR VALUES FROM ('20') TO ('30')
+    gtest_part_key1_1 FOR VALUES FROM ('30') TO ('50')
+    gtest_part_key1_2 FOR VALUES FROM ('50') TO ('100')
 
 INSERT INTO gtest_part_key1(f2) VALUES (9);     -- error
 ERROR:  no partition of relation "gtest_part_key1" found for row

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/generated_virtual.out /tmp/cirrus-ci-build/build/testrun/test_pl...
--- /tmp/cirrus-ci-build/src/test/regress/expected/generated_virtual.out	2026-05-03 07:40:52.548813000 +0000
+++ /tmp/cirrus-ci-build/build/testrun/test_plan_advice/001_replan_regress/data/results/generated_virtual.out	2026-05-03...
@@ -1154,9 +1154,10 @@
  f2     | bigint |           |          |                              | plain   |              | 
  f3     | bigint |           |          | generated always as (f2 * 2) | plain   |              | 
 Partition key: RANGE (f3)
-Partitions: gtest_part_key1_0 FOR VALUES FROM ('20') TO ('30'),
-            gtest_part_key1_1 FOR VALUES FROM ('30') TO ('50'),
-            gtest_part_key1_2 FOR VALUES FROM ('50') TO ('100')
+Partitions:
+    gtest_part_key1_0 FOR VALUES FROM ('20') TO ('30')
+    gtest_part_key1_1 FOR VALUES FROM ('30') TO ('50')
+    gtest_part_key1_2 FOR VALUES FROM ('50') TO ('100')
 
 INSERT INTO gtest_part_key1(f2) VALUES (9);     -- error
 ERROR:  no partition of relation "gtest_part_key1" found for row

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	2026-05-03 07:09:13.281029504 +0000
+++ /home/postgres/postgres/build/testrun/isolation/isolation/results/timeouts.out	2026-05-03 07:11:49.174492534 +0000
@@ -11,7 +11,7 @@
 step sto: SET statement_timeout = '10ms';
 step locktbl: LOCK TABLE accounts; <waiting ...>
 step locktbl: <... completed>
-ERROR:  canceling statement due to statement timeout
+ERROR:  canceling statement due to user request
 
 starting permutation: rdtbl lto locktbl
 step rdtbl: SELECT * FROM accounts;