PostgreSQL Patch Tester

diff -U3 /tmp/cirrus-ci-build/contrib/pg_stat_statements/expected/select.out /tmp/cirrus-ci-build/build/testrun/pg_stat_...
--- /tmp/cirrus-ci-build/contrib/pg_stat_statements/expected/select.out	2026-05-19 05:57:58.290059000 +0000
+++ /tmp/cirrus-ci-build/build/testrun/pg_stat_statements/regress/results/select.out	2026-05-19 06:02:44.918741000 +0000
@@ -206,31 +206,9 @@
 
 DEALLOCATE pgss_test;
 SELECT calls, rows, query FROM pg_stat_statements ORDER BY query COLLATE "C";
- calls | rows |                                    query                                     
--------+------+------------------------------------------------------------------------------
-     1 |    1 | PREPARE pgss_test (int) AS SELECT $1, $2 LIMIT $3
-     4 |    4 | SELECT $1                                                                   +
-       |      |   -- but this one will appear                                               +
-       |      |   AS "text"
-     2 |    2 | SELECT $1 + $2
-     3 |    3 | SELECT $1 + $2 + $3 AS "add"
-     1 |    1 | SELECT $1 AS "float"
-     2 |    2 | SELECT $1 AS "int"
-     2 |    2 | SELECT $1 AS "int" LIMIT $2
-     2 |    0 | SELECT $1 AS "int" OFFSET $2
-     6 |    0 | SELECT $1 AS "int" OFFSET $2 LIMIT $3
...

diff --strip-trailing-cr -U3 C:/cirrus/src/test/regress/expected/partition_split.out C:/cirrus/build/testrun/pg_upgrade/...
--- C:/cirrus/src/test/regress/expected/partition_split.out	2026-05-19 03:05:14.955347400 +0000
+++ C:/cirrus/build/testrun/pg_upgrade/002_pg_upgrade/data/results/partition_split.out	2026-05-19 03:12:43.559227400 +00...
@@ -1231,21 +1231,29 @@
 -- covers only the 'a' group and the DEFAULT partition covers the rest.
 --
 CREATE COLLATION case_insensitive (provider = icu, locale = 'und-u-ks-level2', deterministic = false);
+ERROR:  ICU is not supported in this build
 CREATE TABLE t (b text COLLATE case_insensitive) PARTITION BY LIST (b);
+ERROR:  collation "case_insensitive" for encoding "UTF8" does not exist
+LINE 1: CREATE TABLE t (b text COLLATE case_insensitive) PARTITION B...
+                               ^
 CREATE TABLE tp_ab PARTITION OF t FOR VALUES IN ('a', 'b');
+ERROR:  relation "t" does not exist
 ALTER TABLE t SPLIT PARTITION tp_ab INTO
   (PARTITION tp_a FOR VALUES IN ('a', 'A'),
    PARTITION tp_default DEFAULT);
+ERROR:  relation "t" does not exist
 INSERT INTO t VALUES ('a'), ('A'), ('b'), ('c');
+ERROR:  relation "t" does not exist
...

diff --strip-trailing-cr -U3 C:/cirrus/src/test/regress/expected/partition_split.out C:/cirrus/build/testrun/recovery/02...
--- C:/cirrus/src/test/regress/expected/partition_split.out	2026-05-19 03:05:14.955347400 +0000
+++ C:/cirrus/build/testrun/recovery/027_stream_regress/data/results/partition_split.out	2026-05-19 03:17:24.834564600 +...
@@ -1231,21 +1231,29 @@
 -- covers only the 'a' group and the DEFAULT partition covers the rest.
 --
 CREATE COLLATION case_insensitive (provider = icu, locale = 'und-u-ks-level2', deterministic = false);
+ERROR:  ICU is not supported in this build
 CREATE TABLE t (b text COLLATE case_insensitive) PARTITION BY LIST (b);
+ERROR:  collation "case_insensitive" for encoding "WIN1252" does not exist
+LINE 1: CREATE TABLE t (b text COLLATE case_insensitive) PARTITION B...
+                               ^
 CREATE TABLE tp_ab PARTITION OF t FOR VALUES IN ('a', 'b');
+ERROR:  relation "t" does not exist
 ALTER TABLE t SPLIT PARTITION tp_ab INTO
   (PARTITION tp_a FOR VALUES IN ('a', 'A'),
    PARTITION tp_default DEFAULT);
+ERROR:  relation "t" does not exist
 INSERT INTO t VALUES ('a'), ('A'), ('b'), ('c');
+ERROR:  relation "t" does not exist
...

diff --strip-trailing-cr -U3 C:/cirrus/src/test/regress/expected/partition_split.out C:/cirrus/build/testrun/regress/reg...
--- C:/cirrus/src/test/regress/expected/partition_split.out	2026-05-19 03:05:14.955347400 +0000
+++ C:/cirrus/build/testrun/regress/regress/results/partition_split.out	2026-05-19 03:12:24.881976300 +0000
@@ -1231,21 +1231,29 @@
 -- covers only the 'a' group and the DEFAULT partition covers the rest.
 --
 CREATE COLLATION case_insensitive (provider = icu, locale = 'und-u-ks-level2', deterministic = false);
+ERROR:  ICU is not supported in this build
 CREATE TABLE t (b text COLLATE case_insensitive) PARTITION BY LIST (b);
+ERROR:  collation "case_insensitive" for encoding "WIN1252" does not exist
+LINE 1: CREATE TABLE t (b text COLLATE case_insensitive) PARTITION B...
+                               ^
 CREATE TABLE tp_ab PARTITION OF t FOR VALUES IN ('a', 'b');
+ERROR:  relation "t" does not exist
 ALTER TABLE t SPLIT PARTITION tp_ab INTO
   (PARTITION tp_a FOR VALUES IN ('a', 'A'),
    PARTITION tp_default DEFAULT);
+ERROR:  relation "t" does not exist
 INSERT INTO t VALUES ('a'), ('A'), ('b'), ('c');
+ERROR:  relation "t" does not exist
...

diff --strip-trailing-cr -U3 C:/cirrus/src/test/regress/expected/partition_split.out C:/cirrus/build/testrun/test_plan_a...
--- C:/cirrus/src/test/regress/expected/partition_split.out	2026-05-19 03:05:14.955347400 +0000
+++ C:/cirrus/build/testrun/test_plan_advice/001_replan_regress/data/results/partition_split.out	2026-05-19 03:12:34.103...
@@ -1231,21 +1231,29 @@
 -- covers only the 'a' group and the DEFAULT partition covers the rest.
 --
 CREATE COLLATION case_insensitive (provider = icu, locale = 'und-u-ks-level2', deterministic = false);
+ERROR:  ICU is not supported in this build
 CREATE TABLE t (b text COLLATE case_insensitive) PARTITION BY LIST (b);
+ERROR:  collation "case_insensitive" for encoding "WIN1252" does not exist
+LINE 1: CREATE TABLE t (b text COLLATE case_insensitive) PARTITION B...
+                               ^
 CREATE TABLE tp_ab PARTITION OF t FOR VALUES IN ('a', 'b');
+ERROR:  relation "t" does not exist
 ALTER TABLE t SPLIT PARTITION tp_ab INTO
   (PARTITION tp_a FOR VALUES IN ('a', 'A'),
    PARTITION tp_default DEFAULT);
+ERROR:  relation "t" does not exist
 INSERT INTO t VALUES ('a'), ('A'), ('b'), ('c');
+ERROR:  relation "t" does not exist
...

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/partition_split.out /tmp/cirrus-ci-build/build-32/testrun/recove...
--- /tmp/cirrus-ci-build/src/test/regress/expected/partition_split.out	2026-05-19 03:04:34.302571995 +0000
+++ /tmp/cirrus-ci-build/build-32/testrun/recovery/027_stream_regress/data/results/partition_split.out	2026-05-19 03:17:...
@@ -1231,21 +1231,29 @@
 -- covers only the 'a' group and the DEFAULT partition covers the rest.
 --
 CREATE COLLATION case_insensitive (provider = icu, locale = 'und-u-ks-level2', deterministic = false);
+ERROR:  current database's encoding is not supported with this provider
 CREATE TABLE t (b text COLLATE case_insensitive) PARTITION BY LIST (b);
+ERROR:  collation "case_insensitive" for encoding "SQL_ASCII" does not exist
+LINE 1: CREATE TABLE t (b text COLLATE case_insensitive) PARTITION B...
+                               ^
 CREATE TABLE tp_ab PARTITION OF t FOR VALUES IN ('a', 'b');
+ERROR:  relation "t" does not exist
 ALTER TABLE t SPLIT PARTITION tp_ab INTO
   (PARTITION tp_a FOR VALUES IN ('a', 'A'),
    PARTITION tp_default DEFAULT);
+ERROR:  relation "t" does not exist
 INSERT INTO t VALUES ('a'), ('A'), ('b'), ('c');
+ERROR:  relation "t" does not exist
...

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/partition_split.out /tmp/cirrus-ci-build/build-32/testrun/regres...
--- /tmp/cirrus-ci-build/src/test/regress/expected/partition_split.out	2026-05-19 03:04:34.302571995 +0000
+++ /tmp/cirrus-ci-build/build-32/testrun/regress/regress/results/partition_split.out	2026-05-19 03:15:55.445809938 +000...
@@ -1231,21 +1231,29 @@
 -- covers only the 'a' group and the DEFAULT partition covers the rest.
 --
 CREATE COLLATION case_insensitive (provider = icu, locale = 'und-u-ks-level2', deterministic = false);
+ERROR:  current database's encoding is not supported with this provider
 CREATE TABLE t (b text COLLATE case_insensitive) PARTITION BY LIST (b);
+ERROR:  collation "case_insensitive" for encoding "SQL_ASCII" does not exist
+LINE 1: CREATE TABLE t (b text COLLATE case_insensitive) PARTITION B...
+                               ^
 CREATE TABLE tp_ab PARTITION OF t FOR VALUES IN ('a', 'b');
+ERROR:  relation "t" does not exist
 ALTER TABLE t SPLIT PARTITION tp_ab INTO
   (PARTITION tp_a FOR VALUES IN ('a', 'A'),
    PARTITION tp_default DEFAULT);
+ERROR:  relation "t" does not exist
 INSERT INTO t VALUES ('a'), ('A'), ('b'), ('c');
+ERROR:  relation "t" does not exist
...

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/partition_split.out /tmp/cirrus-ci-build/build-32/testrun/test_p...
--- /tmp/cirrus-ci-build/src/test/regress/expected/partition_split.out	2026-05-19 03:04:34.302571995 +0000
+++ /tmp/cirrus-ci-build/build-32/testrun/test_plan_advice/001_replan_regress/data/results/partition_split.out	2026-05-1...
@@ -1231,21 +1231,29 @@
 -- covers only the 'a' group and the DEFAULT partition covers the rest.
 --
 CREATE COLLATION case_insensitive (provider = icu, locale = 'und-u-ks-level2', deterministic = false);
+ERROR:  current database's encoding is not supported with this provider
 CREATE TABLE t (b text COLLATE case_insensitive) PARTITION BY LIST (b);
+ERROR:  collation "case_insensitive" for encoding "SQL_ASCII" does not exist
+LINE 1: CREATE TABLE t (b text COLLATE case_insensitive) PARTITION B...
+                               ^
 CREATE TABLE tp_ab PARTITION OF t FOR VALUES IN ('a', 'b');
+ERROR:  relation "t" does not exist
 ALTER TABLE t SPLIT PARTITION tp_ab INTO
   (PARTITION tp_a FOR VALUES IN ('a', 'A'),
    PARTITION tp_default DEFAULT);
+ERROR:  relation "t" does not exist
 INSERT INTO t VALUES ('a'), ('A'), ('b'), ('c');
+ERROR:  relation "t" does not exist
...

diff -U3 /home/postgres/postgres/src/test/regress/expected/partition_split.out /home/postgres/postgres/build/testrun/rec...
--- /home/postgres/postgres/src/test/regress/expected/partition_split.out	2026-05-19 03:05:07.557355285 +0000
+++ /home/postgres/postgres/build/testrun/recovery/027_stream_regress/data/results/partition_split.out	2026-05-19 03:08:...
@@ -1231,21 +1231,29 @@
 -- covers only the 'a' group and the DEFAULT partition covers the rest.
 --
 CREATE COLLATION case_insensitive (provider = icu, locale = 'und-u-ks-level2', deterministic = false);
+ERROR:  current database's encoding is not supported with this provider
 CREATE TABLE t (b text COLLATE case_insensitive) PARTITION BY LIST (b);
+ERROR:  collation "case_insensitive" for encoding "SQL_ASCII" does not exist
+LINE 1: CREATE TABLE t (b text COLLATE case_insensitive) PARTITION B...
+                               ^
 CREATE TABLE tp_ab PARTITION OF t FOR VALUES IN ('a', 'b');
+ERROR:  relation "t" does not exist
 ALTER TABLE t SPLIT PARTITION tp_ab INTO
   (PARTITION tp_a FOR VALUES IN ('a', 'A'),
    PARTITION tp_default DEFAULT);
+ERROR:  relation "t" does not exist
 INSERT INTO t VALUES ('a'), ('A'), ('b'), ('c');
+ERROR:  relation "t" does not exist
...

diff -U3 /home/postgres/postgres/src/test/regress/expected/partition_split.out /home/postgres/postgres/build/testrun/reg...
--- /home/postgres/postgres/src/test/regress/expected/partition_split.out	2026-05-19 03:05:07.557355285 +0000
+++ /home/postgres/postgres/build/testrun/regress/regress/results/partition_split.out	2026-05-19 03:07:36.603085099 +000...
@@ -1231,21 +1231,29 @@
 -- covers only the 'a' group and the DEFAULT partition covers the rest.
 --
 CREATE COLLATION case_insensitive (provider = icu, locale = 'und-u-ks-level2', deterministic = false);
+ERROR:  current database's encoding is not supported with this provider
 CREATE TABLE t (b text COLLATE case_insensitive) PARTITION BY LIST (b);
+ERROR:  collation "case_insensitive" for encoding "SQL_ASCII" does not exist
+LINE 1: CREATE TABLE t (b text COLLATE case_insensitive) PARTITION B...
+                               ^
 CREATE TABLE tp_ab PARTITION OF t FOR VALUES IN ('a', 'b');
+ERROR:  relation "t" does not exist
 ALTER TABLE t SPLIT PARTITION tp_ab INTO
   (PARTITION tp_a FOR VALUES IN ('a', 'A'),
    PARTITION tp_default DEFAULT);
+ERROR:  relation "t" does not exist
 INSERT INTO t VALUES ('a'), ('A'), ('b'), ('c');
+ERROR:  relation "t" does not exist
...

diff -U3 /home/postgres/postgres/src/test/regress/expected/partition_split.out /home/postgres/postgres/build/testrun/tes...
--- /home/postgres/postgres/src/test/regress/expected/partition_split.out	2026-05-19 03:05:07.557355285 +0000
+++ /home/postgres/postgres/build/testrun/test_plan_advice/001_replan_regress/data/results/partition_split.out	2026-05-1...
@@ -1231,21 +1231,29 @@
 -- covers only the 'a' group and the DEFAULT partition covers the rest.
 --
 CREATE COLLATION case_insensitive (provider = icu, locale = 'und-u-ks-level2', deterministic = false);
+ERROR:  current database's encoding is not supported with this provider
 CREATE TABLE t (b text COLLATE case_insensitive) PARTITION BY LIST (b);
+ERROR:  collation "case_insensitive" for encoding "SQL_ASCII" does not exist
+LINE 1: CREATE TABLE t (b text COLLATE case_insensitive) PARTITION B...
+                               ^
 CREATE TABLE tp_ab PARTITION OF t FOR VALUES IN ('a', 'b');
+ERROR:  relation "t" does not exist
 ALTER TABLE t SPLIT PARTITION tp_ab INTO
   (PARTITION tp_a FOR VALUES IN ('a', 'A'),
    PARTITION tp_default DEFAULT);
+ERROR:  relation "t" does not exist
 INSERT INTO t VALUES ('a'), ('A'), ('b'), ('c');
+ERROR:  relation "t" does not exist
...

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/plpgsql.out /tmp/cirrus-ci-build/build/testrun/recovery/027_stre...
--- /tmp/cirrus-ci-build/src/test/regress/expected/plpgsql.out	2026-05-19 02:30:18.782664000 +0000
+++ /tmp/cirrus-ci-build/build/testrun/recovery/027_stream_regress/data/results/plpgsql.out	2026-05-19 02:35:24.44398300...
@@ -1129,4686 +1129,7 @@
 insert into PSlot values ('PS.first.c3', 'PF1_1', '', 'WS.105.2a');
 insert into PSlot values ('PS.first.c4', 'PF1_1', '', 'WS.105.2b');
 insert into PSlot values ('PS.first.c5', 'PF1_1', '', 'WS.105.3a');
-insert into PSlot values ('PS.first.c6', 'PF1_1', '', 'WS.105.3b');
-insert into PSlot values ('PS.first.d1', 'PF1_1', '', 'WS.106.1a');
-insert into PSlot values ('PS.first.d2', 'PF1_1', '', 'WS.106.1b');
-insert into PSlot values ('PS.first.d3', 'PF1_1', '', 'WS.106.2a');
-insert into PSlot values ('PS.first.d4', 'PF1_1', '', 'WS.106.2b');
-insert into PSlot values ('PS.first.d5', 'PF1_1', '', 'WS.106.3a');
-insert into PSlot values ('PS.first.d6', 'PF1_1', '', 'WS.106.3b');
---
--- Now we wire the wall connectors 1a-2a in room 001 to the
--- patchfield. In the second update we make an error, and
--- correct it after
---
-update PSlot set backlink = 'WS.001.1a' where slotname = 'PS.base.a1';
...

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	Mon May 18 16:00:06 2026
+++ /home/postgres/postgres/build/testrun/isolation/isolation/results/timeouts.out	Mon May 18 16:04:55 2026
@@ -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;

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	Mon May 18 12:50:43 2026
+++ /home/postgres/postgres/build/testrun/isolation/isolation/results/timeouts.out	Mon May 18 12:57:33 2026
@@ -57,7 +57,7 @@
 step sto: SET statement_timeout = '10ms';
 step update: DELETE FROM accounts WHERE accountid = 'checking'; <waiting ...>
 step update: <... completed>
-ERROR:  canceling statement due to statement timeout
+ERROR:  canceling statement due to user request
 
 starting permutation: wrtbl lto update
 step wrtbl: UPDATE accounts SET balance = balance + 100;

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/copy.out /tmp/cirrus-ci-build/build/testrun/pg_upgrade/002_pg_up...
--- /tmp/cirrus-ci-build/src/test/regress/expected/copy.out	2026-05-18 08:46:43.007237000 +0000
+++ /tmp/cirrus-ci-build/build/testrun/pg_upgrade/002_pg_upgrade/data/results/copy.out	2026-05-18 08:49:59.996931000 +00...
@@ -433,189 +433,7 @@
 create unique index tab_progress_reporting_idx1 on tab_progress_reporting(name);
 create temp table conflict_tbl(copy_tbl oid, filename text, lineno bigint, line text);
 copy tab_progress_reporting from stdin(on_conflict table, conflict_table 'conflict_tbl');
-INFO:  progress: {"type": "PIPE", "command": "COPY FROM", "relname": "tab_progress_reporting", "tuples_skipped": 3, "ha...
-NOTICE:  3 rows were saved to conflict table "conflict_tbl" due to unique constraint violation
-drop index tab_progress_reporting_idx1;
-drop table conflict_tbl;
--- Generate COPY FROM report with PIPE, with some skipped tuples.
-copy tab_progress_reporting from stdin(on_error ignore);
-NOTICE:  2 rows were skipped due to data type incompatibility
-INFO:  progress: {"type": "PIPE", "command": "COPY FROM", "relname": "tab_progress_reporting", "tuples_skipped": 2, "ha...
-drop trigger check_after_tab_progress_reporting on tab_progress_reporting;
-drop function notice_after_tab_progress_reporting();
-drop table tab_progress_reporting;
--- Test header matching feature
-create table header_copytest (
...

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/copy.out /tmp/cirrus-ci-build/build/testrun/recovery/027_stream_...
--- /tmp/cirrus-ci-build/src/test/regress/expected/copy.out	2026-05-18 08:46:43.007237000 +0000
+++ /tmp/cirrus-ci-build/build/testrun/recovery/027_stream_regress/data/results/copy.out	2026-05-18 08:51:18.747306000 +...
@@ -433,189 +433,7 @@
 create unique index tab_progress_reporting_idx1 on tab_progress_reporting(name);
 create temp table conflict_tbl(copy_tbl oid, filename text, lineno bigint, line text);
 copy tab_progress_reporting from stdin(on_conflict table, conflict_table 'conflict_tbl');
-INFO:  progress: {"type": "PIPE", "command": "COPY FROM", "relname": "tab_progress_reporting", "tuples_skipped": 3, "ha...
-NOTICE:  3 rows were saved to conflict table "conflict_tbl" due to unique constraint violation
-drop index tab_progress_reporting_idx1;
-drop table conflict_tbl;
--- Generate COPY FROM report with PIPE, with some skipped tuples.
-copy tab_progress_reporting from stdin(on_error ignore);
-NOTICE:  2 rows were skipped due to data type incompatibility
-INFO:  progress: {"type": "PIPE", "command": "COPY FROM", "relname": "tab_progress_reporting", "tuples_skipped": 2, "ha...
-drop trigger check_after_tab_progress_reporting on tab_progress_reporting;
-drop function notice_after_tab_progress_reporting();
-drop table tab_progress_reporting;
--- Test header matching feature
-create table header_copytest (
...

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/copy.out /tmp/cirrus-ci-build/build/testrun/regress/regress/resu...
--- /tmp/cirrus-ci-build/src/test/regress/expected/copy.out	2026-05-18 08:46:43.007237000 +0000
+++ /tmp/cirrus-ci-build/build/testrun/regress/regress/results/copy.out	2026-05-18 08:50:02.030359000 +0000
@@ -433,189 +433,7 @@
 create unique index tab_progress_reporting_idx1 on tab_progress_reporting(name);
 create temp table conflict_tbl(copy_tbl oid, filename text, lineno bigint, line text);
 copy tab_progress_reporting from stdin(on_conflict table, conflict_table 'conflict_tbl');
-INFO:  progress: {"type": "PIPE", "command": "COPY FROM", "relname": "tab_progress_reporting", "tuples_skipped": 3, "ha...
-NOTICE:  3 rows were saved to conflict table "conflict_tbl" due to unique constraint violation
-drop index tab_progress_reporting_idx1;
-drop table conflict_tbl;
--- Generate COPY FROM report with PIPE, with some skipped tuples.
-copy tab_progress_reporting from stdin(on_error ignore);
-NOTICE:  2 rows were skipped due to data type incompatibility
-INFO:  progress: {"type": "PIPE", "command": "COPY FROM", "relname": "tab_progress_reporting", "tuples_skipped": 2, "ha...
-drop trigger check_after_tab_progress_reporting on tab_progress_reporting;
-drop function notice_after_tab_progress_reporting();
-drop table tab_progress_reporting;
--- Test header matching feature
-create table header_copytest (
...

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/copy.out /tmp/cirrus-ci-build/build/testrun/test_plan_advice/001...
--- /tmp/cirrus-ci-build/src/test/regress/expected/copy.out	2026-05-18 08:46:43.007237000 +0000
+++ /tmp/cirrus-ci-build/build/testrun/test_plan_advice/001_replan_regress/data/results/copy.out	2026-05-18 08:50:05.484...
@@ -433,189 +433,7 @@
 create unique index tab_progress_reporting_idx1 on tab_progress_reporting(name);
 create temp table conflict_tbl(copy_tbl oid, filename text, lineno bigint, line text);
 copy tab_progress_reporting from stdin(on_conflict table, conflict_table 'conflict_tbl');
-INFO:  progress: {"type": "PIPE", "command": "COPY FROM", "relname": "tab_progress_reporting", "tuples_skipped": 3, "ha...
-NOTICE:  3 rows were saved to conflict table "conflict_tbl" due to unique constraint violation
-drop index tab_progress_reporting_idx1;
-drop table conflict_tbl;
--- Generate COPY FROM report with PIPE, with some skipped tuples.
-copy tab_progress_reporting from stdin(on_error ignore);
-NOTICE:  2 rows were skipped due to data type incompatibility
-INFO:  progress: {"type": "PIPE", "command": "COPY FROM", "relname": "tab_progress_reporting", "tuples_skipped": 2, "ha...
-drop trigger check_after_tab_progress_reporting on tab_progress_reporting;
-drop function notice_after_tab_progress_reporting();
-drop table tab_progress_reporting;
--- Test header matching feature
-create table header_copytest (
...

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-18 05:47:49.296274223 +0000
+++ /home/postgres/postgres/build/testrun/pg_upgrade/002_pg_upgrade/data/results/rules.out	2026-05-18 05:50:56.583550316...
@@ -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-18 05:47:49.296274223 +0000
+++ /home/postgres/postgres/build/testrun/recovery/027_stream_regress/data/results/rules.out	2026-05-18 05:51:37.9225880...
@@ -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-18 05:47:49.296274223 +0000
+++ /home/postgres/postgres/build/testrun/regress/regress/results/rules.out	2026-05-18 05:50:51.575895400 +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-18 05:47:49.296274223 +0000
+++ /home/postgres/postgres/build/testrun/test_plan_advice/001_replan_regress/data/results/rules.out	2026-05-18 05:50:59...
@@ -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-18 05:47:12.128120800 +0000
+++ C:/cirrus/build/testrun/pg_upgrade/002_pg_upgrade/data/results/rules.out	2026-05-18 05:51:35.659493100 +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-18 05:47:12.128120800 +0000
+++ C:/cirrus/build/testrun/recovery/027_stream_regress/data/results/rules.out	2026-05-18 05:55:37.811249900 +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-18 05:47:12.128120800 +0000
+++ C:/cirrus/build/testrun/regress/regress/results/rules.out	2026-05-18 05:51:23.836757800 +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-18 05:47:12.128120800 +0000
+++ C:/cirrus/build/testrun/test_plan_advice/001_replan_regress/data/results/rules.out	2026-05-18 05:51:30.071117500 +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 /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-18 05:55:25
+++ /Users/admin/pgsql/build/testrun/pg_upgrade/002_pg_upgrade/data/results/rules.out	2026-05-18 05:59:54
@@ -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-18 05:55:25
+++ /Users/admin/pgsql/build/testrun/recovery/027_stream_regress/data/results/rules.out	2026-05-18 06:02:28
@@ -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-18 05:55:25
+++ /Users/admin/pgsql/build/testrun/regress/regress/results/rules.out	2026-05-18 05:59:54
@@ -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-18 05:55:25
+++ /Users/admin/pgsql/build/testrun/test_plan_advice/001_replan_regress/data/results/rules.out	2026-05-18 05:59:54
@@ -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-18 05:47:11.671261440 +0000
+++ /tmp/cirrus-ci-build/build/testrun/pg_upgrade/002_pg_upgrade/data/results/rules.out	2026-05-18 05:52:31.809837244 +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-18 05:47:11.671261440 +0000
+++ /tmp/cirrus-ci-build/build/testrun/recovery/027_stream_regress/data/results/rules.out	2026-05-18 05:54:12.094049554 ...
@@ -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-18 05:47:11.671261440 +0000
+++ /tmp/cirrus-ci-build/build/testrun/regress/regress/results/rules.out	2026-05-18 05:52:31.421836774 +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-18 05:47:11.671261440 +0000
+++ /tmp/cirrus-ci-build/build/testrun/test_plan_advice/001_replan_regress/data/results/rules.out	2026-05-18 05:52:32.89...
@@ -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-18 05:47:07.265793000 +0000
+++ /tmp/cirrus-ci-build/build/testrun/pg_upgrade/002_pg_upgrade/data/results/rules.out	2026-05-18 05:51:05.250799000 +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-18 05:47:07.265793000 +0000
+++ /tmp/cirrus-ci-build/build/testrun/recovery/027_stream_regress/data/results/rules.out	2026-05-18 05:52:48.875176000 ...
@@ -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-18 05:47:07.265793000 +0000
+++ /tmp/cirrus-ci-build/build/testrun/regress/regress/results/rules.out	2026-05-18 05:51:04.709140000 +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-18 05:47:07.265793000 +0000
+++ /tmp/cirrus-ci-build/build/testrun/test_plan_advice/001_replan_regress/data/results/rules.out	2026-05-18 05:51:06.72...
@@ -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-18 05:47:39.668541261 +0000
+++ /tmp/cirrus-ci-build/src/bin/pg_upgrade/tmp_check/results/rules.out	2026-05-18 05:56:26.493883623 +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-18 05:47:39.668541261 +0000
+++ /tmp/cirrus-ci-build/src/test/modules/test_plan_advice/tmp_check/results/rules.out	2026-05-18 05:58:58.341773803 +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-18 05:47:39.668541261 +0000
+++ /tmp/cirrus-ci-build/src/test/recovery/tmp_check/results/rules.out	2026-05-18 05:58:04.237687355 +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-18 05:47:39.668541261 +0000
+++ /tmp/cirrus-ci-build/src/test/regress/results/rules.out	2026-05-18 05:53:46.993749343 +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	Mon May 18 05:47:24 2026
+++ /home/postgres/postgres/build/testrun/pg_upgrade/002_pg_upgrade/data/results/rules.out	Mon May 18 05:51:53 2026
@@ -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	Mon May 18 05:47:24 2026
+++ /home/postgres/postgres/build/testrun/recovery/027_stream_regress/data/results/rules.out	Mon May 18 05:54:07 2026
@@ -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	Mon May 18 05:47:24 2026
+++ /home/postgres/postgres/build/testrun/regress/regress/results/rules.out	Mon May 18 05:51:46 2026
@@ -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	Mon May 18 05:47:24 2026
+++ /home/postgres/postgres/build/testrun/test_plan_advice/001_replan_regress/data/results/rules.out	Mon May 18 05:51:50...
@@ -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/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-18 05:28:57.035772000 +0000
+++ /tmp/cirrus-ci-build/build/testrun/postgres_fdw-running/regress/results/postgres_fdw.out	2026-05-18 05:38:17.9522760...
@@ -12981,8 +12981,7 @@
   FROM postgres_fdw_get_connections(true);
  server_name | closed | remote_backend_pid 
 -------------+--------+--------------------
- loopback    | f      | t
-(1 row)
+(0 rows)
 
 -- After terminating the remote backend, since the connection is closed,
 -- "closed" should be TRUE, or NULL if the connection status check
@@ -12998,8 +12997,7 @@
   FROM postgres_fdw_get_connections(true);
  server_name | closed | remote_backend_pid 
 -------------+--------+--------------------
- loopback    | t      | t
-(1 row)
+(0 rows)
...

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-18 00:04:49.164244700 +0000
+++ C:/cirrus/build/testrun/unsafe_tests/regress/results/guc_privs.out	2026-05-18 00:14:49.816697400 +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/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-18 00:04:44
+++ /Users/admin/pgsql/build/testrun/unsafe_tests/regress/results/guc_privs.out	2026-05-18 00:13:45
@@ -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-18 00:04:38.956813242 +0000
+++ /tmp/cirrus-ci-build/build/testrun/unsafe_tests/regress/results/guc_privs.out	2026-05-18 00:10:07.230065095 +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	Mon May 18 00:04:53 2026
+++ /home/postgres/postgres/build/testrun/unsafe_tests/regress/results/guc_privs.out	Mon May 18 00:10:55 2026
@@ -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-18 00:04:54.380070652 +0000
+++ /home/postgres/postgres/build/testrun/unsafe_tests/regress/results/guc_privs.out	2026-05-18 00:08:15.153036891 +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-18 00:04:35.342828000 +0000
+++ /tmp/cirrus-ci-build/build/testrun/unsafe_tests/regress/results/guc_privs.out	2026-05-18 00:09:46.857974000 +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-18 00:04:37.673784870 +0000
+++ /tmp/cirrus-ci-build/src/test/modules/unsafe_tests/results/guc_privs.out	2026-05-18 00:12:49.834268100 +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/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 /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-08 10:45:27.010219000 +0000
+++ /tmp/cirrus-ci-build/build/testrun/pg_upgrade/002_pg_upgrade/data/results/indexing.out	2026-05-08 10:51:36.736611000...
@@ -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-08 10:45:27.010219000 +0000
+++ /tmp/cirrus-ci-build/build/testrun/recovery/027_stream_regress/data/results/indexing.out	2026-05-08 10:53:35.8580150...
@@ -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-08 10:45:27.010219000 +0000
+++ /tmp/cirrus-ci-build/build/testrun/regress/regress/results/indexing.out	2026-05-08 10:51:36.833308000 +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-08 10:45:27.010219000 +0000
+++ /tmp/cirrus-ci-build/build/testrun/test_plan_advice/001_replan_regress/data/results/indexing.out	2026-05-08 10:51:45...
@@ -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-08 10:45:50.708769479 +0000
+++ /home/postgres/postgres/build/testrun/pg_upgrade/002_pg_upgrade/data/results/indexing.out	2026-05-08 10:50:09.093980...
@@ -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-08 10:45:50.708769479 +0000
+++ /home/postgres/postgres/build/testrun/recovery/027_stream_regress/data/results/indexing.out	2026-05-08 10:51:05.0667...
@@ -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-08 10:45:50.708769479 +0000
+++ /home/postgres/postgres/build/testrun/regress/regress/results/indexing.out	2026-05-08 10:50:12.722643850 +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-08 10:45:50.708769479 +0000
+++ /home/postgres/postgres/build/testrun/test_plan_advice/001_replan_regress/data/results/indexing.out	2026-05-08 10:50...
@@ -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-08 10:45:24.043242932 +0000
+++ /tmp/cirrus-ci-build/src/bin/pg_upgrade/tmp_check/results/indexing.out	2026-05-08 10:55:41.982326100 +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-08 10:45:24.043242932 +0000
+++ /tmp/cirrus-ci-build/src/test/modules/test_plan_advice/tmp_check/results/indexing.out	2026-05-08 10:57:19.550357003 ...
@@ -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-08 10:45:24.043242932 +0000
+++ /tmp/cirrus-ci-build/src/test/recovery/tmp_check/results/indexing.out	2026-05-08 10:57:00.546350923 +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-08 10:45:24.043242932 +0000
+++ /tmp/cirrus-ci-build/src/test/regress/results/indexing.out	2026-05-08 10:52:50.690274959 +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/pg_upgrade/002_p...
--- /tmp/cirrus-ci-build/src/test/regress/expected/indexing.out	2026-05-08 10:45:18.784896005 +0000
+++ /tmp/cirrus-ci-build/build/testrun/pg_upgrade/002_pg_upgrade/data/results/indexing.out	2026-05-08 10:51:03.222614282...
@@ -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-08 10:45:18.784896005 +0000
+++ /tmp/cirrus-ci-build/build/testrun/recovery/027_stream_regress/data/results/indexing.out	2026-05-08 10:52:44.5936474...
@@ -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-08 10:45:18.784896005 +0000
+++ /tmp/cirrus-ci-build/build/testrun/regress/regress/results/indexing.out	2026-05-08 10:51:05.822581874 +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-08 10:45:18.784896005 +0000
+++ /tmp/cirrus-ci-build/build/testrun/test_plan_advice/001_replan_regress/data/results/indexing.out	2026-05-08 10:51:11...
@@ -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-08 10:45:29
+++ /Users/admin/pgsql/build/testrun/pg_upgrade/002_pg_upgrade/data/results/indexing.out	2026-05-08 10:50:28
@@ -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-08 10:45:29
+++ /Users/admin/pgsql/build/testrun/recovery/027_stream_regress/data/results/indexing.out	2026-05-08 10:51: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/regress/regress/resu...
--- /Users/admin/pgsql/src/test/regress/expected/indexing.out	2026-05-08 10:45:29
+++ /Users/admin/pgsql/build/testrun/regress/regress/results/indexing.out	2026-05-08 10:50:28
@@ -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-08 10:45:29
+++ /Users/admin/pgsql/build/testrun/test_plan_advice/001_replan_regress/data/results/indexing.out	2026-05-08 10:50:30
@@ -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	Fri May  8 10:45:46 2026
+++ /home/postgres/postgres/build/testrun/pg_upgrade/002_pg_upgrade/data/results/indexing.out	Fri May  8 10:51:54 2026
@@ -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	Fri May  8 10:45:46 2026
+++ /home/postgres/postgres/build/testrun/recovery/027_stream_regress/data/results/indexing.out	Fri May  8 10:54:50 2026
@@ -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	Fri May  8 10:45:46 2026
+++ /home/postgres/postgres/build/testrun/regress/regress/results/indexing.out	Fri May  8 10:51:45 2026
@@ -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	Fri May  8 10:45:46 2026
+++ /home/postgres/postgres/build/testrun/test_plan_advice/001_replan_regress/data/results/indexing.out	Fri May  8 10:51...
@@ -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-08 10:45:20.166046100 +0000
+++ C:/cirrus/build/testrun/pg_upgrade/002_pg_upgrade/data/results/indexing.out	2026-05-08 10:50:32.728275900 +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-08 10:45:20.166046100 +0000
+++ C:/cirrus/build/testrun/recovery/027_stream_regress/data/results/indexing.out	2026-05-08 10:54:05.599280200 +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-08 10:45:20.166046100 +0000
+++ C:/cirrus/build/testrun/regress/regress/results/indexing.out	2026-05-08 10:50:19.481693800 +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-08 10:45:20.166046100 +0000
+++ C:/cirrus/build/testrun/test_plan_advice/001_replan_regress/data/results/indexing.out	2026-05-08 10:50:28.044678000 ...
@@ -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-08 08:50:57.426591430 +0000
+++ /tmp/cirrus-ci-build/src/bin/pg_upgrade/tmp_check/results/indexing.out	2026-05-08 09:00:13.449984965 +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-08 08:50:57.426591430 +0000
+++ /tmp/cirrus-ci-build/src/test/modules/test_plan_advice/tmp_check/results/indexing.out	2026-05-08 09:01:15.725940310 ...
@@ -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-08 08:50:57.426591430 +0000
+++ /tmp/cirrus-ci-build/src/test/recovery/tmp_check/results/indexing.out	2026-05-08 09:00:55.297954710 +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-08 08:50:57.426591430 +0000
+++ /tmp/cirrus-ci-build/src/test/regress/results/indexing.out	2026-05-08 08:56:42.590172057 +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/pg_upgrade/002_p...
--- /tmp/cirrus-ci-build/src/test/regress/expected/indexing.out	2026-05-08 08:35:09.996958000 +0000
+++ /tmp/cirrus-ci-build/build/testrun/pg_upgrade/002_pg_upgrade/data/results/indexing.out	2026-05-08 08:40:59.785852000...
@@ -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-08 08:35:09.996958000 +0000
+++ /tmp/cirrus-ci-build/build/testrun/recovery/027_stream_regress/data/results/indexing.out	2026-05-08 08:42:18.9887700...
@@ -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-08 08:35:09.996958000 +0000
+++ /tmp/cirrus-ci-build/build/testrun/regress/regress/results/indexing.out	2026-05-08 08:41:08.385870000 +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-08 08:35:09.996958000 +0000
+++ /tmp/cirrus-ci-build/build/testrun/test_plan_advice/001_replan_regress/data/results/indexing.out	2026-05-08 08:41:19...
@@ -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-08 08:35:11.974003127 +0000
+++ /tmp/cirrus-ci-build/build/testrun/pg_upgrade/002_pg_upgrade/data/results/indexing.out	2026-05-08 08:40:34.370521416...
@@ -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-08 08:35:11.974003127 +0000
+++ /tmp/cirrus-ci-build/build/testrun/recovery/027_stream_regress/data/results/indexing.out	2026-05-08 08:42:14.3271990...
@@ -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-08 08:35:11.974003127 +0000
+++ /tmp/cirrus-ci-build/build/testrun/regress/regress/results/indexing.out	2026-05-08 08:40:34.106520147 +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-08 08:35:11.974003127 +0000
+++ /tmp/cirrus-ci-build/build/testrun/test_plan_advice/001_replan_regress/data/results/indexing.out	2026-05-08 08:40:41...
@@ -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-08 08:35:23
+++ /Users/admin/pgsql/build/testrun/pg_upgrade/002_pg_upgrade/data/results/indexing.out	2026-05-08 08:41:37
@@ -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-08 08:35:23
+++ /Users/admin/pgsql/build/testrun/recovery/027_stream_regress/data/results/indexing.out	2026-05-08 08:43:35
@@ -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-08 08:35:23
+++ /Users/admin/pgsql/build/testrun/regress/regress/results/indexing.out	2026-05-08 08:41:37
@@ -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-08 08:35:23
+++ /Users/admin/pgsql/build/testrun/test_plan_advice/001_replan_regress/data/results/indexing.out	2026-05-08 08:41:39
@@ -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-08 08:35:41.331384988 +0000
+++ /home/postgres/postgres/build/testrun/pg_upgrade/002_pg_upgrade/data/results/indexing.out	2026-05-08 08:39:42.049150...
@@ -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-08 08:35:41.331384988 +0000
+++ /home/postgres/postgres/build/testrun/recovery/027_stream_regress/data/results/indexing.out	2026-05-08 08:40:38.6482...
@@ -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-08 08:35:41.331384988 +0000
+++ /home/postgres/postgres/build/testrun/regress/regress/results/indexing.out	2026-05-08 08:39:33.941976804 +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-08 08:35:41.331384988 +0000
+++ /home/postgres/postgres/build/testrun/test_plan_advice/001_replan_regress/data/results/indexing.out	2026-05-08 08:39...
@@ -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/pg_upgrade/002_pg_...
--- C:/cirrus/src/test/regress/expected/indexing.out	2026-05-08 08:35:15.389437100 +0000
+++ C:/cirrus/build/testrun/pg_upgrade/002_pg_upgrade/data/results/indexing.out	2026-05-08 08:40:39.247133800 +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-08 08:35:15.389437100 +0000
+++ C:/cirrus/build/testrun/recovery/027_stream_regress/data/results/indexing.out	2026-05-08 08:44:14.835873800 +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-08 08:35:15.389437100 +0000
+++ C:/cirrus/build/testrun/regress/regress/results/indexing.out	2026-05-08 08:40:18.691939800 +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-08 08:35:15.389437100 +0000
+++ C:/cirrus/build/testrun/test_plan_advice/001_replan_regress/data/results/indexing.out	2026-05-08 08:40:32.418031100 ...
@@ -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/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;

diff -U3 /Users/admin/pgsql/contrib/pg_stat_statements/expected/wal.out /Users/admin/pgsql/build/testrun/pg_stat_stateme...
--- /Users/admin/pgsql/contrib/pg_stat_statements/expected/wal.out	2026-04-28 17:20:14
+++ /Users/admin/pgsql/build/testrun/pg_stat_statements/regress/results/wal.out	2026-04-28 17:26:55
@@ -16,7 +16,7 @@
                             query                             | calls | rows | wal_bytes_generated | wal_records_genera...
 --------------------------------------------------------------+-------+------+---------------------+-------------------...
  DELETE FROM pgss_wal_tab WHERE a > $1                        |     1 |    1 | t                   | t                 ...
- INSERT INTO pgss_wal_tab VALUES(generate_series($1, $2), $3) |     1 |   10 | t                   | t                 ...
+ INSERT INTO pgss_wal_tab VALUES(generate_series($1, $2), $3) |     1 |   10 | t                   | t                 ...
  SELECT pg_stat_statements_reset() IS NOT NULL AS t           |     1 |    1 | f                   | f                 ...
  SET pg_stat_statements.track_utility = $1                    |     1 |    0 | f                   | f                 ...
  UPDATE pgss_wal_tab SET b = $1 WHERE a > $2                  |     1 |    3 | t                   | t                 ...

diff -U3 /Users/admin/pgsql/src/test/regress/expected/vacuum.out /Users/admin/pgsql/build/testrun/pg_upgrade/002_pg_upgr...
--- /Users/admin/pgsql/src/test/regress/expected/vacuum.out	2026-04-28 17:20:17
+++ /Users/admin/pgsql/build/testrun/pg_upgrade/002_pg_upgrade/data/results/vacuum.out	2026-04-28 17:24:42
@@ -231,7 +231,7 @@
 SELECT pg_relation_size('vac_truncate_test') > 0;
  ?column? 
 ----------
- t
+ f
 (1 row)
 
 SET vacuum_truncate = false;
@@ -251,7 +251,7 @@
 SELECT pg_relation_size('vac_truncate_test') > 0;
  ?column? 
 ----------
- t
+ f
 (1 row)
 
...

diff -U3 /Users/admin/pgsql/contrib/pg_walinspect/expected/pg_walinspect.out /Users/admin/pgsql/build/testrun/pg_walinsp...
--- /Users/admin/pgsql/contrib/pg_walinspect/expected/pg_walinspect.out	2026-04-28 17:20:14
+++ /Users/admin/pgsql/build/testrun/pg_walinspect/regress/results/pg_walinspect.out	2026-04-28 17:26:56
@@ -98,7 +98,7 @@
 			WHERE block_ref LIKE concat('%', :'sample_tbl_oid', '%') AND resource_manager = 'Heap';
  ok 
 ----
- t
+ f
 (1 row)
 
 -- ===================================================================
@@ -109,7 +109,7 @@
 			WHERE resource_manager = 'Heap' AND record_type = 'INSERT';
  ok 
 ----
- t
+ f
 (1 row)
 
...

diff -U3 /Users/admin/pgsql/contrib/postgres_fdw/expected/postgres_fdw.out /Users/admin/pgsql/build/testrun/postgres_fdw...
--- /Users/admin/pgsql/contrib/postgres_fdw/expected/postgres_fdw.out	2026-04-28 17:20:14
+++ /Users/admin/pgsql/build/testrun/postgres_fdw/regress/results/postgres_fdw.out	2026-04-28 17:27:01
@@ -3016,13 +3016,16 @@
 -- GROUP BY clause having expressions
 explain (verbose, costs off)
 select c2/2, sum(c2) * (c2/2) from ft1 group by c2/2 order by c2/2;
-                                                    QUERY PLAN                                                    
-------------------------------------------------------------------------------------------------------------------
- Foreign Scan
+                                      QUERY PLAN                                       
+---------------------------------------------------------------------------------------
+ Sort
    Output: ((c2 / 2)), ((sum(c2) * (c2 / 2)))
-   Relations: Aggregate on (public.ft1)
-   Remote SQL: SELECT (c2 / 2), (sum(c2) * (c2 / 2)) FROM "S 1"."T 1" GROUP BY 1 ORDER BY (c2 / 2) ASC NULLS LAST
-(4 rows)
+   Sort Key: ((ft1.c2 / 2))
+   ->  Foreign Scan
+         Output: ((c2 / 2)), ((sum(c2) * (c2 / 2)))
...

diff -U3 /Users/admin/pgsql/src/test/regress/expected/vacuum.out /Users/admin/pgsql/build/testrun/recovery/027_stream_re...
--- /Users/admin/pgsql/src/test/regress/expected/vacuum.out	2026-04-28 17:20:17
+++ /Users/admin/pgsql/build/testrun/recovery/027_stream_regress/data/results/vacuum.out	2026-04-28 17:26:03
@@ -231,7 +231,7 @@
 SELECT pg_relation_size('vac_truncate_test') > 0;
  ?column? 
 ----------
- t
+ f
 (1 row)
 
 SET vacuum_truncate = false;
@@ -251,7 +251,7 @@
 SELECT pg_relation_size('vac_truncate_test') > 0;
  ?column? 
 ----------
- t
+ f
 (1 row)
 
...

diff -U3 /Users/admin/pgsql/src/test/regress/expected/vacuum.out /Users/admin/pgsql/build/testrun/regress/regress/result...
--- /Users/admin/pgsql/src/test/regress/expected/vacuum.out	2026-04-28 17:20:17
+++ /Users/admin/pgsql/build/testrun/regress/regress/results/vacuum.out	2026-04-28 17:24:39
@@ -231,7 +231,7 @@
 SELECT pg_relation_size('vac_truncate_test') > 0;
  ?column? 
 ----------
- t
+ f
 (1 row)
 
 SET vacuum_truncate = false;
@@ -251,7 +251,7 @@
 SELECT pg_relation_size('vac_truncate_test') > 0;
  ?column? 
 ----------
- t
+ f
 (1 row)
 
...

diff -U3 /Users/admin/pgsql/src/test/regress/expected/vacuum.out /Users/admin/pgsql/build/testrun/test_plan_advice/001_r...
--- /Users/admin/pgsql/src/test/regress/expected/vacuum.out	2026-04-28 17:20:17
+++ /Users/admin/pgsql/build/testrun/test_plan_advice/001_replan_regress/data/results/vacuum.out	2026-04-28 17:24:41
@@ -231,7 +231,7 @@
 SELECT pg_relation_size('vac_truncate_test') > 0;
  ?column? 
 ----------
- t
+ f
 (1 row)
 
 SET vacuum_truncate = false;
@@ -251,7 +251,7 @@
 SELECT pg_relation_size('vac_truncate_test') > 0;
  ?column? 
 ----------
- t
+ f
 (1 row)
 
...

diff --strip-trailing-cr -U3 C:/cirrus/contrib/pg_stat_statements/expected/wal.out C:/cirrus/build/testrun/pg_stat_state...
--- C:/cirrus/contrib/pg_stat_statements/expected/wal.out	2026-04-28 17:20:15.442740200 +0000
+++ C:/cirrus/build/testrun/pg_stat_statements/regress/results/wal.out	2026-04-28 17:29:56.133181200 +0000
@@ -16,7 +16,7 @@
                             query                             | calls | rows | wal_bytes_generated | wal_records_genera...
 --------------------------------------------------------------+-------+------+---------------------+-------------------...
  DELETE FROM pgss_wal_tab WHERE a > $1                        |     1 |    1 | t                   | t                 ...
- INSERT INTO pgss_wal_tab VALUES(generate_series($1, $2), $3) |     1 |   10 | t                   | t                 ...
+ INSERT INTO pgss_wal_tab VALUES(generate_series($1, $2), $3) |     1 |   10 | t                   | t                 ...
  SELECT pg_stat_statements_reset() IS NOT NULL AS t           |     1 |    1 | f                   | f                 ...
  SET pg_stat_statements.track_utility = $1                    |     1 |    0 | f                   | f                 ...
  UPDATE pgss_wal_tab SET b = $1 WHERE a > $2                  |     1 |    3 | t                   | t                 ...

diff --strip-trailing-cr -U3 C:/cirrus/src/test/regress/expected/copy.out C:/cirrus/build/testrun/pg_upgrade/002_pg_upgr...
--- C:/cirrus/src/test/regress/expected/copy.out	2026-04-28 17:20:20.144378900 +0000
+++ C:/cirrus/build/testrun/pg_upgrade/002_pg_upgrade/data/results/copy.out	2026-04-28 17:23:11.635005800 +0000
@@ -624,24 +624,28 @@
 INSERT INTO copy_bulk_src SELECT g, 'row-' || g FROM generate_series(1, 2500) g;
 CREATE TABLE copy_bulk_dst (a int, b text);
 COPY copy_bulk_src TO '/tmp/copy_buffered_bulk_test.csv' CSV;
+ERROR:  could not open file "/tmp/copy_buffered_bulk_test.csv" for writing: No such file or directory
+HINT:  COPY TO instructs the PostgreSQL server process to write a file. You may want a client-side facility such as psq...
 COPY copy_bulk_dst FROM '/tmp/copy_buffered_bulk_test.csv' CSV;
+ERROR:  could not open file "/tmp/copy_buffered_bulk_test.csv" for reading: No such file or directory
+HINT:  COPY FROM instructs the PostgreSQL server process to read a file. You may want a client-side facility such as ps...
 SELECT count(*) FROM copy_bulk_dst;
  count 
 -------
-  2500
+     0
 (1 row)
 
 SELECT min(a), max(a) FROM copy_bulk_dst;
...

diff --strip-trailing-cr -U3 C:/cirrus/contrib/pg_walinspect/expected/pg_walinspect.out C:/cirrus/build/testrun/pg_walin...
--- C:/cirrus/contrib/pg_walinspect/expected/pg_walinspect.out	2026-04-28 17:20:15.520080600 +0000
+++ C:/cirrus/build/testrun/pg_walinspect/regress/results/pg_walinspect.out	2026-04-28 17:29:57.337775400 +0000
@@ -98,7 +98,7 @@
 			WHERE block_ref LIKE concat('%', :'sample_tbl_oid', '%') AND resource_manager = 'Heap';
  ok 
 ----
- t
+ f
 (1 row)
 
 -- ===================================================================
@@ -109,7 +109,7 @@
 			WHERE resource_manager = 'Heap' AND record_type = 'INSERT';
  ok 
 ----
- t
+ f
 (1 row)
 
...

diff --strip-trailing-cr -U3 C:/cirrus/contrib/postgres_fdw/expected/postgres_fdw.out C:/cirrus/build/testrun/postgres_f...
--- C:/cirrus/contrib/postgres_fdw/expected/postgres_fdw.out	2026-04-28 17:20:15.630553400 +0000
+++ C:/cirrus/build/testrun/postgres_fdw/regress/results/postgres_fdw.out	2026-04-28 17:30:10.046740500 +0000
@@ -3016,13 +3016,16 @@
 -- GROUP BY clause having expressions
 explain (verbose, costs off)
 select c2/2, sum(c2) * (c2/2) from ft1 group by c2/2 order by c2/2;
-                                                    QUERY PLAN                                                    
-------------------------------------------------------------------------------------------------------------------
- Foreign Scan
+                                      QUERY PLAN                                       
+---------------------------------------------------------------------------------------
+ Sort
    Output: ((c2 / 2)), ((sum(c2) * (c2 / 2)))
-   Relations: Aggregate on (public.ft1)
-   Remote SQL: SELECT (c2 / 2), (sum(c2) * (c2 / 2)) FROM "S 1"."T 1" GROUP BY 1 ORDER BY (c2 / 2) ASC NULLS LAST
-(4 rows)
+   Sort Key: ((ft1.c2 / 2))
+   ->  Foreign Scan
+         Output: ((c2 / 2)), ((sum(c2) * (c2 / 2)))
...

diff --strip-trailing-cr -U3 C:/cirrus/src/test/regress/expected/copy.out C:/cirrus/build/testrun/recovery/027_stream_re...
--- C:/cirrus/src/test/regress/expected/copy.out	2026-04-28 17:20:20.144378900 +0000
+++ C:/cirrus/build/testrun/recovery/027_stream_regress/data/results/copy.out	2026-04-28 17:27:09.560575000 +0000
@@ -624,24 +624,28 @@
 INSERT INTO copy_bulk_src SELECT g, 'row-' || g FROM generate_series(1, 2500) g;
 CREATE TABLE copy_bulk_dst (a int, b text);
 COPY copy_bulk_src TO '/tmp/copy_buffered_bulk_test.csv' CSV;
+ERROR:  could not open file "/tmp/copy_buffered_bulk_test.csv" for writing: No such file or directory
+HINT:  COPY TO instructs the PostgreSQL server process to write a file. You may want a client-side facility such as psq...
 COPY copy_bulk_dst FROM '/tmp/copy_buffered_bulk_test.csv' CSV;
+ERROR:  could not open file "/tmp/copy_buffered_bulk_test.csv" for reading: No such file or directory
+HINT:  COPY FROM instructs the PostgreSQL server process to read a file. You may want a client-side facility such as ps...
 SELECT count(*) FROM copy_bulk_dst;
  count 
 -------
-  2500
+     0
 (1 row)
 
 SELECT min(a), max(a) FROM copy_bulk_dst;
...

diff --strip-trailing-cr -U3 C:/cirrus/src/test/regress/expected/copy.out C:/cirrus/build/testrun/regress/regress/result...
--- C:/cirrus/src/test/regress/expected/copy.out	2026-04-28 17:20:20.144378900 +0000
+++ C:/cirrus/build/testrun/regress/regress/results/copy.out	2026-04-28 17:23:07.538810800 +0000
@@ -624,24 +624,28 @@
 INSERT INTO copy_bulk_src SELECT g, 'row-' || g FROM generate_series(1, 2500) g;
 CREATE TABLE copy_bulk_dst (a int, b text);
 COPY copy_bulk_src TO '/tmp/copy_buffered_bulk_test.csv' CSV;
+ERROR:  could not open file "/tmp/copy_buffered_bulk_test.csv" for writing: No such file or directory
+HINT:  COPY TO instructs the PostgreSQL server process to write a file. You may want a client-side facility such as psq...
 COPY copy_bulk_dst FROM '/tmp/copy_buffered_bulk_test.csv' CSV;
+ERROR:  could not open file "/tmp/copy_buffered_bulk_test.csv" for reading: No such file or directory
+HINT:  COPY FROM instructs the PostgreSQL server process to read a file. You may want a client-side facility such as ps...
 SELECT count(*) FROM copy_bulk_dst;
  count 
 -------
-  2500
+     0
 (1 row)
 
 SELECT min(a), max(a) FROM copy_bulk_dst;
...

diff --strip-trailing-cr -U3 C:/cirrus/src/test/regress/expected/copy.out C:/cirrus/build/testrun/test_plan_advice/001_r...
--- C:/cirrus/src/test/regress/expected/copy.out	2026-04-28 17:20:20.144378900 +0000
+++ C:/cirrus/build/testrun/test_plan_advice/001_replan_regress/data/results/copy.out	2026-04-28 17:23:10.525629600 +000...
@@ -624,24 +624,28 @@
 INSERT INTO copy_bulk_src SELECT g, 'row-' || g FROM generate_series(1, 2500) g;
 CREATE TABLE copy_bulk_dst (a int, b text);
 COPY copy_bulk_src TO '/tmp/copy_buffered_bulk_test.csv' CSV;
+ERROR:  could not open file "/tmp/copy_buffered_bulk_test.csv" for writing: No such file or directory
+HINT:  COPY TO instructs the PostgreSQL server process to write a file. You may want a client-side facility such as psq...
 COPY copy_bulk_dst FROM '/tmp/copy_buffered_bulk_test.csv' CSV;
+ERROR:  could not open file "/tmp/copy_buffered_bulk_test.csv" for reading: No such file or directory
+HINT:  COPY FROM instructs the PostgreSQL server process to read a file. You may want a client-side facility such as ps...
 SELECT count(*) FROM copy_bulk_dst;
  count 
 -------
-  2500
+     0
 (1 row)
 
 SELECT min(a), max(a) FROM copy_bulk_dst;
...

diff -U3 /tmp/cirrus-ci-build/contrib/pg_stat_statements/expected/wal.out /tmp/cirrus-ci-build/build/testrun/pg_stat_sta...
--- /tmp/cirrus-ci-build/contrib/pg_stat_statements/expected/wal.out	2026-04-28 17:20:08.558306780 +0000
+++ /tmp/cirrus-ci-build/build/testrun/pg_stat_statements/regress/results/wal.out	2026-04-28 17:28:14.005169841 +0000
@@ -16,7 +16,7 @@
                             query                             | calls | rows | wal_bytes_generated | wal_records_genera...
 --------------------------------------------------------------+-------+------+---------------------+-------------------...
  DELETE FROM pgss_wal_tab WHERE a > $1                        |     1 |    1 | t                   | t                 ...
- INSERT INTO pgss_wal_tab VALUES(generate_series($1, $2), $3) |     1 |   10 | t                   | t                 ...
+ INSERT INTO pgss_wal_tab VALUES(generate_series($1, $2), $3) |     1 |   10 | t                   | t                 ...
  SELECT pg_stat_statements_reset() IS NOT NULL AS t           |     1 |    1 | f                   | f                 ...
  SET pg_stat_statements.track_utility = $1                    |     1 |    0 | f                   | f                 ...
  UPDATE pgss_wal_tab SET b = $1 WHERE a > $2                  |     1 |    3 | t                   | t                 ...

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/vacuum.out /tmp/cirrus-ci-build/build/testrun/pg_upgrade/002_pg_...
--- /tmp/cirrus-ci-build/src/test/regress/expected/vacuum.out	2026-04-28 17:20:10.562306822 +0000
+++ /tmp/cirrus-ci-build/build/testrun/pg_upgrade/002_pg_upgrade/data/results/vacuum.out	2026-04-28 17:24:39.557324834 +...
@@ -231,7 +231,7 @@
 SELECT pg_relation_size('vac_truncate_test') > 0;
  ?column? 
 ----------
- t
+ f
 (1 row)
 
 SET vacuum_truncate = false;
@@ -251,7 +251,7 @@
 SELECT pg_relation_size('vac_truncate_test') > 0;
  ?column? 
 ----------
- t
+ f
 (1 row)
 
...

diff -U3 /tmp/cirrus-ci-build/contrib/pg_walinspect/expected/pg_walinspect.out /tmp/cirrus-ci-build/build/testrun/pg_wal...
--- /tmp/cirrus-ci-build/contrib/pg_walinspect/expected/pg_walinspect.out	2026-04-28 17:20:08.570306780 +0000
+++ /tmp/cirrus-ci-build/build/testrun/pg_walinspect/regress/results/pg_walinspect.out	2026-04-28 17:28:17.589165242 +00...
@@ -98,7 +98,7 @@
 			WHERE block_ref LIKE concat('%', :'sample_tbl_oid', '%') AND resource_manager = 'Heap';
  ok 
 ----
- t
+ f
 (1 row)
 
 -- ===================================================================
@@ -109,7 +109,7 @@
 			WHERE resource_manager = 'Heap' AND record_type = 'INSERT';
  ok 
 ----
- t
+ f
 (1 row)
 
...

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-04-28 17:20:08.598306780 +0000
+++ /tmp/cirrus-ci-build/build/testrun/postgres_fdw/regress/results/postgres_fdw.out	2026-04-28 17:28:38.373140297 +0000
@@ -3016,13 +3016,16 @@
 -- GROUP BY clause having expressions
 explain (verbose, costs off)
 select c2/2, sum(c2) * (c2/2) from ft1 group by c2/2 order by c2/2;
-                                                    QUERY PLAN                                                    
-------------------------------------------------------------------------------------------------------------------
- Foreign Scan
+                                      QUERY PLAN                                       
+---------------------------------------------------------------------------------------
+ Sort
    Output: ((c2 / 2)), ((sum(c2) * (c2 / 2)))
-   Relations: Aggregate on (public.ft1)
-   Remote SQL: SELECT (c2 / 2), (sum(c2) * (c2 / 2)) FROM "S 1"."T 1" GROUP BY 1 ORDER BY (c2 / 2) ASC NULLS LAST
-(4 rows)
+   Sort Key: ((ft1.c2 / 2))
+   ->  Foreign Scan
+         Output: ((c2 / 2)), ((sum(c2) * (c2 / 2)))
...

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/vacuum.out /tmp/cirrus-ci-build/build/testrun/recovery/027_strea...
--- /tmp/cirrus-ci-build/src/test/regress/expected/vacuum.out	2026-04-28 17:20:10.562306822 +0000
+++ /tmp/cirrus-ci-build/build/testrun/recovery/027_stream_regress/data/results/vacuum.out	2026-04-28 17:26:59.645216146...
@@ -231,7 +231,7 @@
 SELECT pg_relation_size('vac_truncate_test') > 0;
  ?column? 
 ----------
- t
+ f
 (1 row)
 
 SET vacuum_truncate = false;
@@ -251,7 +251,7 @@
 SELECT pg_relation_size('vac_truncate_test') > 0;
  ?column? 
 ----------
- t
+ f
 (1 row)
 
...

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/vacuum.out /tmp/cirrus-ci-build/build/testrun/regress/regress/re...
--- /tmp/cirrus-ci-build/src/test/regress/expected/vacuum.out	2026-04-28 17:20:10.562306822 +0000
+++ /tmp/cirrus-ci-build/build/testrun/regress/regress/results/vacuum.out	2026-04-28 17:24:41.253322163 +0000
@@ -231,7 +231,7 @@
 SELECT pg_relation_size('vac_truncate_test') > 0;
  ?column? 
 ----------
- t
+ f
 (1 row)
 
 SET vacuum_truncate = false;
@@ -251,7 +251,7 @@
 SELECT pg_relation_size('vac_truncate_test') > 0;
  ?column? 
 ----------
- t
+ f
 (1 row)
 
...

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/vacuum.out /tmp/cirrus-ci-build/build/testrun/test_plan_advice/0...
--- /tmp/cirrus-ci-build/src/test/regress/expected/vacuum.out	2026-04-28 17:20:10.562306822 +0000
+++ /tmp/cirrus-ci-build/build/testrun/test_plan_advice/001_replan_regress/data/results/vacuum.out	2026-04-28 17:24:43.4...
@@ -231,7 +231,7 @@
 SELECT pg_relation_size('vac_truncate_test') > 0;
  ?column? 
 ----------
- t
+ f
 (1 row)
 
 SET vacuum_truncate = false;
@@ -251,7 +251,7 @@
 SELECT pg_relation_size('vac_truncate_test') > 0;
  ?column? 
 ----------
- t
+ f
 (1 row)
 
...

diff -U3 /tmp/cirrus-ci-build/contrib/pg_stat_statements/expected/wal.out /tmp/cirrus-ci-build/contrib/pg_stat_statement...
--- /tmp/cirrus-ci-build/contrib/pg_stat_statements/expected/wal.out	2026-04-28 17:20:36.687516834 +0000
+++ /tmp/cirrus-ci-build/contrib/pg_stat_statements/results/wal.out	2026-04-28 17:27:07.747114783 +0000
@@ -16,7 +16,7 @@
                             query                             | calls | rows | wal_bytes_generated | wal_records_genera...
 --------------------------------------------------------------+-------+------+---------------------+-------------------...
  DELETE FROM pgss_wal_tab WHERE a > $1                        |     1 |    1 | t                   | t                 ...
- INSERT INTO pgss_wal_tab VALUES(generate_series($1, $2), $3) |     1 |   10 | t                   | t                 ...
+ INSERT INTO pgss_wal_tab VALUES(generate_series($1, $2), $3) |     1 |   10 | t                   | t                 ...
  SELECT pg_stat_statements_reset() IS NOT NULL AS t           |     1 |    1 | f                   | f                 ...
  SET pg_stat_statements.track_utility = $1                    |     1 |    0 | f                   | f                 ...
  UPDATE pgss_wal_tab SET b = $1 WHERE a > $2                  |     1 |    3 | t                   | t                 ...

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/vacuum.out /tmp/cirrus-ci-build/src/bin/pg_upgrade/tmp_check/res...
--- /tmp/cirrus-ci-build/src/test/regress/expected/vacuum.out	2026-04-28 17:20:38.527514763 +0000
+++ /tmp/cirrus-ci-build/src/bin/pg_upgrade/tmp_check/results/vacuum.out	2026-04-28 17:27:30.907096792 +0000
@@ -231,7 +231,7 @@
 SELECT pg_relation_size('vac_truncate_test') > 0;
  ?column? 
 ----------
- t
+ f
 (1 row)
 
 SET vacuum_truncate = false;
@@ -251,7 +251,7 @@
 SELECT pg_relation_size('vac_truncate_test') > 0;
  ?column? 
 ----------
- t
+ f
 (1 row)
 
...

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/vacuum.out /tmp/cirrus-ci-build/src/test/modules/test_plan_advic...
--- /tmp/cirrus-ci-build/src/test/regress/expected/vacuum.out	2026-04-28 17:20:38.527514763 +0000
+++ /tmp/cirrus-ci-build/src/test/modules/test_plan_advice/tmp_check/results/vacuum.out	2026-04-28 17:29:34.459015702 +0...
@@ -231,7 +231,7 @@
 SELECT pg_relation_size('vac_truncate_test') > 0;
  ?column? 
 ----------
- t
+ f
 (1 row)
 
 SET vacuum_truncate = false;
@@ -251,7 +251,7 @@
 SELECT pg_relation_size('vac_truncate_test') > 0;
  ?column? 
 ----------
- t
+ f
 (1 row)
 
...

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/vacuum.out /tmp/cirrus-ci-build/src/test/recovery/tmp_check/resu...
--- /tmp/cirrus-ci-build/src/test/regress/expected/vacuum.out	2026-04-28 17:20:38.527514763 +0000
+++ /tmp/cirrus-ci-build/src/test/recovery/tmp_check/results/vacuum.out	2026-04-28 17:29:37.199014095 +0000
@@ -231,7 +231,7 @@
 SELECT pg_relation_size('vac_truncate_test') > 0;
  ?column? 
 ----------
- t
+ f
 (1 row)
 
 SET vacuum_truncate = false;
@@ -251,7 +251,7 @@
 SELECT pg_relation_size('vac_truncate_test') > 0;
  ?column? 
 ----------
- t
+ f
 (1 row)
 
...

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/vacuum.out /tmp/cirrus-ci-build/src/test/regress/results/vacuum....
--- /tmp/cirrus-ci-build/src/test/regress/expected/vacuum.out	2026-04-28 17:20:38.527514763 +0000
+++ /tmp/cirrus-ci-build/src/test/regress/results/vacuum.out	2026-04-28 17:25:23.835216253 +0000
@@ -231,7 +231,7 @@
 SELECT pg_relation_size('vac_truncate_test') > 0;
  ?column? 
 ----------
- t
+ f
 (1 row)
 
 SET vacuum_truncate = false;
@@ -251,7 +251,7 @@
 SELECT pg_relation_size('vac_truncate_test') > 0;
  ?column? 
 ----------
- t
+ f
 (1 row)
 
...

diff -U3 /home/postgres/postgres/contrib/pg_stat_statements/expected/wal.out /home/postgres/postgres/build/testrun/pg_st...
--- /home/postgres/postgres/contrib/pg_stat_statements/expected/wal.out	Tue Apr 28 17:21:01 2026
+++ /home/postgres/postgres/build/testrun/pg_stat_statements/regress/results/wal.out	Tue Apr 28 17:27:05 2026
@@ -16,7 +16,7 @@
                             query                             | calls | rows | wal_bytes_generated | wal_records_genera...
 --------------------------------------------------------------+-------+------+---------------------+-------------------...
  DELETE FROM pgss_wal_tab WHERE a > $1                        |     1 |    1 | t                   | t                 ...
- INSERT INTO pgss_wal_tab VALUES(generate_series($1, $2), $3) |     1 |   10 | t                   | t                 ...
+ INSERT INTO pgss_wal_tab VALUES(generate_series($1, $2), $3) |     1 |   10 | t                   | t                 ...
  SELECT pg_stat_statements_reset() IS NOT NULL AS t           |     1 |    1 | f                   | f                 ...
  SET pg_stat_statements.track_utility = $1                    |     1 |    0 | f                   | f                 ...
  UPDATE pgss_wal_tab SET b = $1 WHERE a > $2                  |     1 |    3 | t                   | t                 ...

diff -U3 /home/postgres/postgres/src/test/regress/expected/vacuum.out /home/postgres/postgres/build/testrun/pg_upgrade/0...
--- /home/postgres/postgres/src/test/regress/expected/vacuum.out	Tue Apr 28 17:21:11 2026
+++ /home/postgres/postgres/build/testrun/pg_upgrade/002_pg_upgrade/data/results/vacuum.out	Tue Apr 28 17:24:10 2026
@@ -231,7 +231,7 @@
 SELECT pg_relation_size('vac_truncate_test') > 0;
  ?column? 
 ----------
- t
+ f
 (1 row)
 
 SET vacuum_truncate = false;
@@ -251,7 +251,7 @@
 SELECT pg_relation_size('vac_truncate_test') > 0;
  ?column? 
 ----------
- t
+ f
 (1 row)
 
...

diff -U3 /home/postgres/postgres/contrib/pg_walinspect/expected/pg_walinspect.out /home/postgres/postgres/build/testrun/...
--- /home/postgres/postgres/contrib/pg_walinspect/expected/pg_walinspect.out	Tue Apr 28 17:21:02 2026
+++ /home/postgres/postgres/build/testrun/pg_walinspect/regress/results/pg_walinspect.out	Tue Apr 28 17:27:06 2026
@@ -98,7 +98,7 @@
 			WHERE block_ref LIKE concat('%', :'sample_tbl_oid', '%') AND resource_manager = 'Heap';
  ok 
 ----
- t
+ f
 (1 row)
 
 -- ===================================================================
@@ -109,7 +109,7 @@
 			WHERE resource_manager = 'Heap' AND record_type = 'INSERT';
  ok 
 ----
- t
+ f
 (1 row)
 
...

diff -U3 /home/postgres/postgres/contrib/postgres_fdw/expected/postgres_fdw.out /home/postgres/postgres/build/testrun/po...
--- /home/postgres/postgres/contrib/postgres_fdw/expected/postgres_fdw.out	Tue Apr 28 17:21:02 2026
+++ /home/postgres/postgres/build/testrun/postgres_fdw/regress/results/postgres_fdw.out	Tue Apr 28 17:27:25 2026
@@ -3016,13 +3016,16 @@
 -- GROUP BY clause having expressions
 explain (verbose, costs off)
 select c2/2, sum(c2) * (c2/2) from ft1 group by c2/2 order by c2/2;
-                                                    QUERY PLAN                                                    
-------------------------------------------------------------------------------------------------------------------
- Foreign Scan
+                                      QUERY PLAN                                       
+---------------------------------------------------------------------------------------
+ Sort
    Output: ((c2 / 2)), ((sum(c2) * (c2 / 2)))
-   Relations: Aggregate on (public.ft1)
-   Remote SQL: SELECT (c2 / 2), (sum(c2) * (c2 / 2)) FROM "S 1"."T 1" GROUP BY 1 ORDER BY (c2 / 2) ASC NULLS LAST
-(4 rows)
+   Sort Key: ((ft1.c2 / 2))
+   ->  Foreign Scan
+         Output: ((c2 / 2)), ((sum(c2) * (c2 / 2)))
...

diff -U3 /home/postgres/postgres/src/test/regress/expected/vacuum.out /home/postgres/postgres/build/testrun/recovery/027...
--- /home/postgres/postgres/src/test/regress/expected/vacuum.out	Tue Apr 28 17:21:11 2026
+++ /home/postgres/postgres/build/testrun/recovery/027_stream_regress/data/results/vacuum.out	Tue Apr 28 17:26:09 2026
@@ -231,7 +231,7 @@
 SELECT pg_relation_size('vac_truncate_test') > 0;
  ?column? 
 ----------
- t
+ f
 (1 row)
 
 SET vacuum_truncate = false;
@@ -251,7 +251,7 @@
 SELECT pg_relation_size('vac_truncate_test') > 0;
  ?column? 
 ----------
- t
+ f
 (1 row)
 
...

diff -U3 /home/postgres/postgres/src/test/regress/expected/vacuum.out /home/postgres/postgres/build/testrun/regress/regr...
--- /home/postgres/postgres/src/test/regress/expected/vacuum.out	Tue Apr 28 17:21:11 2026
+++ /home/postgres/postgres/build/testrun/regress/regress/results/vacuum.out	Tue Apr 28 17:24:05 2026
@@ -231,7 +231,7 @@
 SELECT pg_relation_size('vac_truncate_test') > 0;
  ?column? 
 ----------
- t
+ f
 (1 row)
 
 SET vacuum_truncate = false;
@@ -251,7 +251,7 @@
 SELECT pg_relation_size('vac_truncate_test') > 0;
  ?column? 
 ----------
- t
+ f
 (1 row)
 
...

diff -U3 /home/postgres/postgres/src/test/regress/expected/vacuum.out /home/postgres/postgres/build/testrun/test_plan_ad...
--- /home/postgres/postgres/src/test/regress/expected/vacuum.out	Tue Apr 28 17:21:11 2026
+++ /home/postgres/postgres/build/testrun/test_plan_advice/001_replan_regress/data/results/vacuum.out	Tue Apr 28 17:24:1...
@@ -231,7 +231,7 @@
 SELECT pg_relation_size('vac_truncate_test') > 0;
  ?column? 
 ----------
- t
+ f
 (1 row)
 
 SET vacuum_truncate = false;
@@ -251,7 +251,7 @@
 SELECT pg_relation_size('vac_truncate_test') > 0;
  ?column? 
 ----------
- t
+ f
 (1 row)
 
...

diff -U3 /home/postgres/postgres/contrib/pg_stat_statements/expected/wal.out /home/postgres/postgres/build/testrun/pg_st...
--- /home/postgres/postgres/contrib/pg_stat_statements/expected/wal.out	2026-04-28 17:20:57.785658987 +0000
+++ /home/postgres/postgres/build/testrun/pg_stat_statements/regress/results/wal.out	2026-04-28 17:24:46.940200163 +0000
@@ -16,7 +16,7 @@
                             query                             | calls | rows | wal_bytes_generated | wal_records_genera...
 --------------------------------------------------------------+-------+------+---------------------+-------------------...
  DELETE FROM pgss_wal_tab WHERE a > $1                        |     1 |    1 | t                   | t                 ...
- INSERT INTO pgss_wal_tab VALUES(generate_series($1, $2), $3) |     1 |   10 | t                   | t                 ...
+ INSERT INTO pgss_wal_tab VALUES(generate_series($1, $2), $3) |     1 |   10 | t                   | t                 ...
  SELECT pg_stat_statements_reset() IS NOT NULL AS t           |     1 |    1 | f                   | f                 ...
  SET pg_stat_statements.track_utility = $1                    |     1 |    0 | f                   | f                 ...
  UPDATE pgss_wal_tab SET b = $1 WHERE a > $2                  |     1 |    3 | t                   | t                 ...

diff -U3 /home/postgres/postgres/src/test/regress/expected/vacuum.out /home/postgres/postgres/build/testrun/pg_upgrade/0...
--- /home/postgres/postgres/src/test/regress/expected/vacuum.out	2026-04-28 17:21:06.892003247 +0000
+++ /home/postgres/postgres/build/testrun/pg_upgrade/002_pg_upgrade/data/results/vacuum.out	2026-04-28 17:23:24.14153601...
@@ -231,7 +231,7 @@
 SELECT pg_relation_size('vac_truncate_test') > 0;
  ?column? 
 ----------
- t
+ f
 (1 row)
 
 SET vacuum_truncate = false;
@@ -251,7 +251,7 @@
 SELECT pg_relation_size('vac_truncate_test') > 0;
  ?column? 
 ----------
- t
+ f
 (1 row)
 
...

diff -U3 /home/postgres/postgres/contrib/pg_walinspect/expected/pg_walinspect.out /home/postgres/postgres/build/testrun/...
--- /home/postgres/postgres/contrib/pg_walinspect/expected/pg_walinspect.out	2026-04-28 17:20:57.912968021 +0000
+++ /home/postgres/postgres/build/testrun/pg_walinspect/regress/results/pg_walinspect.out	2026-04-28 17:24:47.874833874 ...
@@ -98,7 +98,7 @@
 			WHERE block_ref LIKE concat('%', :'sample_tbl_oid', '%') AND resource_manager = 'Heap';
  ok 
 ----
- t
+ f
 (1 row)
 
 -- ===================================================================
@@ -109,7 +109,7 @@
 			WHERE resource_manager = 'Heap' AND record_type = 'INSERT';
  ok 
 ----
- t
+ f
 (1 row)
 
...

diff -U3 /home/postgres/postgres/contrib/postgres_fdw/expected/postgres_fdw.out /home/postgres/postgres/build/testrun/po...
--- /home/postgres/postgres/contrib/postgres_fdw/expected/postgres_fdw.out	2026-04-28 17:20:58.107453422 +0000
+++ /home/postgres/postgres/build/testrun/postgres_fdw/regress/results/postgres_fdw.out	2026-04-28 17:24:55.037253251 +0...
@@ -3016,13 +3016,16 @@
 -- GROUP BY clause having expressions
 explain (verbose, costs off)
 select c2/2, sum(c2) * (c2/2) from ft1 group by c2/2 order by c2/2;
-                                                    QUERY PLAN                                                    
-------------------------------------------------------------------------------------------------------------------
- Foreign Scan
+                                      QUERY PLAN                                       
+---------------------------------------------------------------------------------------
+ Sort
    Output: ((c2 / 2)), ((sum(c2) * (c2 / 2)))
-   Relations: Aggregate on (public.ft1)
-   Remote SQL: SELECT (c2 / 2), (sum(c2) * (c2 / 2)) FROM "S 1"."T 1" GROUP BY 1 ORDER BY (c2 / 2) ASC NULLS LAST
-(4 rows)
+   Sort Key: ((ft1.c2 / 2))
+   ->  Foreign Scan
+         Output: ((c2 / 2)), ((sum(c2) * (c2 / 2)))
...

diff -U3 /home/postgres/postgres/src/test/regress/expected/vacuum.out /home/postgres/postgres/build/testrun/recovery/027...
--- /home/postgres/postgres/src/test/regress/expected/vacuum.out	2026-04-28 17:21:06.892003247 +0000
+++ /home/postgres/postgres/build/testrun/recovery/027_stream_regress/data/results/vacuum.out	2026-04-28 17:24:01.489371...
@@ -231,7 +231,7 @@
 SELECT pg_relation_size('vac_truncate_test') > 0;
  ?column? 
 ----------
- t
+ f
 (1 row)
 
 SET vacuum_truncate = false;
@@ -251,7 +251,7 @@
 SELECT pg_relation_size('vac_truncate_test') > 0;
  ?column? 
 ----------
- t
+ f
 (1 row)
 
...

diff -U3 /home/postgres/postgres/src/test/regress/expected/vacuum.out /home/postgres/postgres/build/testrun/regress/regr...
--- /home/postgres/postgres/src/test/regress/expected/vacuum.out	2026-04-28 17:21:06.892003247 +0000
+++ /home/postgres/postgres/build/testrun/regress/regress/results/vacuum.out	2026-04-28 17:23:20.053496839 +0000
@@ -231,7 +231,7 @@
 SELECT pg_relation_size('vac_truncate_test') > 0;
  ?column? 
 ----------
- t
+ f
 (1 row)
 
 SET vacuum_truncate = false;
@@ -251,7 +251,7 @@
 SELECT pg_relation_size('vac_truncate_test') > 0;
  ?column? 
 ----------
- t
+ f
 (1 row)
 
...

diff -U3 /home/postgres/postgres/src/test/regress/expected/vacuum.out /home/postgres/postgres/build/testrun/test_plan_ad...
--- /home/postgres/postgres/src/test/regress/expected/vacuum.out	2026-04-28 17:21:06.892003247 +0000
+++ /home/postgres/postgres/build/testrun/test_plan_advice/001_replan_regress/data/results/vacuum.out	2026-04-28 17:23:2...
@@ -231,7 +231,7 @@
 SELECT pg_relation_size('vac_truncate_test') > 0;
  ?column? 
 ----------
- t
+ f
 (1 row)
 
 SET vacuum_truncate = false;
@@ -251,7 +251,7 @@
 SELECT pg_relation_size('vac_truncate_test') > 0;
  ?column? 
 ----------
- t
+ f
 (1 row)
 
...

diff -U3 /tmp/cirrus-ci-build/contrib/pg_stat_statements/expected/wal.out /tmp/cirrus-ci-build/build/testrun/pg_stat_sta...
--- /tmp/cirrus-ci-build/contrib/pg_stat_statements/expected/wal.out	2026-04-28 17:21:09.856737000 +0000
+++ /tmp/cirrus-ci-build/build/testrun/pg_stat_statements/regress/results/wal.out	2026-04-28 17:25:44.618194000 +0000
@@ -16,7 +16,7 @@
                             query                             | calls | rows | wal_bytes_generated | wal_records_genera...
 --------------------------------------------------------------+-------+------+---------------------+-------------------...
  DELETE FROM pgss_wal_tab WHERE a > $1                        |     1 |    1 | t                   | t                 ...
- INSERT INTO pgss_wal_tab VALUES(generate_series($1, $2), $3) |     1 |   10 | t                   | t                 ...
+ INSERT INTO pgss_wal_tab VALUES(generate_series($1, $2), $3) |     1 |   10 | t                   | t                 ...
  SELECT pg_stat_statements_reset() IS NOT NULL AS t           |     1 |    1 | f                   | f                 ...
  SET pg_stat_statements.track_utility = $1                    |     1 |    0 | f                   | f                 ...
  UPDATE pgss_wal_tab SET b = $1 WHERE a > $2                  |     1 |    3 | t                   | t                 ...

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/vacuum.out /tmp/cirrus-ci-build/build/testrun/pg_upgrade/002_pg_...
--- /tmp/cirrus-ci-build/src/test/regress/expected/vacuum.out	2026-04-28 17:21:11.534108000 +0000
+++ /tmp/cirrus-ci-build/build/testrun/pg_upgrade/002_pg_upgrade/data/results/vacuum.out	2026-04-28 17:23:26.099721000 +...
@@ -231,7 +231,7 @@
 SELECT pg_relation_size('vac_truncate_test') > 0;
  ?column? 
 ----------
- t
+ f
 (1 row)
 
 SET vacuum_truncate = false;
@@ -251,7 +251,7 @@
 SELECT pg_relation_size('vac_truncate_test') > 0;
  ?column? 
 ----------
- t
+ f
 (1 row)
 
...

diff -U3 /tmp/cirrus-ci-build/contrib/pg_walinspect/expected/pg_walinspect.out /tmp/cirrus-ci-build/build/testrun/pg_wal...
--- /tmp/cirrus-ci-build/contrib/pg_walinspect/expected/pg_walinspect.out	2026-04-28 17:21:09.868222000 +0000
+++ /tmp/cirrus-ci-build/build/testrun/pg_walinspect/regress/results/pg_walinspect.out	2026-04-28 17:25:44.524403000 +00...
@@ -98,7 +98,7 @@
 			WHERE block_ref LIKE concat('%', :'sample_tbl_oid', '%') AND resource_manager = 'Heap';
  ok 
 ----
- t
+ f
 (1 row)
 
 -- ===================================================================
@@ -109,7 +109,7 @@
 			WHERE resource_manager = 'Heap' AND record_type = 'INSERT';
  ok 
 ----
- t
+ f
 (1 row)
 
...

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-04-28 17:21:09.892402000 +0000
+++ /tmp/cirrus-ci-build/build/testrun/postgres_fdw/regress/results/postgres_fdw.out	2026-04-28 17:26:35.261726000 +0000
@@ -3016,13 +3016,16 @@
 -- GROUP BY clause having expressions
 explain (verbose, costs off)
 select c2/2, sum(c2) * (c2/2) from ft1 group by c2/2 order by c2/2;
-                                                    QUERY PLAN                                                    
-------------------------------------------------------------------------------------------------------------------
- Foreign Scan
+                                      QUERY PLAN                                       
+---------------------------------------------------------------------------------------
+ Sort
    Output: ((c2 / 2)), ((sum(c2) * (c2 / 2)))
-   Relations: Aggregate on (public.ft1)
-   Remote SQL: SELECT (c2 / 2), (sum(c2) * (c2 / 2)) FROM "S 1"."T 1" GROUP BY 1 ORDER BY (c2 / 2) ASC NULLS LAST
-(4 rows)
+   Sort Key: ((ft1.c2 / 2))
+   ->  Foreign Scan
+         Output: ((c2 / 2)), ((sum(c2) * (c2 / 2)))
...

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/vacuum.out /tmp/cirrus-ci-build/build/testrun/recovery/027_strea...
--- /tmp/cirrus-ci-build/src/test/regress/expected/vacuum.out	2026-04-28 17:21:11.534108000 +0000
+++ /tmp/cirrus-ci-build/build/testrun/recovery/027_stream_regress/data/results/vacuum.out	2026-04-28 17:24:52.663917000...
@@ -231,7 +231,7 @@
 SELECT pg_relation_size('vac_truncate_test') > 0;
  ?column? 
 ----------
- t
+ f
 (1 row)
 
 SET vacuum_truncate = false;
@@ -251,7 +251,7 @@
 SELECT pg_relation_size('vac_truncate_test') > 0;
  ?column? 
 ----------
- t
+ f
 (1 row)
 
...

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/vacuum.out /tmp/cirrus-ci-build/build/testrun/regress/regress/re...
--- /tmp/cirrus-ci-build/src/test/regress/expected/vacuum.out	2026-04-28 17:21:11.534108000 +0000
+++ /tmp/cirrus-ci-build/build/testrun/regress/regress/results/vacuum.out	2026-04-28 17:23:21.767095000 +0000
@@ -231,7 +231,7 @@
 SELECT pg_relation_size('vac_truncate_test') > 0;
  ?column? 
 ----------
- t
+ f
 (1 row)
 
 SET vacuum_truncate = false;
@@ -251,7 +251,7 @@
 SELECT pg_relation_size('vac_truncate_test') > 0;
  ?column? 
 ----------
- t
+ f
 (1 row)
 
...

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/vacuum.out /tmp/cirrus-ci-build/build/testrun/test_plan_advice/0...
--- /tmp/cirrus-ci-build/src/test/regress/expected/vacuum.out	2026-04-28 17:21:11.534108000 +0000
+++ /tmp/cirrus-ci-build/build/testrun/test_plan_advice/001_replan_regress/data/results/vacuum.out	2026-04-28 17:23:29.2...
@@ -231,7 +231,7 @@
 SELECT pg_relation_size('vac_truncate_test') > 0;
  ?column? 
 ----------
- t
+ f
 (1 row)
 
 SET vacuum_truncate = false;
@@ -251,7 +251,7 @@
 SELECT pg_relation_size('vac_truncate_test') > 0;
  ?column? 
 ----------
- t
+ f
 (1 row)
 
...

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-04-27 04:01:04.108080988 +0000
+++ /tmp/cirrus-ci-build/build/testrun/plpgsql/regress/results/plpgsql_misc.out	2026-04-27 04:07:40.918240415 +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-04-27 04:01:13
+++ /Users/admin/pgsql/build/testrun/plpgsql/regress/results/plpgsql_misc.out	2026-04-27 04:08:18
@@ -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 --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-04-27 04:01:06.564122100 +0000
+++ C:/cirrus/build/testrun/plpgsql/regress/results/plpgsql_misc.out	2026-04-27 04:10:14.938484200 +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	Mon Apr 27 04:01:14 2026
+++ /home/postgres/postgres/build/testrun/plpgsql/regress/results/plpgsql_misc.out	Mon Apr 27 04:07:42 2026
@@ -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-04-27 04:01:08.242381028 +0000
+++ /tmp/cirrus-ci-build/src/pl/plpgsql/src/results/plpgsql_misc.out	2026-04-27 04:05:19.481299977 +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-04-27 04:01:31.357454487 +0000
+++ /home/postgres/postgres/build/testrun/plpgsql/regress/results/plpgsql_misc.out	2026-04-27 04:05:37.655346565 +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-04-27 04:01:03.765882000 +0000
+++ /tmp/cirrus-ci-build/build/testrun/plpgsql/regress/results/plpgsql_misc.out	2026-04-27 04:04:58.431789000 +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
...