PostgreSQL Patch Tester

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/stats_export_import.out /tmp/cirrus-ci-build/src/test/recovery/t...
--- /tmp/cirrus-ci-build/src/test/regress/expected/stats_export_import.out	2024-05-16 08:31:15.784892929 +0000
+++ /tmp/cirrus-ci-build/src/test/recovery/tmp_check/results/stats_export_import.out	2024-05-16 08:37:56.388639331 +0000
@@ -366,7 +366,7 @@
  stats_export_import | test      | id      | f         |       0.5 |         2 |       -0.1 |                  |       ...
 (1 row)
 
--- warn: scalars can't have mcelem 
+-- warn: scalars can't have mcelem
 SELECT pg_catalog.pg_set_attribute_stats(
     'stats_export_import.test'::regclass,
     'id'::name,
@@ -419,7 +419,7 @@
  t
 (1 row)
 
--- ok: mcelem 
+-- ok: mcelem
 SELECT pg_catalog.pg_set_attribute_stats(
     'stats_export_import.test'::regclass,
...

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/stats_export_import.out /tmp/cirrus-ci-build/src/test/regress/re...
--- /tmp/cirrus-ci-build/src/test/regress/expected/stats_export_import.out	2024-05-16 08:31:15.784892929 +0000
+++ /tmp/cirrus-ci-build/src/test/regress/results/stats_export_import.out	2024-05-16 08:34:36.576803854 +0000
@@ -366,7 +366,7 @@
  stats_export_import | test      | id      | f         |       0.5 |         2 |       -0.1 |                  |       ...
 (1 row)
 
--- warn: scalars can't have mcelem 
+-- warn: scalars can't have mcelem
 SELECT pg_catalog.pg_set_attribute_stats(
     'stats_export_import.test'::regclass,
     'id'::name,
@@ -419,7 +419,7 @@
  t
 (1 row)
 
--- ok: mcelem 
+-- ok: mcelem
 SELECT pg_catalog.pg_set_attribute_stats(
     'stats_export_import.test'::regclass,
...

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/triggers.out /tmp/cirrus-ci-build/src/bin/pg_upgrade/tmp_check/r...
--- /tmp/cirrus-ci-build/src/test/regress/expected/triggers.out	2024-05-16 06:22:38.965379673 +0000
+++ /tmp/cirrus-ci-build/src/bin/pg_upgrade/tmp_check/results/triggers.out	2024-05-16 06:25:53.353122971 +0000
@@ -2624,1123 +2624,10 @@
 NOTICE:  trigger parted_trig on parted1_constr AFTER INSERT for ROW: (a,b)=(3,aasvogel)
 NOTICE:  trigger parted_trig_two on parted1_constr AFTER INSERT for ROW: (a,b)=(3,aasvogel)
 drop table parted_constr_ancestor;
-drop function bark(text);
--- Test that the WHEN clause is set properly to partitions
-create table parted_trigger (a int, b text) partition by range (a);
-create table parted_trigger_1 partition of parted_trigger for values from (0) to (1000);
-create table parted_trigger_2 (drp int, a int, b text);
-alter table parted_trigger_2 drop column drp;
-alter table parted_trigger attach partition parted_trigger_2 for values from (1000) to (2000);
-create trigger parted_trigger after update on parted_trigger
-  for each row when (new.a % 2 = 1 and length(old.b) >= 2) execute procedure trigger_notice_ab();
-create table parted_trigger_3 (b text, a int) partition by range (length(b));
-create table parted_trigger_3_1 partition of parted_trigger_3 for values from (1) to (3);
-create table parted_trigger_3_2 partition of parted_trigger_3 for values from (3) to (5);
-alter table parted_trigger attach partition parted_trigger_3 for values from (2000) to (3000);
...

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/triggers.out /tmp/cirrus-ci-build/src/test/regress/results/trigg...
--- /tmp/cirrus-ci-build/src/test/regress/expected/triggers.out	2024-05-16 06:22:38.965379673 +0000
+++ /tmp/cirrus-ci-build/src/test/regress/results/triggers.out	2024-05-16 06:24:53.941186996 +0000
@@ -2657,1090 +2657,10 @@
 create constraint trigger parted_trigger after update on parted_trigger
   from parted_referenced
   for each row execute procedure trigger_notice_ab();
-create constraint trigger parted_trigger after update on unparted_trigger
-  from parted_referenced
-  for each row execute procedure trigger_notice_ab();
-create table parted_trigger_3 (b text, a int) partition by range (length(b));
-create table parted_trigger_3_1 partition of parted_trigger_3 for values from (1) to (3);
-create table parted_trigger_3_2 partition of parted_trigger_3 for values from (3) to (5);
-alter table parted_trigger attach partition parted_trigger_3 for values from (2000) to (3000);
-select tgname, conname, t.tgrelid::regclass, t.tgconstrrelid::regclass,
-  c.conrelid::regclass, c.confrelid::regclass
-  from pg_trigger t join pg_constraint c on (t.tgconstraint = c.oid)
-  where tgname = 'parted_trigger'
-  order by t.tgrelid::regclass::text;
-     tgname     |    conname     |      tgrelid       |   tgconstrrelid   |      conrelid      | confrelid 
...

diff -w -U3 C:/cirrus/src/test/regress/expected/updatable_views.out C:/cirrus/build/testrun/pg_upgrade/002_pg_upgrade/da...
--- C:/cirrus/src/test/regress/expected/updatable_views.out	2024-05-16 06:23:48.178175900 +0000
+++ C:/cirrus/build/testrun/pg_upgrade/002_pg_upgrade/data/results/updatable_views.out	2024-05-16 06:26:13.817521900 +00...
@@ -1155,2847 +1155,7 @@
   WHEN MATCHED THEN UPDATE SET b = s.b
   WHEN NOT MATCHED AND s.a > 0 THEN INSERT VALUES (s.a, s.b)
   RETURNING merge_action(), s.*, t.*;
- merge_action | a | b  | a |   b   
---------------+---+----+---+-------
- DELETE       | 1 | R1 | 1 | Row 1
- UPDATE       | 2 | R2 | 2 | R2
- INSERT       | 3 | R3 | 3 | R3
-(3 rows)
-
-SELECT * FROM base_tbl ORDER BY a;
- a  |   b    
-----+--------
- -2 | Row -2
- -1 | Row -1
-  0 | Row 0
...

diff -w -U3 C:/cirrus/src/test/regress/expected/updatable_views.out C:/cirrus/build/testrun/recovery/027_stream_regress/...
--- C:/cirrus/src/test/regress/expected/updatable_views.out	2024-05-16 06:23:48.178175900 +0000
+++ C:/cirrus/build/testrun/recovery/027_stream_regress/data/results/updatable_views.out	2024-05-16 06:27:59.155295100 +...
@@ -1155,2847 +1155,7 @@
   WHEN MATCHED THEN UPDATE SET b = s.b
   WHEN NOT MATCHED AND s.a > 0 THEN INSERT VALUES (s.a, s.b)
   RETURNING merge_action(), s.*, t.*;
- merge_action | a | b  | a |   b   
---------------+---+----+---+-------
- DELETE       | 1 | R1 | 1 | Row 1
- UPDATE       | 2 | R2 | 2 | R2
- INSERT       | 3 | R3 | 3 | R3
-(3 rows)
-
-SELECT * FROM base_tbl ORDER BY a;
- a  |   b    
-----+--------
- -2 | Row -2
- -1 | Row -1
-  0 | Row 0
...

diff -w -U3 C:/cirrus/src/test/regress/expected/updatable_views.out C:/cirrus/build/testrun/regress/regress/results/upda...
--- C:/cirrus/src/test/regress/expected/updatable_views.out	2024-05-16 06:23:48.178175900 +0000
+++ C:/cirrus/build/testrun/regress/regress/results/updatable_views.out	2024-05-16 06:26:13.269674300 +0000
@@ -1155,2847 +1155,7 @@
   WHEN MATCHED THEN UPDATE SET b = s.b
   WHEN NOT MATCHED AND s.a > 0 THEN INSERT VALUES (s.a, s.b)
   RETURNING merge_action(), s.*, t.*;
- merge_action | a | b  | a |   b   
---------------+---+----+---+-------
- DELETE       | 1 | R1 | 1 | Row 1
- UPDATE       | 2 | R2 | 2 | R2
- INSERT       | 3 | R3 | 3 | R3
-(3 rows)
-
-SELECT * FROM base_tbl ORDER BY a;
- a  |   b    
-----+--------
- -2 | Row -2
- -1 | Row -1
-  0 | Row 0
...

diff -U3 /Users/admin/pgsql/src/test/regress/expected/updatable_views.out /Users/admin/pgsql/build/testrun/pg_upgrade/00...
--- /Users/admin/pgsql/src/test/regress/expected/updatable_views.out	2024-05-16 06:22:37
+++ /Users/admin/pgsql/build/testrun/pg_upgrade/002_pg_upgrade/data/results/updatable_views.out	2024-05-16 06:25:23
@@ -1152,2850 +1152,10 @@
 MERGE INTO rw_view2 t
   USING (SELECT x, 'R'||x FROM generate_series(0,3) x) AS s(a,b) ON t.a = s.a
   WHEN MATCHED AND t.a <= 1 THEN DELETE
-  WHEN MATCHED THEN UPDATE SET b = s.b
-  WHEN NOT MATCHED AND s.a > 0 THEN INSERT VALUES (s.a, s.b)
-  RETURNING merge_action(), s.*, t.*;
- merge_action | a | b  | a |   b   
---------------+---+----+---+-------
- DELETE       | 1 | R1 | 1 | Row 1
- UPDATE       | 2 | R2 | 2 | R2
- INSERT       | 3 | R3 | 3 | R3
-(3 rows)
-
-SELECT * FROM base_tbl ORDER BY a;
- a  |   b    
-----+--------
...

diff -U3 /Users/admin/pgsql/src/test/regress/expected/triggers.out /Users/admin/pgsql/build/testrun/recovery/027_stream_...
--- /Users/admin/pgsql/src/test/regress/expected/triggers.out	2024-05-16 06:22:37
+++ /Users/admin/pgsql/build/testrun/recovery/027_stream_regress/data/results/triggers.out	2024-05-16 06:25:46
@@ -993,2754 +993,10 @@
 (1 row)
 
 DROP TABLE serializable_update_tab;
--- minimal update trigger
-CREATE TABLE min_updates_test (
-	f1	text,
-	f2 int,
-	f3 int);
-INSERT INTO min_updates_test VALUES ('a',1,2),('b','2',null);
-CREATE TRIGGER z_min_update
-BEFORE UPDATE ON min_updates_test
-FOR EACH ROW EXECUTE PROCEDURE suppress_redundant_updates_trigger();
-\set QUIET false
-UPDATE min_updates_test SET f1 = f1;
-UPDATE 0
-UPDATE min_updates_test SET f2 = f2 + 1;
...

diff -U3 /Users/admin/pgsql/src/test/regress/expected/updatable_views.out /Users/admin/pgsql/build/testrun/regress/regre...
--- /Users/admin/pgsql/src/test/regress/expected/updatable_views.out	2024-05-16 06:22:37
+++ /Users/admin/pgsql/build/testrun/regress/regress/results/updatable_views.out	2024-05-16 06:25:22
@@ -1152,2850 +1152,10 @@
 MERGE INTO rw_view2 t
   USING (SELECT x, 'R'||x FROM generate_series(0,3) x) AS s(a,b) ON t.a = s.a
   WHEN MATCHED AND t.a <= 1 THEN DELETE
-  WHEN MATCHED THEN UPDATE SET b = s.b
-  WHEN NOT MATCHED AND s.a > 0 THEN INSERT VALUES (s.a, s.b)
-  RETURNING merge_action(), s.*, t.*;
- merge_action | a | b  | a |   b   
---------------+---+----+---+-------
- DELETE       | 1 | R1 | 1 | Row 1
- UPDATE       | 2 | R2 | 2 | R2
- INSERT       | 3 | R3 | 3 | R3
-(3 rows)
-
-SELECT * FROM base_tbl ORDER BY a;
- a  |   b    
-----+--------
...

diff -U3 /tmp/cirrus-ci-build/contrib/pg_tracing/expected/insert.out /tmp/cirrus-ci-build/contrib/pg_tracing/results/ins...
--- /tmp/cirrus-ci-build/contrib/pg_tracing/expected/insert.out	2024-05-15 17:35:12.555829565 +0000
+++ /tmp/cirrus-ci-build/contrib/pg_tracing/results/insert.out	2024-05-15 17:37:41.107734498 +0000
@@ -9,9 +9,7 @@
  ProcessUtility | ProcessUtility                                                                                       ...
  Utility query  | CREATE TABLE IF NOT EXISTS pg_tracing_test_table_with_constraint (a int, b char(20), CONSTRAINT PK_tr...
  ProcessUtility | ProcessUtility                                                                                       ...
- Utility query  | CREATE TABLE IF NOT EXISTS pg_tracing_test_table_with_constraint (a int, b char(20), CONSTRAINT PK_tr...
- ProcessUtility | ProcessUtility                                                                                       ...
-(6 rows)
+(4 rows)
 
 -- Simple insertion
 /*dddbs='postgres.db',traceparent='00-00000000000000000000000000000002-0000000000000002-01'*/ INSERT INTO pg_tracing_te...

diff -w -U3 C:/cirrus/contrib/pg_tracing/expected/insert.out C:/cirrus/build/testrun/pg_tracing/regress/results/insert.o...
--- C:/cirrus/contrib/pg_tracing/expected/insert.out	2024-05-15 17:35:29.285417900 +0000
+++ C:/cirrus/build/testrun/pg_tracing/regress/results/insert.out	2024-05-15 17:41:40.798093100 +0000
@@ -9,9 +9,7 @@
  ProcessUtility | ProcessUtility                                                                                       ...
  Utility query  | CREATE TABLE IF NOT EXISTS pg_tracing_test_table_with_constraint (a int, b char(20), CONSTRAINT PK_tr...
  ProcessUtility | ProcessUtility                                                                                       ...
- Utility query  | CREATE TABLE IF NOT EXISTS pg_tracing_test_table_with_constraint (a int, b char(20), CONSTRAINT PK_tr...
- ProcessUtility | ProcessUtility                                                                                       ...
-(6 rows)
+(4 rows)
 
 -- Simple insertion
 /*dddbs='postgres.db',traceparent='00-00000000000000000000000000000002-0000000000000002-01'*/ INSERT INTO pg_tracing_te...

diff -U3 /Users/admin/pgsql/contrib/pg_tracing/expected/insert.out /Users/admin/pgsql/build/testrun/pg_tracing/regress/r...
--- /Users/admin/pgsql/contrib/pg_tracing/expected/insert.out	2024-05-15 17:35:14
+++ /Users/admin/pgsql/build/testrun/pg_tracing/regress/results/insert.out	2024-05-15 17:39:03
@@ -9,9 +9,7 @@
  ProcessUtility | ProcessUtility                                                                                       ...
  Utility query  | CREATE TABLE IF NOT EXISTS pg_tracing_test_table_with_constraint (a int, b char(20), CONSTRAINT PK_tr...
  ProcessUtility | ProcessUtility                                                                                       ...
- Utility query  | CREATE TABLE IF NOT EXISTS pg_tracing_test_table_with_constraint (a int, b char(20), CONSTRAINT PK_tr...
- ProcessUtility | ProcessUtility                                                                                       ...
-(6 rows)
+(4 rows)
 
 -- Simple insertion
 /*dddbs='postgres.db',traceparent='00-00000000000000000000000000000002-0000000000000002-01'*/ INSERT INTO pg_tracing_te...

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/sysviews.out /tmp/cirrus-ci-build/src/bin/pg_upgrade/tmp_check/r...
--- /tmp/cirrus-ci-build/src/test/regress/expected/sysviews.out	2024-05-15 17:00:00.833543480 +0000
+++ /tmp/cirrus-ci-build/src/bin/pg_upgrade/tmp_check/results/sysviews.out	2024-05-15 17:04:07.793118642 +0000
@@ -156,7 +156,8 @@
  enable_seqscan                 | on
  enable_sort                    | on
  enable_tidscan                 | on
-(22 rows)
+ enable_toast_cache             | off
+(23 rows)
 
 -- There are always wait event descriptions for various types.
 select type, count(*) > 0 as ok FROM pg_wait_events

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/sysviews.out /tmp/cirrus-ci-build/src/test/recovery/tmp_check/re...
--- /tmp/cirrus-ci-build/src/test/regress/expected/sysviews.out	2024-05-15 17:00:00.833543480 +0000
+++ /tmp/cirrus-ci-build/src/test/recovery/tmp_check/results/sysviews.out	2024-05-15 17:05:33.208998536 +0000
@@ -156,7 +156,8 @@
  enable_seqscan                 | on
  enable_sort                    | on
  enable_tidscan                 | on
-(22 rows)
+ enable_toast_cache             | off
+(23 rows)
 
 -- There are always wait event descriptions for various types.
 select type, count(*) > 0 as ok FROM pg_wait_events

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/sysviews.out /tmp/cirrus-ci-build/src/test/regress/results/sysvi...
--- /tmp/cirrus-ci-build/src/test/regress/expected/sysviews.out	2024-05-15 17:00:00.833543480 +0000
+++ /tmp/cirrus-ci-build/src/test/regress/results/sysviews.out	2024-05-15 17:02:07.405402081 +0000
@@ -156,7 +156,8 @@
  enable_seqscan                 | on
  enable_sort                    | on
  enable_tidscan                 | on
-(22 rows)
+ enable_toast_cache             | off
+(23 rows)
 
 -- There are always wait event descriptions for various types.
 select type, count(*) > 0 as ok FROM pg_wait_events

diff -w -U3 C:/cirrus/src/test/regress/expected/sysviews.out C:/cirrus/build/testrun/pg_upgrade/002_pg_upgrade/data/resu...
--- C:/cirrus/src/test/regress/expected/sysviews.out	2024-05-15 17:00:20.587020500 +0000
+++ C:/cirrus/build/testrun/pg_upgrade/002_pg_upgrade/data/results/sysviews.out	2024-05-15 17:03:22.188764500 +0000
@@ -156,7 +156,8 @@
  enable_seqscan                 | on
  enable_sort                    | on
  enable_tidscan                 | on
-(22 rows)
+ enable_toast_cache             | off
+(23 rows)
 
 -- There are always wait event descriptions for various types.
 select type, count(*) > 0 as ok FROM pg_wait_events

diff -w -U3 C:/cirrus/src/test/regress/expected/sysviews.out C:/cirrus/build/testrun/recovery/027_stream_regress/data/re...
--- C:/cirrus/src/test/regress/expected/sysviews.out	2024-05-15 17:00:20.587020500 +0000
+++ C:/cirrus/build/testrun/recovery/027_stream_regress/data/results/sysviews.out	2024-05-15 17:05:42.551027200 +0000
@@ -156,7 +156,8 @@
  enable_seqscan                 | on
  enable_sort                    | on
  enable_tidscan                 | on
-(22 rows)
+ enable_toast_cache             | off
+(23 rows)
 
 -- There are always wait event descriptions for various types.
 select type, count(*) > 0 as ok FROM pg_wait_events

diff -w -U3 C:/cirrus/src/test/regress/expected/sysviews.out C:/cirrus/build/testrun/regress/regress/results/sysviews.ou...
--- C:/cirrus/src/test/regress/expected/sysviews.out	2024-05-15 17:00:20.587020500 +0000
+++ C:/cirrus/build/testrun/regress/regress/results/sysviews.out	2024-05-15 17:03:17.637979000 +0000
@@ -156,7 +156,8 @@
  enable_seqscan                 | on
  enable_sort                    | on
  enable_tidscan                 | on
-(22 rows)
+ enable_toast_cache             | off
+(23 rows)
 
 -- There are always wait event descriptions for various types.
 select type, count(*) > 0 as ok FROM pg_wait_events

diff -U3 /Users/admin/pgsql/src/test/regress/expected/sysviews.out /Users/admin/pgsql/build/testrun/pg_upgrade/002_pg_up...
--- /Users/admin/pgsql/src/test/regress/expected/sysviews.out	2024-05-15 16:59:58
+++ /Users/admin/pgsql/build/testrun/pg_upgrade/002_pg_upgrade/data/results/sysviews.out	2024-05-15 17:04:11
@@ -156,7 +156,8 @@
  enable_seqscan                 | on
  enable_sort                    | on
  enable_tidscan                 | on
-(22 rows)
+ enable_toast_cache             | off
+(23 rows)
 
 -- There are always wait event descriptions for various types.
 select type, count(*) > 0 as ok FROM pg_wait_events

diff -U3 /Users/admin/pgsql/src/test/regress/expected/sysviews.out /Users/admin/pgsql/build/testrun/recovery/027_stream_...
--- /Users/admin/pgsql/src/test/regress/expected/sysviews.out	2024-05-15 16:59:58
+++ /Users/admin/pgsql/build/testrun/recovery/027_stream_regress/data/results/sysviews.out	2024-05-15 17:05:58
@@ -156,7 +156,8 @@
  enable_seqscan                 | on
  enable_sort                    | on
  enable_tidscan                 | on
-(22 rows)
+ enable_toast_cache             | off
+(23 rows)
 
 -- There are always wait event descriptions for various types.
 select type, count(*) > 0 as ok FROM pg_wait_events

diff -U3 /Users/admin/pgsql/src/test/regress/expected/sysviews.out /Users/admin/pgsql/build/testrun/regress/regress/resu...
--- /Users/admin/pgsql/src/test/regress/expected/sysviews.out	2024-05-15 16:59:58
+++ /Users/admin/pgsql/build/testrun/regress/regress/results/sysviews.out	2024-05-15 17:04:11
@@ -156,7 +156,8 @@
  enable_seqscan                 | on
  enable_sort                    | on
  enable_tidscan                 | on
-(22 rows)
+ enable_toast_cache             | off
+(23 rows)
 
 -- There are always wait event descriptions for various types.
 select type, count(*) > 0 as ok FROM pg_wait_events

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/create_index.out /tmp/cirrus-ci-build/src/bin/pg_upgrade/tmp_che...
--- /tmp/cirrus-ci-build/src/test/regress/expected/create_index.out	2024-05-15 12:07:09.297736936 +0000
+++ /tmp/cirrus-ci-build/src/bin/pg_upgrade/tmp_check/results/create_index.out	2024-05-15 12:10:42.717436427 +0000
@@ -2135,11 +2135,19 @@
 --
 explain (costs off)
 SELECT unique1 FROM tenk1 WHERE unique1 IN (1, 42, 7) and unique1 = ANY('{7, 8, 9}');
-                                             QUERY PLAN                                             
-----------------------------------------------------------------------------------------------------
- Index Only Scan using tenk1_unique1 on tenk1
-   Index Cond: ((unique1 = ANY ('{1,42,7}'::integer[])) AND (unique1 = ANY ('{7,8,9}'::integer[])))
-(2 rows)
+                            QUERY PLAN                             
+-------------------------------------------------------------------
+ Bitmap Heap Scan on tenk1
+   Recheck Cond: ((unique1 = 7) OR (unique1 = 8) OR (unique1 = 9))
+   Filter: (unique1 = ANY ('{1,42,7}'::integer[]))
+   ->  BitmapOr
+         ->  Bitmap Index Scan on tenk1_unique1
+               Index Cond: (unique1 = 7)
...

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/create_index.out /tmp/cirrus-ci-build/src/test/recovery/tmp_chec...
--- /tmp/cirrus-ci-build/src/test/regress/expected/create_index.out	2024-05-15 12:07:09.297736936 +0000
+++ /tmp/cirrus-ci-build/src/test/recovery/tmp_check/results/create_index.out	2024-05-15 12:12:42.117226123 +0000
@@ -2135,11 +2135,19 @@
 --
 explain (costs off)
 SELECT unique1 FROM tenk1 WHERE unique1 IN (1, 42, 7) and unique1 = ANY('{7, 8, 9}');
-                                             QUERY PLAN                                             
-----------------------------------------------------------------------------------------------------
- Index Only Scan using tenk1_unique1 on tenk1
-   Index Cond: ((unique1 = ANY ('{1,42,7}'::integer[])) AND (unique1 = ANY ('{7,8,9}'::integer[])))
-(2 rows)
+                            QUERY PLAN                             
+-------------------------------------------------------------------
+ Bitmap Heap Scan on tenk1
+   Recheck Cond: ((unique1 = 7) OR (unique1 = 8) OR (unique1 = 9))
+   Filter: (unique1 = ANY ('{1,42,7}'::integer[]))
+   ->  BitmapOr
+         ->  Bitmap Index Scan on tenk1_unique1
+               Index Cond: (unique1 = 7)
...

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/create_index.out /tmp/cirrus-ci-build/src/test/regress/results/c...
--- /tmp/cirrus-ci-build/src/test/regress/expected/create_index.out	2024-05-15 12:07:09.297736936 +0000
+++ /tmp/cirrus-ci-build/src/test/regress/results/create_index.out	2024-05-15 12:09:06.029598812 +0000
@@ -2135,11 +2135,19 @@
 --
 explain (costs off)
 SELECT unique1 FROM tenk1 WHERE unique1 IN (1, 42, 7) and unique1 = ANY('{7, 8, 9}');
-                                             QUERY PLAN                                             
-----------------------------------------------------------------------------------------------------
- Index Only Scan using tenk1_unique1 on tenk1
-   Index Cond: ((unique1 = ANY ('{1,42,7}'::integer[])) AND (unique1 = ANY ('{7,8,9}'::integer[])))
-(2 rows)
+                            QUERY PLAN                             
+-------------------------------------------------------------------
+ Bitmap Heap Scan on tenk1
+   Recheck Cond: ((unique1 = 7) OR (unique1 = 8) OR (unique1 = 9))
+   Filter: (unique1 = ANY ('{1,42,7}'::integer[]))
+   ->  BitmapOr
+         ->  Bitmap Index Scan on tenk1_unique1
+               Index Cond: (unique1 = 7)
...

diff -w -U3 C:/cirrus/src/test/regress/expected/create_index.out C:/cirrus/build/testrun/pg_upgrade/002_pg_upgrade/data/...
--- C:/cirrus/src/test/regress/expected/create_index.out	2024-05-15 12:07:29.228750300 +0000
+++ C:/cirrus/build/testrun/pg_upgrade/002_pg_upgrade/data/results/create_index.out	2024-05-15 12:09:50.977207300 +0000
@@ -2136,10 +2136,18 @@
 explain (costs off)
 SELECT unique1 FROM tenk1 WHERE unique1 IN (1, 42, 7) and unique1 = ANY('{7, 8, 9}');
                                              QUERY PLAN                                             
-----------------------------------------------------------------------------------------------------
- Index Only Scan using tenk1_unique1 on tenk1
-   Index Cond: ((unique1 = ANY ('{1,42,7}'::integer[])) AND (unique1 = ANY ('{7,8,9}'::integer[])))
-(2 rows)
+-------------------------------------------------------------------
+ Bitmap Heap Scan on tenk1
+   Recheck Cond: ((unique1 = 7) OR (unique1 = 8) OR (unique1 = 9))
+   Filter: (unique1 = ANY ('{1,42,7}'::integer[]))
+   ->  BitmapOr
+         ->  Bitmap Index Scan on tenk1_unique1
+               Index Cond: (unique1 = 7)
+         ->  Bitmap Index Scan on tenk1_unique1
+               Index Cond: (unique1 = 8)
...

diff -w -U3 C:/cirrus/src/test/regress/expected/create_index.out C:/cirrus/build/testrun/recovery/027_stream_regress/dat...
--- C:/cirrus/src/test/regress/expected/create_index.out	2024-05-15 12:07:29.228750300 +0000
+++ C:/cirrus/build/testrun/recovery/027_stream_regress/data/results/create_index.out	2024-05-15 12:12:23.385890400 +000...
@@ -2136,10 +2136,18 @@
 explain (costs off)
 SELECT unique1 FROM tenk1 WHERE unique1 IN (1, 42, 7) and unique1 = ANY('{7, 8, 9}');
                                              QUERY PLAN                                             
-----------------------------------------------------------------------------------------------------
- Index Only Scan using tenk1_unique1 on tenk1
-   Index Cond: ((unique1 = ANY ('{1,42,7}'::integer[])) AND (unique1 = ANY ('{7,8,9}'::integer[])))
-(2 rows)
+-------------------------------------------------------------------
+ Bitmap Heap Scan on tenk1
+   Recheck Cond: ((unique1 = 7) OR (unique1 = 8) OR (unique1 = 9))
+   Filter: (unique1 = ANY ('{1,42,7}'::integer[]))
+   ->  BitmapOr
+         ->  Bitmap Index Scan on tenk1_unique1
+               Index Cond: (unique1 = 7)
+         ->  Bitmap Index Scan on tenk1_unique1
+               Index Cond: (unique1 = 8)
...

diff -w -U3 C:/cirrus/src/test/regress/expected/create_index.out C:/cirrus/build/testrun/regress/regress/results/create_...
--- C:/cirrus/src/test/regress/expected/create_index.out	2024-05-15 12:07:29.228750300 +0000
+++ C:/cirrus/build/testrun/regress/regress/results/create_index.out	2024-05-15 12:09:43.355682100 +0000
@@ -2136,10 +2136,18 @@
 explain (costs off)
 SELECT unique1 FROM tenk1 WHERE unique1 IN (1, 42, 7) and unique1 = ANY('{7, 8, 9}');
                                              QUERY PLAN                                             
-----------------------------------------------------------------------------------------------------
- Index Only Scan using tenk1_unique1 on tenk1
-   Index Cond: ((unique1 = ANY ('{1,42,7}'::integer[])) AND (unique1 = ANY ('{7,8,9}'::integer[])))
-(2 rows)
+-------------------------------------------------------------------
+ Bitmap Heap Scan on tenk1
+   Recheck Cond: ((unique1 = 7) OR (unique1 = 8) OR (unique1 = 9))
+   Filter: (unique1 = ANY ('{1,42,7}'::integer[]))
+   ->  BitmapOr
+         ->  Bitmap Index Scan on tenk1_unique1
+               Index Cond: (unique1 = 7)
+         ->  Bitmap Index Scan on tenk1_unique1
+               Index Cond: (unique1 = 8)
...

diff -U3 /Users/admin/pgsql/src/test/regress/expected/create_index.out /Users/admin/pgsql/build/testrun/pg_upgrade/002_p...
--- /Users/admin/pgsql/src/test/regress/expected/create_index.out	2024-05-15 12:07:15
+++ /Users/admin/pgsql/build/testrun/pg_upgrade/002_pg_upgrade/data/results/create_index.out	2024-05-15 12:09:35
@@ -2135,11 +2135,19 @@
 --
 explain (costs off)
 SELECT unique1 FROM tenk1 WHERE unique1 IN (1, 42, 7) and unique1 = ANY('{7, 8, 9}');
-                                             QUERY PLAN                                             
-----------------------------------------------------------------------------------------------------
- Index Only Scan using tenk1_unique1 on tenk1
-   Index Cond: ((unique1 = ANY ('{1,42,7}'::integer[])) AND (unique1 = ANY ('{7,8,9}'::integer[])))
-(2 rows)
+                            QUERY PLAN                             
+-------------------------------------------------------------------
+ Bitmap Heap Scan on tenk1
+   Recheck Cond: ((unique1 = 7) OR (unique1 = 8) OR (unique1 = 9))
+   Filter: (unique1 = ANY ('{1,42,7}'::integer[]))
+   ->  BitmapOr
+         ->  Bitmap Index Scan on tenk1_unique1
+               Index Cond: (unique1 = 7)
...

diff -U3 /Users/admin/pgsql/src/test/regress/expected/create_index.out /Users/admin/pgsql/build/testrun/recovery/027_str...
--- /Users/admin/pgsql/src/test/regress/expected/create_index.out	2024-05-15 12:07:15
+++ /Users/admin/pgsql/build/testrun/recovery/027_stream_regress/data/results/create_index.out	2024-05-15 12:10:44
@@ -2135,11 +2135,19 @@
 --
 explain (costs off)
 SELECT unique1 FROM tenk1 WHERE unique1 IN (1, 42, 7) and unique1 = ANY('{7, 8, 9}');
-                                             QUERY PLAN                                             
-----------------------------------------------------------------------------------------------------
- Index Only Scan using tenk1_unique1 on tenk1
-   Index Cond: ((unique1 = ANY ('{1,42,7}'::integer[])) AND (unique1 = ANY ('{7,8,9}'::integer[])))
-(2 rows)
+                            QUERY PLAN                             
+-------------------------------------------------------------------
+ Bitmap Heap Scan on tenk1
+   Recheck Cond: ((unique1 = 7) OR (unique1 = 8) OR (unique1 = 9))
+   Filter: (unique1 = ANY ('{1,42,7}'::integer[]))
+   ->  BitmapOr
+         ->  Bitmap Index Scan on tenk1_unique1
+               Index Cond: (unique1 = 7)
...

diff -U3 /Users/admin/pgsql/src/test/regress/expected/create_index.out /Users/admin/pgsql/build/testrun/regress/regress/...
--- /Users/admin/pgsql/src/test/regress/expected/create_index.out	2024-05-15 12:07:15
+++ /Users/admin/pgsql/build/testrun/regress/regress/results/create_index.out	2024-05-15 12:09:33
@@ -2135,11 +2135,19 @@
 --
 explain (costs off)
 SELECT unique1 FROM tenk1 WHERE unique1 IN (1, 42, 7) and unique1 = ANY('{7, 8, 9}');
-                                             QUERY PLAN                                             
-----------------------------------------------------------------------------------------------------
- Index Only Scan using tenk1_unique1 on tenk1
-   Index Cond: ((unique1 = ANY ('{1,42,7}'::integer[])) AND (unique1 = ANY ('{7,8,9}'::integer[])))
-(2 rows)
+                            QUERY PLAN                             
+-------------------------------------------------------------------
+ Bitmap Heap Scan on tenk1
+   Recheck Cond: ((unique1 = 7) OR (unique1 = 8) OR (unique1 = 9))
+   Filter: (unique1 = ANY ('{1,42,7}'::integer[]))
+   ->  BitmapOr
+         ->  Bitmap Index Scan on tenk1_unique1
+               Index Cond: (unique1 = 7)
...

diff -w -U3 C:/cirrus/contrib/pg_freespacemap/expected/pg_freespacemap.out C:/cirrus/build/testrun/pg_freespacemap/regre...
--- C:/cirrus/contrib/pg_freespacemap/expected/pg_freespacemap.out	2024-05-15 12:05:06.904493600 +0000
+++ C:/cirrus/build/testrun/pg_freespacemap/regress/results/pg_freespacemap.out	2024-05-15 12:11:16.129730900 +0000
@@ -1,4 +1,5 @@
 CREATE EXTENSION pg_freespacemap;
+ERROR:  extension "pg_freespacemap" has no installation script nor update path for version "1.3"
 CREATE TABLE freespace_tab (c1 int) WITH (autovacuum_enabled = off);
 CREATE INDEX freespace_brin ON freespace_tab USING brin (c1);
 CREATE INDEX freespace_btree ON freespace_tab USING btree (c1);
@@ -8,78 +9,39 @@
   SELECT rel.id, fsm.blkno, (fsm.avail > 0) AS is_avail
     FROM rel, LATERAL pg_freespace(rel.id) AS fsm
     ORDER BY 1, 2;
-       id        | blkno | is_avail 
------------------+-------+----------
- freespace_brin  |     0 | f
- freespace_brin  |     1 | f
- freespace_brin  |     2 | t
- freespace_btree |     0 | f
- freespace_hash  |     0 | f
...

diff -U3 /Users/admin/pgsql/contrib/pg_freespacemap/expected/pg_freespacemap.out /Users/admin/pgsql/build/testrun/pg_fre...
--- /Users/admin/pgsql/contrib/pg_freespacemap/expected/pg_freespacemap.out	2024-05-15 12:04:55
+++ /Users/admin/pgsql/build/testrun/pg_freespacemap/regress/results/pg_freespacemap.out	2024-05-15 12:08:48
@@ -1,4 +1,5 @@
 CREATE EXTENSION pg_freespacemap;
+ERROR:  extension "pg_freespacemap" has no installation script nor update path for version "1.3"
 CREATE TABLE freespace_tab (c1 int) WITH (autovacuum_enabled = off);
 CREATE INDEX freespace_brin ON freespace_tab USING brin (c1);
 CREATE INDEX freespace_btree ON freespace_tab USING btree (c1);
@@ -8,78 +9,39 @@
   SELECT rel.id, fsm.blkno, (fsm.avail > 0) AS is_avail
     FROM rel, LATERAL pg_freespace(rel.id) AS fsm
     ORDER BY 1, 2;
-       id        | blkno | is_avail 
------------------+-------+----------
- freespace_brin  |     0 | f
- freespace_brin  |     1 | f
- freespace_brin  |     2 | t
- freespace_btree |     0 | f
- freespace_hash  |     0 | f
...

diff -U3 /tmp/cirrus-ci-build/contrib/unaccent/expected/unaccent.out /tmp/cirrus-ci-build/contrib/unaccent/results/unacc...
--- /tmp/cirrus-ci-build/contrib/unaccent/expected/unaccent.out	2024-05-15 06:56:56.699153952 +0000
+++ /tmp/cirrus-ci-build/contrib/unaccent/results/unaccent.out	2024-05-15 07:00:57.594956827 +0000
@@ -8,8 +8,10 @@
 \quit
 \endif
 CREATE EXTENSION unaccent;
+WARNING:  duplicate source strings, first one will be used
 SET client_encoding TO 'UTF8';
 SELECT unaccent('foobar');
+WARNING:  duplicate source strings, first one will be used
  unaccent 
 ----------
  foobar

diff -U3 /Users/admin/pgsql/contrib/unaccent/expected/unaccent.out /Users/admin/pgsql/build/testrun/unaccent/regress/res...
--- /Users/admin/pgsql/contrib/unaccent/expected/unaccent.out	2024-05-15 06:56:51
+++ /Users/admin/pgsql/build/testrun/unaccent/regress/results/unaccent.out	2024-05-15 06:59:27
@@ -8,8 +8,10 @@
 \quit
 \endif
 CREATE EXTENSION unaccent;
+WARNING:  duplicate source strings, first one will be used
 SET client_encoding TO 'UTF8';
 SELECT unaccent('foobar');
+WARNING:  duplicate source strings, first one will be used
  unaccent 
 ----------
  foobar

diff -w -U3 C:/cirrus/src/test/regress/expected/partition_merge.out C:/cirrus/build/testrun/recovery/027_stream_regress/...
--- C:/cirrus/src/test/regress/expected/partition_merge.out	2024-05-13 10:34:53.585107900 +0000
+++ C:/cirrus/build/testrun/recovery/027_stream_regress/data/results/partition_merge.out	2024-05-13 10:41:12.935063000 +...
@@ -897,17 +897,24 @@
 ERROR:  must be owner of table tp_0_1
 RESET SESSION AUTHORIZATION;
 ALTER TABLE tp_0_1 OWNER TO regress_partition_merge_bob;
+ERROR:  relation "tp_0_1" does not exist
 SET SESSION AUTHORIZATION regress_partition_merge_bob;
 ALTER TABLE t MERGE PARTITIONS (tp_0_1, tp_1_2) INTO tp_0_2;
-ERROR:  must be owner of table tp_1_2
+ERROR:  relation "t" does not exist
 RESET SESSION AUTHORIZATION;
 ALTER TABLE tp_1_2 OWNER TO regress_partition_merge_bob;
+ERROR:  relation "tp_1_2" does not exist
 SET SESSION AUTHORIZATION regress_partition_merge_bob;
+ERROR:  role "regress_partition_merge_bob" does not exist
 ALTER TABLE t MERGE PARTITIONS (tp_0_1, tp_1_2) INTO tp_0_2;
+ERROR:  relation "t" does not exist
 RESET SESSION AUTHORIZATION;
...

diff -U3 /tmp/cirrus-ci-build/contrib/postgres_fdw/expected/postgres_fdw.out /tmp/cirrus-ci-build/build/testrun/postgres...
--- /tmp/cirrus-ci-build/contrib/postgres_fdw/expected/postgres_fdw.out	2024-05-13 06:39:03.971405000 +0000
+++ /tmp/cirrus-ci-build/build/testrun/postgres_fdw-running/regress/results/postgres_fdw.out	2024-05-13 06:44:17.5065390...
@@ -2754,6 +2754,7 @@
 SET LOCAL statement_timeout = '10ms';
 select count(*) from ft1 CROSS JOIN ft2 CROSS JOIN ft4 CROSS JOIN ft5; -- this takes very long
 ERROR:  canceling statement due to statement timeout
+WARNING:  could not get result of cancel request due to timeout
 COMMIT;
 -- ====================================================================
 -- Check that userid to use when querying the remote table is correctly

diff -U3 /tmp/cirrus-ci-build/contrib/btree_gist/expected/without_overlaps.out /tmp/cirrus-ci-build/build/testrun/btree_...
--- /tmp/cirrus-ci-build/contrib/btree_gist/expected/without_overlaps.out	2024-05-13 01:05:51.446919000 +0000
+++ /tmp/cirrus-ci-build/build/testrun/btree_gist/regress/results/without_overlaps.out	2024-05-13 01:08:30.231911000 +00...
@@ -16,6 +16,8 @@
  valid_at | daterange |           | not null | 
 Indexes:
     "temporal_rng_pk" PRIMARY KEY (id, valid_at WITHOUT OVERLAPS)
+Check constraints:
+    "valid_at_not_empty" CHECK (NOT isempty(valid_at))
 
 SELECT pg_get_constraintdef(oid) FROM pg_constraint WHERE conname = 'temporal_rng_pk';
             pg_get_constraintdef             
@@ -60,6 +62,8 @@
  parent_id | integer   |           |          | 
 Indexes:
     "temporal_fk_rng2rng_pk" PRIMARY KEY (id, valid_at WITHOUT OVERLAPS)
+Check constraints:
+    "valid_at_not_empty" CHECK (NOT isempty(valid_at))
 Foreign-key constraints:
     "temporal_fk_rng2rng_fk" FOREIGN KEY (parent_id, PERIOD valid_at) REFERENCES temporal_rng(id, PERIOD valid_at)
...

diff -U3 /tmp/cirrus-ci-build/contrib/btree_gist/expected/without_overlaps.out /tmp/cirrus-ci-build/contrib/btree_gist/r...
--- /tmp/cirrus-ci-build/contrib/btree_gist/expected/without_overlaps.out	2024-05-13 01:04:45.534336644 +0000
+++ /tmp/cirrus-ci-build/contrib/btree_gist/results/without_overlaps.out	2024-05-13 01:08:53.750389446 +0000
@@ -16,6 +16,8 @@
  valid_at | daterange |           | not null | 
 Indexes:
     "temporal_rng_pk" PRIMARY KEY (id, valid_at WITHOUT OVERLAPS)
+Check constraints:
+    "valid_at_not_empty" CHECK (NOT isempty(valid_at))
 
 SELECT pg_get_constraintdef(oid) FROM pg_constraint WHERE conname = 'temporal_rng_pk';
             pg_get_constraintdef             
@@ -60,6 +62,8 @@
  parent_id | integer   |           |          | 
 Indexes:
     "temporal_fk_rng2rng_pk" PRIMARY KEY (id, valid_at WITHOUT OVERLAPS)
+Check constraints:
+    "valid_at_not_empty" CHECK (NOT isempty(valid_at))
 Foreign-key constraints:
     "temporal_fk_rng2rng_fk" FOREIGN KEY (parent_id, PERIOD valid_at) REFERENCES temporal_rng(id, PERIOD valid_at)
...

diff -U3 /tmp/cirrus-ci-build/contrib/btree_gist/expected/without_overlaps.out /tmp/cirrus-ci-build/build/testrun/btree_...
--- /tmp/cirrus-ci-build/contrib/btree_gist/expected/without_overlaps.out	2024-05-13 01:04:45.534992707 +0000
+++ /tmp/cirrus-ci-build/build/testrun/btree_gist/regress/results/without_overlaps.out	2024-05-13 01:10:20.830764959 +00...
@@ -16,6 +16,8 @@
  valid_at | daterange |           | not null | 
 Indexes:
     "temporal_rng_pk" PRIMARY KEY (id, valid_at WITHOUT OVERLAPS)
+Check constraints:
+    "valid_at_not_empty" CHECK (NOT isempty(valid_at))
 
 SELECT pg_get_constraintdef(oid) FROM pg_constraint WHERE conname = 'temporal_rng_pk';
             pg_get_constraintdef             
@@ -60,6 +62,8 @@
  parent_id | integer   |           |          | 
 Indexes:
     "temporal_fk_rng2rng_pk" PRIMARY KEY (id, valid_at WITHOUT OVERLAPS)
+Check constraints:
+    "valid_at_not_empty" CHECK (NOT isempty(valid_at))
 Foreign-key constraints:
     "temporal_fk_rng2rng_fk" FOREIGN KEY (parent_id, PERIOD valid_at) REFERENCES temporal_rng(id, PERIOD valid_at)
...

diff -w -U3 C:/cirrus/contrib/btree_gist/expected/without_overlaps.out C:/cirrus/build/testrun/btree_gist/regress/result...
--- C:/cirrus/contrib/btree_gist/expected/without_overlaps.out	2024-05-13 01:05:40.087528700 +0000
+++ C:/cirrus/build/testrun/btree_gist/regress/results/without_overlaps.out	2024-05-13 01:11:37.148898200 +0000
@@ -16,6 +16,8 @@
  valid_at | daterange |           | not null | 
 Indexes:
     "temporal_rng_pk" PRIMARY KEY (id, valid_at WITHOUT OVERLAPS)
+Check constraints:
+    "valid_at_not_empty" CHECK (NOT isempty(valid_at))
 
 SELECT pg_get_constraintdef(oid) FROM pg_constraint WHERE conname = 'temporal_rng_pk';
             pg_get_constraintdef             
@@ -60,6 +62,8 @@
  parent_id | integer   |           |          | 
 Indexes:
     "temporal_fk_rng2rng_pk" PRIMARY KEY (id, valid_at WITHOUT OVERLAPS)
+Check constraints:
+    "valid_at_not_empty" CHECK (NOT isempty(valid_at))
 Foreign-key constraints:
     "temporal_fk_rng2rng_fk" FOREIGN KEY (parent_id, PERIOD valid_at) REFERENCES temporal_rng(id, PERIOD valid_at)
...

diff -U3 /Users/admin/pgsql/contrib/btree_gist/expected/without_overlaps.out /Users/admin/pgsql/build/testrun/btree_gist...
--- /Users/admin/pgsql/contrib/btree_gist/expected/without_overlaps.out	2024-05-13 01:04:43
+++ /Users/admin/pgsql/build/testrun/btree_gist/regress/results/without_overlaps.out	2024-05-13 01:07:57
@@ -16,6 +16,8 @@
  valid_at | daterange |           | not null | 
 Indexes:
     "temporal_rng_pk" PRIMARY KEY (id, valid_at WITHOUT OVERLAPS)
+Check constraints:
+    "valid_at_not_empty" CHECK (NOT isempty(valid_at))
 
 SELECT pg_get_constraintdef(oid) FROM pg_constraint WHERE conname = 'temporal_rng_pk';
             pg_get_constraintdef             
@@ -60,6 +62,8 @@
  parent_id | integer   |           |          | 
 Indexes:
     "temporal_fk_rng2rng_pk" PRIMARY KEY (id, valid_at WITHOUT OVERLAPS)
+Check constraints:
+    "valid_at_not_empty" CHECK (NOT isempty(valid_at))
 Foreign-key constraints:
     "temporal_fk_rng2rng_fk" FOREIGN KEY (parent_id, PERIOD valid_at) REFERENCES temporal_rng(id, PERIOD valid_at)
...

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/select_parallel.out /tmp/cirrus-ci-build/build/testrun/pg_upgrad...
--- /tmp/cirrus-ci-build/src/test/regress/expected/select_parallel.out	2024-05-09 18:34:59.542137000 +0000
+++ /tmp/cirrus-ci-build/build/testrun/pg_upgrade/002_pg_upgrade/data/results/select_parallel.out	2024-05-09 18:36:26.26...
@@ -451,26 +451,36 @@
   join tenk1 t3 on t3.stringu1 = tenk1.stringu1
   where tenk1.four = t.four
 );
-                                                                                                                       ...
------------------------------------------------------------------------------------------------------------------------...
- Seq Scan on public.tenk1 t
+                                                                                                                       ...
+-----------------------------------------------------------------------------------------------------------------------...
+ Hash Join
    Output: t.unique1, t.unique2, t.two, t.four, t.ten, t.twenty, t.hundred, t.thousand, t.twothousand, t.fivethous, t.t...
-   Filter: (SubPlan 1)
-   SubPlan 1
-     ->  Hash Join
-           Output: t.two
-           Hash Cond: (tenk1.stringu1 = t3.stringu1)
-           ->  Seq Scan on public.tenk1
...

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/select_parallel.out /tmp/cirrus-ci-build/build/testrun/recovery/...
--- /tmp/cirrus-ci-build/src/test/regress/expected/select_parallel.out	2024-05-09 18:34:59.542137000 +0000
+++ /tmp/cirrus-ci-build/build/testrun/recovery/027_stream_regress/data/results/select_parallel.out	2024-05-09 18:37:01....
@@ -451,26 +451,36 @@
   join tenk1 t3 on t3.stringu1 = tenk1.stringu1
   where tenk1.four = t.four
 );
-                                                                                                                       ...
------------------------------------------------------------------------------------------------------------------------...
- Seq Scan on public.tenk1 t
+                                                                                                                       ...
+-----------------------------------------------------------------------------------------------------------------------...
+ Hash Join
    Output: t.unique1, t.unique2, t.two, t.four, t.ten, t.twenty, t.hundred, t.thousand, t.twothousand, t.fivethous, t.t...
-   Filter: (SubPlan 1)
-   SubPlan 1
-     ->  Hash Join
-           Output: t.two
-           Hash Cond: (tenk1.stringu1 = t3.stringu1)
-           ->  Seq Scan on public.tenk1
...

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/select_parallel.out /tmp/cirrus-ci-build/build/testrun/regress/r...
--- /tmp/cirrus-ci-build/src/test/regress/expected/select_parallel.out	2024-05-09 18:34:59.542137000 +0000
+++ /tmp/cirrus-ci-build/build/testrun/regress/regress/results/select_parallel.out	2024-05-09 18:36:24.869969000 +0000
@@ -451,26 +451,36 @@
   join tenk1 t3 on t3.stringu1 = tenk1.stringu1
   where tenk1.four = t.four
 );
-                                                                                                                       ...
------------------------------------------------------------------------------------------------------------------------...
- Seq Scan on public.tenk1 t
+                                                                                                                       ...
+-----------------------------------------------------------------------------------------------------------------------...
+ Hash Join
    Output: t.unique1, t.unique2, t.two, t.four, t.ten, t.twenty, t.hundred, t.thousand, t.twothousand, t.fivethous, t.t...
-   Filter: (SubPlan 1)
-   SubPlan 1
-     ->  Hash Join
-           Output: t.two
-           Hash Cond: (tenk1.stringu1 = t3.stringu1)
-           ->  Seq Scan on public.tenk1
...

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/select_parallel.out /tmp/cirrus-ci-build/src/bin/pg_upgrade/tmp_...
--- /tmp/cirrus-ci-build/src/test/regress/expected/select_parallel.out	2024-05-09 18:34:20.091766763 +0000
+++ /tmp/cirrus-ci-build/src/bin/pg_upgrade/tmp_check/results/select_parallel.out	2024-05-09 18:39:17.083506002 +0000
@@ -451,26 +451,36 @@
   join tenk1 t3 on t3.stringu1 = tenk1.stringu1
   where tenk1.four = t.four
 );
-                                                                                                                       ...
------------------------------------------------------------------------------------------------------------------------...
- Seq Scan on public.tenk1 t
+                                                                                                                       ...
+-----------------------------------------------------------------------------------------------------------------------...
+ Hash Join
    Output: t.unique1, t.unique2, t.two, t.four, t.ten, t.twenty, t.hundred, t.thousand, t.twothousand, t.fivethous, t.t...
-   Filter: (SubPlan 1)
-   SubPlan 1
-     ->  Hash Join
-           Output: t.two
-           Hash Cond: (tenk1.stringu1 = t3.stringu1)
-           ->  Seq Scan on public.tenk1
...

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/select_parallel.out /tmp/cirrus-ci-build/src/test/recovery/tmp_c...
--- /tmp/cirrus-ci-build/src/test/regress/expected/select_parallel.out	2024-05-09 18:34:20.091766763 +0000
+++ /tmp/cirrus-ci-build/src/test/recovery/tmp_check/results/select_parallel.out	2024-05-09 18:40:53.043412679 +0000
@@ -451,26 +451,36 @@
   join tenk1 t3 on t3.stringu1 = tenk1.stringu1
   where tenk1.four = t.four
 );
-                                                                                                                       ...
------------------------------------------------------------------------------------------------------------------------...
- Seq Scan on public.tenk1 t
+                                                                                                                       ...
+-----------------------------------------------------------------------------------------------------------------------...
+ Hash Join
    Output: t.unique1, t.unique2, t.two, t.four, t.ten, t.twenty, t.hundred, t.thousand, t.twothousand, t.fivethous, t.t...
-   Filter: (SubPlan 1)
-   SubPlan 1
-     ->  Hash Join
-           Output: t.two
-           Hash Cond: (tenk1.stringu1 = t3.stringu1)
-           ->  Seq Scan on public.tenk1
...

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/select_parallel.out /tmp/cirrus-ci-build/src/test/regress/result...
--- /tmp/cirrus-ci-build/src/test/regress/expected/select_parallel.out	2024-05-09 18:34:20.091766763 +0000
+++ /tmp/cirrus-ci-build/src/test/regress/results/select_parallel.out	2024-05-09 18:37:24.835616442 +0000
@@ -451,26 +451,36 @@
   join tenk1 t3 on t3.stringu1 = tenk1.stringu1
   where tenk1.four = t.four
 );
-                                                                                                                       ...
------------------------------------------------------------------------------------------------------------------------...
- Seq Scan on public.tenk1 t
+                                                                                                                       ...
+-----------------------------------------------------------------------------------------------------------------------...
+ Hash Join
    Output: t.unique1, t.unique2, t.two, t.four, t.ten, t.twenty, t.hundred, t.thousand, t.twothousand, t.fivethous, t.t...
-   Filter: (SubPlan 1)
-   SubPlan 1
-     ->  Hash Join
-           Output: t.two
-           Hash Cond: (tenk1.stringu1 = t3.stringu1)
-           ->  Seq Scan on public.tenk1
...

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/select_parallel.out /tmp/cirrus-ci-build/build/testrun/pg_upgrad...
--- /tmp/cirrus-ci-build/src/test/regress/expected/select_parallel.out	2024-05-09 18:34:21.501065860 +0000
+++ /tmp/cirrus-ci-build/build/testrun/pg_upgrade/002_pg_upgrade/data/results/select_parallel.out	2024-05-09 18:37:03.12...
@@ -451,26 +451,36 @@
   join tenk1 t3 on t3.stringu1 = tenk1.stringu1
   where tenk1.four = t.four
 );
-                                                                                                                       ...
------------------------------------------------------------------------------------------------------------------------...
- Seq Scan on public.tenk1 t
+                                                                                                                       ...
+-----------------------------------------------------------------------------------------------------------------------...
+ Hash Join
    Output: t.unique1, t.unique2, t.two, t.four, t.ten, t.twenty, t.hundred, t.thousand, t.twothousand, t.fivethous, t.t...
-   Filter: (SubPlan 1)
-   SubPlan 1
-     ->  Hash Join
-           Output: t.two
-           Hash Cond: (tenk1.stringu1 = t3.stringu1)
-           ->  Seq Scan on public.tenk1
...

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/select_parallel.out /tmp/cirrus-ci-build/build/testrun/recovery/...
--- /tmp/cirrus-ci-build/src/test/regress/expected/select_parallel.out	2024-05-09 18:34:21.501065860 +0000
+++ /tmp/cirrus-ci-build/build/testrun/recovery/027_stream_regress/data/results/select_parallel.out	2024-05-09 18:37:41....
@@ -451,26 +451,36 @@
   join tenk1 t3 on t3.stringu1 = tenk1.stringu1
   where tenk1.four = t.four
 );
-                                                                                                                       ...
------------------------------------------------------------------------------------------------------------------------...
- Seq Scan on public.tenk1 t
+                                                                                                                       ...
+-----------------------------------------------------------------------------------------------------------------------...
+ Hash Join
    Output: t.unique1, t.unique2, t.two, t.four, t.ten, t.twenty, t.hundred, t.thousand, t.twothousand, t.fivethous, t.t...
-   Filter: (SubPlan 1)
-   SubPlan 1
-     ->  Hash Join
-           Output: t.two
-           Hash Cond: (tenk1.stringu1 = t3.stringu1)
-           ->  Seq Scan on public.tenk1
...

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/select_parallel.out /tmp/cirrus-ci-build/build/testrun/regress/r...
--- /tmp/cirrus-ci-build/src/test/regress/expected/select_parallel.out	2024-05-09 18:34:21.501065860 +0000
+++ /tmp/cirrus-ci-build/build/testrun/regress/regress/results/select_parallel.out	2024-05-09 18:37:00.480975714 +0000
@@ -451,26 +451,36 @@
   join tenk1 t3 on t3.stringu1 = tenk1.stringu1
   where tenk1.four = t.four
 );
-                                                                                                                       ...
------------------------------------------------------------------------------------------------------------------------...
- Seq Scan on public.tenk1 t
+                                                                                                                       ...
+-----------------------------------------------------------------------------------------------------------------------...
+ Hash Join
    Output: t.unique1, t.unique2, t.two, t.four, t.ten, t.twenty, t.hundred, t.thousand, t.twothousand, t.fivethous, t.t...
-   Filter: (SubPlan 1)
-   SubPlan 1
-     ->  Hash Join
-           Output: t.two
-           Hash Cond: (tenk1.stringu1 = t3.stringu1)
-           ->  Seq Scan on public.tenk1
...

diff -w -U3 C:/cirrus/src/test/regress/expected/select_parallel.out C:/cirrus/build/testrun/pg_upgrade/002_pg_upgrade/da...
--- C:/cirrus/src/test/regress/expected/select_parallel.out	2024-05-09 18:34:42.044323500 +0000
+++ C:/cirrus/build/testrun/pg_upgrade/002_pg_upgrade/data/results/select_parallel.out	2024-05-09 18:37:48.210230700 +00...
@@ -452,25 +452,35 @@
   where tenk1.four = t.four
 );
                                                                                                                        ...
------------------------------------------------------------------------------------------------------------------------...
- Seq Scan on public.tenk1 t
+-----------------------------------------------------------------------------------------------------------------------...
+ Hash Join
    Output: t.unique1, t.unique2, t.two, t.four, t.ten, t.twenty, t.hundred, t.thousand, t.twothousand, t.fivethous, t.t...
-   Filter: (SubPlan 1)
-   SubPlan 1
-     ->  Hash Join
-           Output: t.two
-           Hash Cond: (tenk1.stringu1 = t3.stringu1)
-           ->  Seq Scan on public.tenk1
-                 Output: tenk1.unique1, tenk1.unique2, tenk1.two, tenk1.four, tenk1.ten, tenk1.twenty, tenk1.hundred, t...
-                 Filter: (tenk1.four = t.four)
...

diff -w -U3 C:/cirrus/src/test/regress/expected/select_parallel.out C:/cirrus/build/testrun/recovery/027_stream_regress/...
--- C:/cirrus/src/test/regress/expected/select_parallel.out	2024-05-09 18:34:42.044323500 +0000
+++ C:/cirrus/build/testrun/recovery/027_stream_regress/data/results/select_parallel.out	2024-05-09 18:40:15.041281200 +...
@@ -452,25 +452,35 @@
   where tenk1.four = t.four
 );
                                                                                                                        ...
------------------------------------------------------------------------------------------------------------------------...
- Seq Scan on public.tenk1 t
+-----------------------------------------------------------------------------------------------------------------------...
+ Hash Join
    Output: t.unique1, t.unique2, t.two, t.four, t.ten, t.twenty, t.hundred, t.thousand, t.twothousand, t.fivethous, t.t...
-   Filter: (SubPlan 1)
-   SubPlan 1
-     ->  Hash Join
-           Output: t.two
-           Hash Cond: (tenk1.stringu1 = t3.stringu1)
-           ->  Seq Scan on public.tenk1
-                 Output: tenk1.unique1, tenk1.unique2, tenk1.two, tenk1.four, tenk1.ten, tenk1.twenty, tenk1.hundred, t...
-                 Filter: (tenk1.four = t.four)
...

diff -w -U3 C:/cirrus/src/test/regress/expected/select_parallel.out C:/cirrus/build/testrun/regress/regress/results/sele...
--- C:/cirrus/src/test/regress/expected/select_parallel.out	2024-05-09 18:34:42.044323500 +0000
+++ C:/cirrus/build/testrun/regress/regress/results/select_parallel.out	2024-05-09 18:37:46.332303400 +0000
@@ -452,25 +452,35 @@
   where tenk1.four = t.four
 );
                                                                                                                        ...
------------------------------------------------------------------------------------------------------------------------...
- Seq Scan on public.tenk1 t
+-----------------------------------------------------------------------------------------------------------------------...
+ Hash Join
    Output: t.unique1, t.unique2, t.two, t.four, t.ten, t.twenty, t.hundred, t.thousand, t.twothousand, t.fivethous, t.t...
-   Filter: (SubPlan 1)
-   SubPlan 1
-     ->  Hash Join
-           Output: t.two
-           Hash Cond: (tenk1.stringu1 = t3.stringu1)
-           ->  Seq Scan on public.tenk1
-                 Output: tenk1.unique1, tenk1.unique2, tenk1.two, tenk1.four, tenk1.ten, tenk1.twenty, tenk1.hundred, t...
-                 Filter: (tenk1.four = t.four)
...

diff -U3 /Users/admin/pgsql/src/test/regress/expected/select_parallel.out /Users/admin/pgsql/build/testrun/pg_upgrade/00...
--- /Users/admin/pgsql/src/test/regress/expected/select_parallel.out	2024-05-09 18:34:24
+++ /Users/admin/pgsql/build/testrun/pg_upgrade/002_pg_upgrade/data/results/select_parallel.out	2024-05-09 18:35:54
@@ -451,26 +451,36 @@
   join tenk1 t3 on t3.stringu1 = tenk1.stringu1
   where tenk1.four = t.four
 );
-                                                                                                                       ...
------------------------------------------------------------------------------------------------------------------------...
- Seq Scan on public.tenk1 t
+                                                                                                                       ...
+-----------------------------------------------------------------------------------------------------------------------...
+ Hash Join
    Output: t.unique1, t.unique2, t.two, t.four, t.ten, t.twenty, t.hundred, t.thousand, t.twothousand, t.fivethous, t.t...
-   Filter: (SubPlan 1)
-   SubPlan 1
-     ->  Hash Join
-           Output: t.two
-           Hash Cond: (tenk1.stringu1 = t3.stringu1)
-           ->  Seq Scan on public.tenk1
...

diff -U3 /Users/admin/pgsql/src/test/regress/expected/select_parallel.out /Users/admin/pgsql/build/testrun/recovery/027_...
--- /Users/admin/pgsql/src/test/regress/expected/select_parallel.out	2024-05-09 18:34:24
+++ /Users/admin/pgsql/build/testrun/recovery/027_stream_regress/data/results/select_parallel.out	2024-05-09 18:37:21
@@ -451,26 +451,36 @@
   join tenk1 t3 on t3.stringu1 = tenk1.stringu1
   where tenk1.four = t.four
 );
-                                                                                                                       ...
------------------------------------------------------------------------------------------------------------------------...
- Seq Scan on public.tenk1 t
+                                                                                                                       ...
+-----------------------------------------------------------------------------------------------------------------------...
+ Hash Join
    Output: t.unique1, t.unique2, t.two, t.four, t.ten, t.twenty, t.hundred, t.thousand, t.twothousand, t.fivethous, t.t...
-   Filter: (SubPlan 1)
-   SubPlan 1
-     ->  Hash Join
-           Output: t.two
-           Hash Cond: (tenk1.stringu1 = t3.stringu1)
-           ->  Seq Scan on public.tenk1
...

diff -U3 /Users/admin/pgsql/src/test/regress/expected/select_parallel.out /Users/admin/pgsql/build/testrun/regress/regre...
--- /Users/admin/pgsql/src/test/regress/expected/select_parallel.out	2024-05-09 18:34:24
+++ /Users/admin/pgsql/build/testrun/regress/regress/results/select_parallel.out	2024-05-09 18:35:54
@@ -451,26 +451,36 @@
   join tenk1 t3 on t3.stringu1 = tenk1.stringu1
   where tenk1.four = t.four
 );
-                                                                                                                       ...
------------------------------------------------------------------------------------------------------------------------...
- Seq Scan on public.tenk1 t
+                                                                                                                       ...
+-----------------------------------------------------------------------------------------------------------------------...
+ Hash Join
    Output: t.unique1, t.unique2, t.two, t.four, t.ten, t.twenty, t.hundred, t.thousand, t.twothousand, t.fivethous, t.t...
-   Filter: (SubPlan 1)
-   SubPlan 1
-     ->  Hash Join
-           Output: t.two
-           Hash Cond: (tenk1.stringu1 = t3.stringu1)
-           ->  Seq Scan on public.tenk1
...

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/partition_join.out /tmp/cirrus-ci-build/build/testrun/pg_upgrade...
--- /tmp/cirrus-ci-build/src/test/regress/expected/partition_join.out	2024-05-09 13:22:27.921744000 +0000
+++ /tmp/cirrus-ci-build/build/testrun/pg_upgrade/002_pg_upgrade/data/results/partition_join.out	2024-05-09 13:24:23.983...
@@ -5133,17 +5133,15 @@
                               QUERY PLAN                               
 -----------------------------------------------------------------------
  Limit
-   ->  Merge Append
-         Sort Key: x.id
-         ->  Merge Left Join
-               Merge Cond: (x_1.id = y_1.id)
+   ->  Merge Left Join
+         Merge Cond: (x.id = y.id)
+         ->  Append
                ->  Index Only Scan using fract_t0_pkey on fract_t0 x_1
-               ->  Index Only Scan using fract_t0_pkey on fract_t0 y_1
-         ->  Merge Left Join
-               Merge Cond: (x_2.id = y_2.id)
                ->  Index Only Scan using fract_t1_pkey on fract_t1 x_2
+         ->  Append
...

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/partition_join.out /tmp/cirrus-ci-build/build/testrun/recovery/0...
--- /tmp/cirrus-ci-build/src/test/regress/expected/partition_join.out	2024-05-09 13:22:27.921744000 +0000
+++ /tmp/cirrus-ci-build/build/testrun/recovery/027_stream_regress/data/results/partition_join.out	2024-05-09 13:24:56.1...
@@ -5133,17 +5133,15 @@
                               QUERY PLAN                               
 -----------------------------------------------------------------------
  Limit
-   ->  Merge Append
-         Sort Key: x.id
-         ->  Merge Left Join
-               Merge Cond: (x_1.id = y_1.id)
+   ->  Merge Left Join
+         Merge Cond: (x.id = y.id)
+         ->  Append
                ->  Index Only Scan using fract_t0_pkey on fract_t0 x_1
-               ->  Index Only Scan using fract_t0_pkey on fract_t0 y_1
-         ->  Merge Left Join
-               Merge Cond: (x_2.id = y_2.id)
                ->  Index Only Scan using fract_t1_pkey on fract_t1 x_2
+         ->  Append
...

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/partition_join.out /tmp/cirrus-ci-build/build/testrun/regress/re...
--- /tmp/cirrus-ci-build/src/test/regress/expected/partition_join.out	2024-05-09 13:22:27.921744000 +0000
+++ /tmp/cirrus-ci-build/build/testrun/regress/regress/results/partition_join.out	2024-05-09 13:24:22.671143000 +0000
@@ -5133,17 +5133,15 @@
                               QUERY PLAN                               
 -----------------------------------------------------------------------
  Limit
-   ->  Merge Append
-         Sort Key: x.id
-         ->  Merge Left Join
-               Merge Cond: (x_1.id = y_1.id)
+   ->  Merge Left Join
+         Merge Cond: (x.id = y.id)
+         ->  Append
                ->  Index Only Scan using fract_t0_pkey on fract_t0 x_1
-               ->  Index Only Scan using fract_t0_pkey on fract_t0 y_1
-         ->  Merge Left Join
-               Merge Cond: (x_2.id = y_2.id)
                ->  Index Only Scan using fract_t1_pkey on fract_t1 x_2
+         ->  Append
...

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/partition_join.out /tmp/cirrus-ci-build/src/bin/pg_upgrade/tmp_c...
--- /tmp/cirrus-ci-build/src/test/regress/expected/partition_join.out	2024-05-09 13:21:55.014031384 +0000
+++ /tmp/cirrus-ci-build/src/bin/pg_upgrade/tmp_check/results/partition_join.out	2024-05-09 13:26:53.625951967 +0000
@@ -5133,17 +5133,15 @@
                               QUERY PLAN                               
 -----------------------------------------------------------------------
  Limit
-   ->  Merge Append
-         Sort Key: x.id
-         ->  Merge Left Join
-               Merge Cond: (x_1.id = y_1.id)
+   ->  Merge Left Join
+         Merge Cond: (x.id = y.id)
+         ->  Append
                ->  Index Only Scan using fract_t0_pkey on fract_t0 x_1
-               ->  Index Only Scan using fract_t0_pkey on fract_t0 y_1
-         ->  Merge Left Join
-               Merge Cond: (x_2.id = y_2.id)
                ->  Index Only Scan using fract_t1_pkey on fract_t1 x_2
+         ->  Append
...

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/partition_join.out /tmp/cirrus-ci-build/src/test/recovery/tmp_ch...
--- /tmp/cirrus-ci-build/src/test/regress/expected/partition_join.out	2024-05-09 13:21:55.014031384 +0000
+++ /tmp/cirrus-ci-build/src/test/recovery/tmp_check/results/partition_join.out	2024-05-09 13:28:35.361972359 +0000
@@ -5133,17 +5133,15 @@
                               QUERY PLAN                               
 -----------------------------------------------------------------------
  Limit
-   ->  Merge Append
-         Sort Key: x.id
-         ->  Merge Left Join
-               Merge Cond: (x_1.id = y_1.id)
+   ->  Merge Left Join
+         Merge Cond: (x.id = y.id)
+         ->  Append
                ->  Index Only Scan using fract_t0_pkey on fract_t0 x_1
-               ->  Index Only Scan using fract_t0_pkey on fract_t0 y_1
-         ->  Merge Left Join
-               Merge Cond: (x_2.id = y_2.id)
                ->  Index Only Scan using fract_t1_pkey on fract_t1 x_2
+         ->  Append
...

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/partition_join.out /tmp/cirrus-ci-build/src/test/regress/results...
--- /tmp/cirrus-ci-build/src/test/regress/expected/partition_join.out	2024-05-09 13:21:55.014031384 +0000
+++ /tmp/cirrus-ci-build/src/test/regress/results/partition_join.out	2024-05-09 13:25:04.909945095 +0000
@@ -5133,17 +5133,15 @@
                               QUERY PLAN                               
 -----------------------------------------------------------------------
  Limit
-   ->  Merge Append
-         Sort Key: x.id
-         ->  Merge Left Join
-               Merge Cond: (x_1.id = y_1.id)
+   ->  Merge Left Join
+         Merge Cond: (x.id = y.id)
+         ->  Append
                ->  Index Only Scan using fract_t0_pkey on fract_t0 x_1
-               ->  Index Only Scan using fract_t0_pkey on fract_t0 y_1
-         ->  Merge Left Join
-               Merge Cond: (x_2.id = y_2.id)
                ->  Index Only Scan using fract_t1_pkey on fract_t1 x_2
+         ->  Append
...

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/partition_join.out /tmp/cirrus-ci-build/build/testrun/pg_upgrade...
--- /tmp/cirrus-ci-build/src/test/regress/expected/partition_join.out	2024-05-09 13:21:57.570408241 +0000
+++ /tmp/cirrus-ci-build/build/testrun/pg_upgrade/002_pg_upgrade/data/results/partition_join.out	2024-05-09 13:24:19.790...
@@ -5133,17 +5133,15 @@
                               QUERY PLAN                               
 -----------------------------------------------------------------------
  Limit
-   ->  Merge Append
-         Sort Key: x.id
-         ->  Merge Left Join
-               Merge Cond: (x_1.id = y_1.id)
+   ->  Merge Left Join
+         Merge Cond: (x.id = y.id)
+         ->  Append
                ->  Index Only Scan using fract_t0_pkey on fract_t0 x_1
-               ->  Index Only Scan using fract_t0_pkey on fract_t0 y_1
-         ->  Merge Left Join
-               Merge Cond: (x_2.id = y_2.id)
                ->  Index Only Scan using fract_t1_pkey on fract_t1 x_2
+         ->  Append
...

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/partition_join.out /tmp/cirrus-ci-build/build/testrun/recovery/0...
--- /tmp/cirrus-ci-build/src/test/regress/expected/partition_join.out	2024-05-09 13:21:57.570408241 +0000
+++ /tmp/cirrus-ci-build/build/testrun/recovery/027_stream_regress/data/results/partition_join.out	2024-05-09 13:24:48.6...
@@ -5133,17 +5133,15 @@
                               QUERY PLAN                               
 -----------------------------------------------------------------------
  Limit
-   ->  Merge Append
-         Sort Key: x.id
-         ->  Merge Left Join
-               Merge Cond: (x_1.id = y_1.id)
+   ->  Merge Left Join
+         Merge Cond: (x.id = y.id)
+         ->  Append
                ->  Index Only Scan using fract_t0_pkey on fract_t0 x_1
-               ->  Index Only Scan using fract_t0_pkey on fract_t0 y_1
-         ->  Merge Left Join
-               Merge Cond: (x_2.id = y_2.id)
                ->  Index Only Scan using fract_t1_pkey on fract_t1 x_2
+         ->  Append
...

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/partition_join.out /tmp/cirrus-ci-build/build/testrun/regress/re...
--- /tmp/cirrus-ci-build/src/test/regress/expected/partition_join.out	2024-05-09 13:21:57.570408241 +0000
+++ /tmp/cirrus-ci-build/build/testrun/regress/regress/results/partition_join.out	2024-05-09 13:24:20.170390718 +0000
@@ -5133,17 +5133,15 @@
                               QUERY PLAN                               
 -----------------------------------------------------------------------
  Limit
-   ->  Merge Append
-         Sort Key: x.id
-         ->  Merge Left Join
-               Merge Cond: (x_1.id = y_1.id)
+   ->  Merge Left Join
+         Merge Cond: (x.id = y.id)
+         ->  Append
                ->  Index Only Scan using fract_t0_pkey on fract_t0 x_1
-               ->  Index Only Scan using fract_t0_pkey on fract_t0 y_1
-         ->  Merge Left Join
-               Merge Cond: (x_2.id = y_2.id)
                ->  Index Only Scan using fract_t1_pkey on fract_t1 x_2
+         ->  Append
...

diff -w -U3 C:/cirrus/src/test/regress/expected/partition_join.out C:/cirrus/build/testrun/pg_upgrade/002_pg_upgrade/dat...
--- C:/cirrus/src/test/regress/expected/partition_join.out	2024-05-09 13:22:07.709203100 +0000
+++ C:/cirrus/build/testrun/pg_upgrade/002_pg_upgrade/data/results/partition_join.out	2024-05-09 13:25:58.650922000 +000...
@@ -5133,17 +5133,15 @@
                               QUERY PLAN                               
 -----------------------------------------------------------------------
  Limit
-   ->  Merge Append
-         Sort Key: x.id
          ->  Merge Left Join
-               Merge Cond: (x_1.id = y_1.id)
+         Merge Cond: (x.id = y.id)
+         ->  Append
                ->  Index Only Scan using fract_t0_pkey on fract_t0 x_1
-               ->  Index Only Scan using fract_t0_pkey on fract_t0 y_1
-         ->  Merge Left Join
-               Merge Cond: (x_2.id = y_2.id)
                ->  Index Only Scan using fract_t1_pkey on fract_t1 x_2
+         ->  Append
+               ->  Index Only Scan using fract_t0_pkey on fract_t0 y_1
...

diff -w -U3 C:/cirrus/src/test/regress/expected/partition_join.out C:/cirrus/build/testrun/recovery/027_stream_regress/d...
--- C:/cirrus/src/test/regress/expected/partition_join.out	2024-05-09 13:22:07.709203100 +0000
+++ C:/cirrus/build/testrun/recovery/027_stream_regress/data/results/partition_join.out	2024-05-09 13:28:15.182128300 +0...
@@ -5133,17 +5133,15 @@
                               QUERY PLAN                               
 -----------------------------------------------------------------------
  Limit
-   ->  Merge Append
-         Sort Key: x.id
          ->  Merge Left Join
-               Merge Cond: (x_1.id = y_1.id)
+         Merge Cond: (x.id = y.id)
+         ->  Append
                ->  Index Only Scan using fract_t0_pkey on fract_t0 x_1
-               ->  Index Only Scan using fract_t0_pkey on fract_t0 y_1
-         ->  Merge Left Join
-               Merge Cond: (x_2.id = y_2.id)
                ->  Index Only Scan using fract_t1_pkey on fract_t1 x_2
+         ->  Append
+               ->  Index Only Scan using fract_t0_pkey on fract_t0 y_1
...

diff -w -U3 C:/cirrus/src/test/regress/expected/partition_join.out C:/cirrus/build/testrun/regress/regress/results/parti...
--- C:/cirrus/src/test/regress/expected/partition_join.out	2024-05-09 13:22:07.709203100 +0000
+++ C:/cirrus/build/testrun/regress/regress/results/partition_join.out	2024-05-09 13:25:44.372144400 +0000
@@ -5133,17 +5133,15 @@
                               QUERY PLAN                               
 -----------------------------------------------------------------------
  Limit
-   ->  Merge Append
-         Sort Key: x.id
          ->  Merge Left Join
-               Merge Cond: (x_1.id = y_1.id)
+         Merge Cond: (x.id = y.id)
+         ->  Append
                ->  Index Only Scan using fract_t0_pkey on fract_t0 x_1
-               ->  Index Only Scan using fract_t0_pkey on fract_t0 y_1
-         ->  Merge Left Join
-               Merge Cond: (x_2.id = y_2.id)
                ->  Index Only Scan using fract_t1_pkey on fract_t1 x_2
+         ->  Append
+               ->  Index Only Scan using fract_t0_pkey on fract_t0 y_1
...

diff -U3 /Users/admin/pgsql/src/test/regress/expected/partition_join.out /Users/admin/pgsql/build/testrun/pg_upgrade/002...
--- /Users/admin/pgsql/src/test/regress/expected/partition_join.out	2024-05-09 13:21:56
+++ /Users/admin/pgsql/build/testrun/pg_upgrade/002_pg_upgrade/data/results/partition_join.out	2024-05-09 13:24:48
@@ -5133,17 +5133,15 @@
                               QUERY PLAN                               
 -----------------------------------------------------------------------
  Limit
-   ->  Merge Append
-         Sort Key: x.id
-         ->  Merge Left Join
-               Merge Cond: (x_1.id = y_1.id)
+   ->  Merge Left Join
+         Merge Cond: (x.id = y.id)
+         ->  Append
                ->  Index Only Scan using fract_t0_pkey on fract_t0 x_1
-               ->  Index Only Scan using fract_t0_pkey on fract_t0 y_1
-         ->  Merge Left Join
-               Merge Cond: (x_2.id = y_2.id)
                ->  Index Only Scan using fract_t1_pkey on fract_t1 x_2
+         ->  Append
...

diff -U3 /Users/admin/pgsql/src/test/regress/expected/partition_join.out /Users/admin/pgsql/build/testrun/recovery/027_s...
--- /Users/admin/pgsql/src/test/regress/expected/partition_join.out	2024-05-09 13:21:56
+++ /Users/admin/pgsql/build/testrun/recovery/027_stream_regress/data/results/partition_join.out	2024-05-09 13:25:45
@@ -5133,17 +5133,15 @@
                               QUERY PLAN                               
 -----------------------------------------------------------------------
  Limit
-   ->  Merge Append
-         Sort Key: x.id
-         ->  Merge Left Join
-               Merge Cond: (x_1.id = y_1.id)
+   ->  Merge Left Join
+         Merge Cond: (x.id = y.id)
+         ->  Append
                ->  Index Only Scan using fract_t0_pkey on fract_t0 x_1
-               ->  Index Only Scan using fract_t0_pkey on fract_t0 y_1
-         ->  Merge Left Join
-               Merge Cond: (x_2.id = y_2.id)
                ->  Index Only Scan using fract_t1_pkey on fract_t1 x_2
+         ->  Append
...

diff -U3 /Users/admin/pgsql/src/test/regress/expected/partition_join.out /Users/admin/pgsql/build/testrun/regress/regres...
--- /Users/admin/pgsql/src/test/regress/expected/partition_join.out	2024-05-09 13:21:56
+++ /Users/admin/pgsql/build/testrun/regress/regress/results/partition_join.out	2024-05-09 13:24:47
@@ -5133,17 +5133,15 @@
                               QUERY PLAN                               
 -----------------------------------------------------------------------
  Limit
-   ->  Merge Append
-         Sort Key: x.id
-         ->  Merge Left Join
-               Merge Cond: (x_1.id = y_1.id)
+   ->  Merge Left Join
+         Merge Cond: (x.id = y.id)
+         ->  Append
                ->  Index Only Scan using fract_t0_pkey on fract_t0 x_1
-               ->  Index Only Scan using fract_t0_pkey on fract_t0 y_1
-         ->  Merge Left Join
-               Merge Cond: (x_2.id = y_2.id)
                ->  Index Only Scan using fract_t1_pkey on fract_t1 x_2
+         ->  Append
...

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/subscription.out /tmp/cirrus-ci-build/build/testrun/pg_upgrade/0...
--- /tmp/cirrus-ci-build/src/test/regress/expected/subscription.out	2024-05-09 09:35:04.444646000 +0000
+++ /tmp/cirrus-ci-build/build/testrun/pg_upgrade/002_pg_upgrade/data/results/subscription.out	2024-05-09 09:36:32.83925...
@@ -372,7 +372,6 @@
 HINT:  To initiate replication, you must manually create the replication slot, enable the subscription, and refresh the...
 -- fail - force_alter cannot be set alone
 ALTER SUBSCRIPTION regress_testsub SET (force_alter = true);
-ERROR:  force_alter must be specified with two_phase
 \dRs+
                                                                                                                 List of...
       Name       |           Owner           | Enabled | Publication | Binary | Streaming | Two-phase commit | Disable ...

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/subscription.out /tmp/cirrus-ci-build/build/testrun/recovery/027...
--- /tmp/cirrus-ci-build/src/test/regress/expected/subscription.out	2024-05-09 09:35:04.444646000 +0000
+++ /tmp/cirrus-ci-build/build/testrun/recovery/027_stream_regress/data/results/subscription.out	2024-05-09 09:37:06.470...
@@ -372,7 +372,6 @@
 HINT:  To initiate replication, you must manually create the replication slot, enable the subscription, and refresh the...
 -- fail - force_alter cannot be set alone
 ALTER SUBSCRIPTION regress_testsub SET (force_alter = true);
-ERROR:  force_alter must be specified with two_phase
 \dRs+
                                                                                                                 List of...
       Name       |           Owner           | Enabled | Publication | Binary | Streaming | Two-phase commit | Disable ...

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/subscription.out /tmp/cirrus-ci-build/build/testrun/regress/regr...
--- /tmp/cirrus-ci-build/src/test/regress/expected/subscription.out	2024-05-09 09:35:04.444646000 +0000
+++ /tmp/cirrus-ci-build/build/testrun/regress/regress/results/subscription.out	2024-05-09 09:36:31.611409000 +0000
@@ -372,7 +372,6 @@
 HINT:  To initiate replication, you must manually create the replication slot, enable the subscription, and refresh the...
 -- fail - force_alter cannot be set alone
 ALTER SUBSCRIPTION regress_testsub SET (force_alter = true);
-ERROR:  force_alter must be specified with two_phase
 \dRs+
                                                                                                                 List of...
       Name       |           Owner           | Enabled | Publication | Binary | Streaming | Two-phase commit | Disable ...

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/subscription.out /tmp/cirrus-ci-build/src/bin/pg_upgrade/tmp_che...
--- /tmp/cirrus-ci-build/src/test/regress/expected/subscription.out	2024-05-09 09:34:28.074172540 +0000
+++ /tmp/cirrus-ci-build/src/bin/pg_upgrade/tmp_check/results/subscription.out	2024-05-09 09:39:58.473885462 +0000
@@ -372,7 +372,6 @@
 HINT:  To initiate replication, you must manually create the replication slot, enable the subscription, and refresh the...
 -- fail - force_alter cannot be set alone
 ALTER SUBSCRIPTION regress_testsub SET (force_alter = true);
-ERROR:  force_alter must be specified with two_phase
 \dRs+
                                                                                                                 List of...
       Name       |           Owner           | Enabled | Publication | Binary | Streaming | Two-phase commit | Disable ...

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/subscription.out /tmp/cirrus-ci-build/src/test/recovery/tmp_chec...
--- /tmp/cirrus-ci-build/src/test/regress/expected/subscription.out	2024-05-09 09:34:28.074172540 +0000
+++ /tmp/cirrus-ci-build/src/test/recovery/tmp_check/results/subscription.out	2024-05-09 09:41:01.453833866 +0000
@@ -372,7 +372,6 @@
 HINT:  To initiate replication, you must manually create the replication slot, enable the subscription, and refresh the...
 -- fail - force_alter cannot be set alone
 ALTER SUBSCRIPTION regress_testsub SET (force_alter = true);
-ERROR:  force_alter must be specified with two_phase
 \dRs+
                                                                                                                 List of...
       Name       |           Owner           | Enabled | Publication | Binary | Streaming | Two-phase commit | Disable ...

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/subscription.out /tmp/cirrus-ci-build/src/test/regress/results/s...
--- /tmp/cirrus-ci-build/src/test/regress/expected/subscription.out	2024-05-09 09:34:28.074172540 +0000
+++ /tmp/cirrus-ci-build/src/test/regress/results/subscription.out	2024-05-09 09:37:57.633982844 +0000
@@ -372,7 +372,6 @@
 HINT:  To initiate replication, you must manually create the replication slot, enable the subscription, and refresh the...
 -- fail - force_alter cannot be set alone
 ALTER SUBSCRIPTION regress_testsub SET (force_alter = true);
-ERROR:  force_alter must be specified with two_phase
 \dRs+
                                                                                                                 List of...
       Name       |           Owner           | Enabled | Publication | Binary | Streaming | Two-phase commit | Disable ...

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/subscription.out /tmp/cirrus-ci-build/build/testrun/pg_upgrade/0...
--- /tmp/cirrus-ci-build/src/test/regress/expected/subscription.out	2024-05-09 09:34:29.731307920 +0000
+++ /tmp/cirrus-ci-build/build/testrun/pg_upgrade/002_pg_upgrade/data/results/subscription.out	2024-05-09 09:37:28.19120...
@@ -372,7 +372,6 @@
 HINT:  To initiate replication, you must manually create the replication slot, enable the subscription, and refresh the...
 -- fail - force_alter cannot be set alone
 ALTER SUBSCRIPTION regress_testsub SET (force_alter = true);
-ERROR:  force_alter must be specified with two_phase
 \dRs+
                                                                                                                 List of...
       Name       |           Owner           | Enabled | Publication | Binary | Streaming | Two-phase commit | Disable ...

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/subscription.out /tmp/cirrus-ci-build/build/testrun/recovery/027...
--- /tmp/cirrus-ci-build/src/test/regress/expected/subscription.out	2024-05-09 09:34:29.731307920 +0000
+++ /tmp/cirrus-ci-build/build/testrun/recovery/027_stream_regress/data/results/subscription.out	2024-05-09 09:38:04.607...
@@ -372,7 +372,6 @@
 HINT:  To initiate replication, you must manually create the replication slot, enable the subscription, and refresh the...
 -- fail - force_alter cannot be set alone
 ALTER SUBSCRIPTION regress_testsub SET (force_alter = true);
-ERROR:  force_alter must be specified with two_phase
 \dRs+
                                                                                                                 List of...
       Name       |           Owner           | Enabled | Publication | Binary | Streaming | Two-phase commit | Disable ...

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/subscription.out /tmp/cirrus-ci-build/build/testrun/regress/regr...
--- /tmp/cirrus-ci-build/src/test/regress/expected/subscription.out	2024-05-09 09:34:29.731307920 +0000
+++ /tmp/cirrus-ci-build/build/testrun/regress/regress/results/subscription.out	2024-05-09 09:37:26.579206317 +0000
@@ -372,7 +372,6 @@
 HINT:  To initiate replication, you must manually create the replication slot, enable the subscription, and refresh the...
 -- fail - force_alter cannot be set alone
 ALTER SUBSCRIPTION regress_testsub SET (force_alter = true);
-ERROR:  force_alter must be specified with two_phase
 \dRs+
                                                                                                                 List of...
       Name       |           Owner           | Enabled | Publication | Binary | Streaming | Two-phase commit | Disable ...

diff -w -U3 C:/cirrus/src/test/regress/expected/subscription.out C:/cirrus/build/testrun/pg_upgrade/002_pg_upgrade/data/...
--- C:/cirrus/src/test/regress/expected/subscription.out	2024-05-09 09:34:49.101940600 +0000
+++ C:/cirrus/build/testrun/pg_upgrade/002_pg_upgrade/data/results/subscription.out	2024-05-09 09:38:04.963881700 +0000
@@ -372,7 +372,6 @@
 HINT:  To initiate replication, you must manually create the replication slot, enable the subscription, and refresh the...
 -- fail - force_alter cannot be set alone
 ALTER SUBSCRIPTION regress_testsub SET (force_alter = true);
-ERROR:  force_alter must be specified with two_phase
 \dRs+
                                                                                                                 List of...
       Name       |           Owner           | Enabled | Publication | Binary | Streaming | Two-phase commit | Disable ...

diff -w -U3 C:/cirrus/src/test/regress/expected/subscription.out C:/cirrus/build/testrun/recovery/027_stream_regress/dat...
--- C:/cirrus/src/test/regress/expected/subscription.out	2024-05-09 09:34:49.101940600 +0000
+++ C:/cirrus/build/testrun/recovery/027_stream_regress/data/results/subscription.out	2024-05-09 09:40:10.256840800 +000...
@@ -372,7 +372,6 @@
 HINT:  To initiate replication, you must manually create the replication slot, enable the subscription, and refresh the...
 -- fail - force_alter cannot be set alone
 ALTER SUBSCRIPTION regress_testsub SET (force_alter = true);
-ERROR:  force_alter must be specified with two_phase
 \dRs+
                                                                                                                 List of...
       Name       |           Owner           | Enabled | Publication | Binary | Streaming | Two-phase commit | Disable ...

diff -w -U3 C:/cirrus/src/test/regress/expected/subscription.out C:/cirrus/build/testrun/regress/regress/results/subscri...
--- C:/cirrus/src/test/regress/expected/subscription.out	2024-05-09 09:34:49.101940600 +0000
+++ C:/cirrus/build/testrun/regress/regress/results/subscription.out	2024-05-09 09:37:55.888693500 +0000
@@ -372,7 +372,6 @@
 HINT:  To initiate replication, you must manually create the replication slot, enable the subscription, and refresh the...
 -- fail - force_alter cannot be set alone
 ALTER SUBSCRIPTION regress_testsub SET (force_alter = true);
-ERROR:  force_alter must be specified with two_phase
 \dRs+
                                                                                                                 List of...
       Name       |           Owner           | Enabled | Publication | Binary | Streaming | Two-phase commit | Disable ...

diff -U3 /Users/admin/pgsql/src/test/regress/expected/subscription.out /Users/admin/pgsql/build/testrun/pg_upgrade/002_p...
--- /Users/admin/pgsql/src/test/regress/expected/subscription.out	2024-05-09 09:34:29
+++ /Users/admin/pgsql/build/testrun/pg_upgrade/002_pg_upgrade/data/results/subscription.out	2024-05-09 09:36:02
@@ -372,7 +372,6 @@
 HINT:  To initiate replication, you must manually create the replication slot, enable the subscription, and refresh the...
 -- fail - force_alter cannot be set alone
 ALTER SUBSCRIPTION regress_testsub SET (force_alter = true);
-ERROR:  force_alter must be specified with two_phase
 \dRs+
                                                                                                                 List of...
       Name       |           Owner           | Enabled | Publication | Binary | Streaming | Two-phase commit | Disable ...

diff -U3 /Users/admin/pgsql/src/test/regress/expected/subscription.out /Users/admin/pgsql/build/testrun/recovery/027_str...
--- /Users/admin/pgsql/src/test/regress/expected/subscription.out	2024-05-09 09:34:29
+++ /Users/admin/pgsql/build/testrun/recovery/027_stream_regress/data/results/subscription.out	2024-05-09 09:37:28
@@ -372,7 +372,6 @@
 HINT:  To initiate replication, you must manually create the replication slot, enable the subscription, and refresh the...
 -- fail - force_alter cannot be set alone
 ALTER SUBSCRIPTION regress_testsub SET (force_alter = true);
-ERROR:  force_alter must be specified with two_phase
 \dRs+
                                                                                                                 List of...
       Name       |           Owner           | Enabled | Publication | Binary | Streaming | Two-phase commit | Disable ...

diff -U3 /Users/admin/pgsql/src/test/regress/expected/subscription.out /Users/admin/pgsql/build/testrun/regress/regress/...
--- /Users/admin/pgsql/src/test/regress/expected/subscription.out	2024-05-09 09:34:29
+++ /Users/admin/pgsql/build/testrun/regress/regress/results/subscription.out	2024-05-09 09:36:02
@@ -372,7 +372,6 @@
 HINT:  To initiate replication, you must manually create the replication slot, enable the subscription, and refresh the...
 -- fail - force_alter cannot be set alone
 ALTER SUBSCRIPTION regress_testsub SET (force_alter = true);
-ERROR:  force_alter must be specified with two_phase
 \dRs+
                                                                                                                 List of...
       Name       |           Owner           | Enabled | Publication | Binary | Streaming | Two-phase commit | Disable ...

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/alter_table.out /tmp/cirrus-ci-build/build/testrun/pg_upgrade/00...
--- /tmp/cirrus-ci-build/src/test/regress/expected/alter_table.out	2024-05-09 05:18:31.538354000 +0000
+++ /tmp/cirrus-ci-build/build/testrun/pg_upgrade/002_pg_upgrade/data/results/alter_table.out	2024-05-09 05:20:16.299731...
@@ -3476,9 +3476,20 @@
 WHERE relkind IN ('r', 'i', 'S', 't', 'm') AND mapped_oid IS DISTINCT FROM oid;
 SELECT m.* FROM filenode_mapping m LEFT JOIN pg_class c ON c.oid = m.oid
 WHERE c.oid IS NOT NULL OR m.mapped_oid IS NOT NULL;
- oid | mapped_oid | reltablespace | relfilenode | relname 
------+------------+---------------+-------------+---------
-(0 rows)
+  oid  | mapped_oid | reltablespace | relfilenode |       relname        
+-------+------------+---------------+-------------+----------------------
+ 37856 |            |             0 |       37856 | pktable_pkey
+ 37852 |            |             0 |       37852 | pktable
+ 37859 |            |             0 |       37859 | fktable
+ 38346 |            |             0 |       38351 | foo
+ 38355 |            |             0 |       38355 | pg_toast_38346_index
+ 38354 |            |             0 |       38354 | pg_toast_38346
+ 38587 |            |             0 |       38587 | pg_toast_38583_index
+ 38583 |            |             0 |       38583 | recur2
...

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/alter_table.out /tmp/cirrus-ci-build/build/testrun/recovery/027_...
--- /tmp/cirrus-ci-build/src/test/regress/expected/alter_table.out	2024-05-09 05:18:31.538354000 +0000
+++ /tmp/cirrus-ci-build/build/testrun/recovery/027_stream_regress/data/results/alter_table.out	2024-05-09 05:20:52.4681...
@@ -3476,9 +3476,20 @@
 WHERE relkind IN ('r', 'i', 'S', 't', 'm') AND mapped_oid IS DISTINCT FROM oid;
 SELECT m.* FROM filenode_mapping m LEFT JOIN pg_class c ON c.oid = m.oid
 WHERE c.oid IS NOT NULL OR m.mapped_oid IS NOT NULL;
- oid | mapped_oid | reltablespace | relfilenode | relname 
------+------------+---------------+-------------+---------
-(0 rows)
+  oid  | mapped_oid | reltablespace | relfilenode |       relname        
+-------+------------+---------------+-------------+----------------------
+ 37730 |            |             0 |       37730 | pktable_pkey
+ 37727 |            |             0 |       37727 | pktable
+ 37734 |            |             0 |       37734 | fktable
+ 38265 |            |             0 |       38270 | foo
+ 38274 |            |             0 |       38274 | pg_toast_38265_index
+ 38273 |            |             0 |       38273 | pg_toast_38265
+ 38496 |            |             0 |       38496 | old_oids
+ 38513 |            |             0 |       38513 | pg_toast_38510
...

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/alter_table.out /tmp/cirrus-ci-build/build/testrun/regress/regre...
--- /tmp/cirrus-ci-build/src/test/regress/expected/alter_table.out	2024-05-09 05:18:31.538354000 +0000
+++ /tmp/cirrus-ci-build/build/testrun/regress/regress/results/alter_table.out	2024-05-09 05:20:11.218826000 +0000
@@ -3476,9 +3476,20 @@
 WHERE relkind IN ('r', 'i', 'S', 't', 'm') AND mapped_oid IS DISTINCT FROM oid;
 SELECT m.* FROM filenode_mapping m LEFT JOIN pg_class c ON c.oid = m.oid
 WHERE c.oid IS NOT NULL OR m.mapped_oid IS NOT NULL;
- oid | mapped_oid | reltablespace | relfilenode | relname 
------+------------+---------------+-------------+---------
-(0 rows)
+  oid  | mapped_oid | reltablespace | relfilenode |       relname        
+-------+------------+---------------+-------------+----------------------
+ 37875 |            |             0 |       37875 | pktable_pkey
+ 37872 |            |             0 |       37872 | pktable
+ 37877 |            |             0 |       37877 | fktable
+ 38353 |            |             0 |       38359 | foo
+ 38363 |            |             0 |       38363 | pg_toast_38353_index
+ 38362 |            |             0 |       38362 | pg_toast_38353
+ 38592 |            |             0 |       38592 | old_oids
+ 38610 |            |             0 |       38610 | pg_toast_38607
...

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/alter_table.out /tmp/cirrus-ci-build/src/bin/pg_upgrade/tmp_chec...
--- /tmp/cirrus-ci-build/src/test/regress/expected/alter_table.out	2024-05-09 05:17:53.308782251 +0000
+++ /tmp/cirrus-ci-build/src/bin/pg_upgrade/tmp_check/results/alter_table.out	2024-05-09 05:22:21.936376064 +0000
@@ -3476,9 +3476,20 @@
 WHERE relkind IN ('r', 'i', 'S', 't', 'm') AND mapped_oid IS DISTINCT FROM oid;
 SELECT m.* FROM filenode_mapping m LEFT JOIN pg_class c ON c.oid = m.oid
 WHERE c.oid IS NOT NULL OR m.mapped_oid IS NOT NULL;
- oid | mapped_oid | reltablespace | relfilenode | relname 
------+------------+---------------+-------------+---------
-(0 rows)
+  oid  | mapped_oid | reltablespace | relfilenode |       relname        
+-------+------------+---------------+-------------+----------------------
+ 37895 |            |             0 |       37895 | pktable_pkey
+ 37892 |            |             0 |       37892 | pktable
+ 37907 |            |             0 |       37907 | fktable
+ 38460 |            |             0 |       38466 | foo
+ 38470 |            |             0 |       38470 | pg_toast_38460_index
+ 38469 |            |             0 |       38469 | pg_toast_38460
+ 38683 |            |             0 |       38683 | old_oids
+ 38700 |            |             0 |       38700 | pg_toast_38697
...

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/alter_table.out /tmp/cirrus-ci-build/src/test/recovery/tmp_check...
--- /tmp/cirrus-ci-build/src/test/regress/expected/alter_table.out	2024-05-09 05:17:53.308782251 +0000
+++ /tmp/cirrus-ci-build/src/test/recovery/tmp_check/results/alter_table.out	2024-05-09 05:23:31.472276038 +0000
@@ -3476,9 +3476,20 @@
 WHERE relkind IN ('r', 'i', 'S', 't', 'm') AND mapped_oid IS DISTINCT FROM oid;
 SELECT m.* FROM filenode_mapping m LEFT JOIN pg_class c ON c.oid = m.oid
 WHERE c.oid IS NOT NULL OR m.mapped_oid IS NOT NULL;
- oid | mapped_oid | reltablespace | relfilenode | relname 
------+------------+---------------+-------------+---------
-(0 rows)
+  oid  | mapped_oid | reltablespace | relfilenode |       relname        
+-------+------------+---------------+-------------+----------------------
+ 37875 |            |             0 |       37875 | pktable_pkey
+ 37872 |            |             0 |       37872 | pktable
+ 37877 |            |             0 |       37877 | fktable
+ 38412 |            |             0 |       38417 | foo
+ 38421 |            |             0 |       38421 | pg_toast_38412_index
+ 38420 |            |             0 |       38420 | pg_toast_38412
+ 38666 |            |             0 |       38666 | old_oids
+ 38693 |            |             0 |       38693 | pg_toast_38689
...

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/alter_table.out /tmp/cirrus-ci-build/src/test/regress/results/al...
--- /tmp/cirrus-ci-build/src/test/regress/expected/alter_table.out	2024-05-09 05:17:53.308782251 +0000
+++ /tmp/cirrus-ci-build/src/test/regress/results/alter_table.out	2024-05-09 05:20:27.148541788 +0000
@@ -3476,9 +3476,20 @@
 WHERE relkind IN ('r', 'i', 'S', 't', 'm') AND mapped_oid IS DISTINCT FROM oid;
 SELECT m.* FROM filenode_mapping m LEFT JOIN pg_class c ON c.oid = m.oid
 WHERE c.oid IS NOT NULL OR m.mapped_oid IS NOT NULL;
- oid | mapped_oid | reltablespace | relfilenode | relname 
------+------------+---------------+-------------+---------
-(0 rows)
+  oid  | mapped_oid | reltablespace | relfilenode |       relname        
+-------+------------+---------------+-------------+----------------------
+ 37894 |            |             0 |       37894 | pktable_pkey
+ 37891 |            |             0 |       37891 | pktable
+ 37902 |            |             0 |       37902 | fktable
+ 38478 |            |             0 |       38483 | foo
+ 38487 |            |             0 |       38487 | pg_toast_38478_index
+ 38486 |            |             0 |       38486 | pg_toast_38478
+ 38692 |            |             0 |       38692 | old_oids
+ 38711 |            |             0 |       38711 | pg_toast_38708
...

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/alter_table.out /tmp/cirrus-ci-build/build/testrun/pg_upgrade/00...
--- /tmp/cirrus-ci-build/src/test/regress/expected/alter_table.out	2024-05-09 05:17:56.256876036 +0000
+++ /tmp/cirrus-ci-build/build/testrun/pg_upgrade/002_pg_upgrade/data/results/alter_table.out	2024-05-09 05:20:30.624778...
@@ -3476,9 +3476,29 @@
 WHERE relkind IN ('r', 'i', 'S', 't', 'm') AND mapped_oid IS DISTINCT FROM oid;
 SELECT m.* FROM filenode_mapping m LEFT JOIN pg_class c ON c.oid = m.oid
 WHERE c.oid IS NOT NULL OR m.mapped_oid IS NOT NULL;
- oid | mapped_oid | reltablespace | relfilenode | relname 
------+------------+---------------+-------------+---------
-(0 rows)
+  oid  | mapped_oid | reltablespace | relfilenode |       relname        
+-------+------------+---------------+-------------+----------------------
+ 38021 |            |             0 |       38021 | users_id_seq
+ 38027 |            |             0 |       38027 | pg_toast_38022
+ 38035 |            |             0 |       38035 | pg_toast_38022_index
+ 38022 |            |             0 |       38022 | users
+ 38284 |            |             0 |       38284 | foo
+ 38436 |            |             0 |       38436 | forc_test
+ 38863 |            |             0 |       38863 | pg_toast_38860
+ 38864 |            |             0 |       38864 | pg_toast_38860_index
...

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/alter_table.out /tmp/cirrus-ci-build/build/testrun/recovery/027_...
--- /tmp/cirrus-ci-build/src/test/regress/expected/alter_table.out	2024-05-09 05:17:56.256876036 +0000
+++ /tmp/cirrus-ci-build/build/testrun/recovery/027_stream_regress/data/results/alter_table.out	2024-05-09 05:21:03.1887...
@@ -3476,9 +3476,29 @@
 WHERE relkind IN ('r', 'i', 'S', 't', 'm') AND mapped_oid IS DISTINCT FROM oid;
 SELECT m.* FROM filenode_mapping m LEFT JOIN pg_class c ON c.oid = m.oid
 WHERE c.oid IS NOT NULL OR m.mapped_oid IS NOT NULL;
- oid | mapped_oid | reltablespace | relfilenode | relname 
------+------------+---------------+-------------+---------
-(0 rows)
+  oid  | mapped_oid | reltablespace | relfilenode |       relname        
+-------+------------+---------------+-------------+----------------------
+ 37927 |            |             0 |       37927 | users_id_seq
+ 37933 |            |             0 |       37933 | pg_toast_37928
+ 37934 |            |             0 |       37934 | pg_toast_37928_index
+ 37928 |            |             0 |       37928 | users
+ 38029 |            |             0 |       38029 | foo
+ 38422 |            |             0 |       38422 | forc_test
+ 38867 |            |             0 |       38867 | pg_toast_38864
+ 38868 |            |             0 |       38868 | pg_toast_38864_index
...

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/alter_table.out /tmp/cirrus-ci-build/build/testrun/regress/regre...
--- /tmp/cirrus-ci-build/src/test/regress/expected/alter_table.out	2024-05-09 05:17:56.256876036 +0000
+++ /tmp/cirrus-ci-build/build/testrun/regress/regress/results/alter_table.out	2024-05-09 05:20:25.588781487 +0000
@@ -3476,9 +3476,29 @@
 WHERE relkind IN ('r', 'i', 'S', 't', 'm') AND mapped_oid IS DISTINCT FROM oid;
 SELECT m.* FROM filenode_mapping m LEFT JOIN pg_class c ON c.oid = m.oid
 WHERE c.oid IS NOT NULL OR m.mapped_oid IS NOT NULL;
- oid | mapped_oid | reltablespace | relfilenode | relname 
------+------------+---------------+-------------+---------
-(0 rows)
+  oid  | mapped_oid | reltablespace | relfilenode |       relname        
+-------+------------+---------------+-------------+----------------------
+ 38111 |            |             0 |       38111 | users_id_seq
+ 38117 |            |             0 |       38117 | pg_toast_38112
+ 38118 |            |             0 |       38118 | pg_toast_38112_index
+ 38112 |            |             0 |       38112 | users
+ 38317 |            |             0 |       38317 | foo
+ 38512 |            |             0 |       38512 | forc_test
+ 38950 |            |             0 |       38950 | pg_toast_38947
+ 38951 |            |             0 |       38951 | pg_toast_38947_index
...

diff -w -U3 C:/cirrus/src/test/regress/expected/alter_table.out C:/cirrus/build/testrun/pg_upgrade/002_pg_upgrade/data/r...
--- C:/cirrus/src/test/regress/expected/alter_table.out	2024-05-09 05:18:05.378177900 +0000
+++ C:/cirrus/build/testrun/pg_upgrade/002_pg_upgrade/data/results/alter_table.out	2024-05-09 05:21:45.666566500 +0000
@@ -3477,8 +3477,19 @@
 SELECT m.* FROM filenode_mapping m LEFT JOIN pg_class c ON c.oid = m.oid
 WHERE c.oid IS NOT NULL OR m.mapped_oid IS NOT NULL;
  oid | mapped_oid | reltablespace | relfilenode | relname 
------+------------+---------------+-------------+---------
-(0 rows)
+-------+------------+---------------+-------------+----------------------
+ 37564 |            |             0 |       37564 | pktable_pkey
+ 37561 |            |             0 |       37561 | pktable
+ 37566 |            |             0 |       37566 | fktable
+ 38063 |            |             0 |       38072 | foo
+ 38077 |            |             0 |       38077 | pg_toast_38063_index
+ 38076 |            |             0 |       38076 | pg_toast_38063
+ 38300 |            |             0 |       38300 | old_oids
+ 38317 |            |             0 |       38317 | pg_toast_38314
+ 38318 |            |             0 |       38318 | pg_toast_38314_index
+ 38314 |            |             0 |       38314 | recur2
...

diff -w -U3 C:/cirrus/src/test/regress/expected/alter_table.out C:/cirrus/build/testrun/recovery/027_stream_regress/data...
--- C:/cirrus/src/test/regress/expected/alter_table.out	2024-05-09 05:18:05.378177900 +0000
+++ C:/cirrus/build/testrun/recovery/027_stream_regress/data/results/alter_table.out	2024-05-09 05:24:05.152836200 +0000
@@ -3477,8 +3477,19 @@
 SELECT m.* FROM filenode_mapping m LEFT JOIN pg_class c ON c.oid = m.oid
 WHERE c.oid IS NOT NULL OR m.mapped_oid IS NOT NULL;
  oid | mapped_oid | reltablespace | relfilenode | relname 
------+------------+---------------+-------------+---------
-(0 rows)
+-------+------------+---------------+-------------+----------------------
+ 37419 |            |             0 |       37419 | pktable_pkey
+ 37413 |            |             0 |       37413 | pktable
+ 37424 |            |             0 |       37424 | fktable
+ 38069 |            |             0 |       38100 | foo
+ 38105 |            |             0 |       38105 | pg_toast_38069_index
+ 38103 |            |             0 |       38103 | pg_toast_38069
+ 38306 |            |             0 |       38306 | old_oids
+ 38328 |            |             0 |       38328 | pg_toast_38325
+ 38329 |            |             0 |       38329 | pg_toast_38325_index
+ 38325 |            |             0 |       38325 | recur2
...

diff -w -U3 C:/cirrus/src/test/regress/expected/alter_table.out C:/cirrus/build/testrun/regress/regress/results/alter_ta...
--- C:/cirrus/src/test/regress/expected/alter_table.out	2024-05-09 05:18:05.378177900 +0000
+++ C:/cirrus/build/testrun/regress/regress/results/alter_table.out	2024-05-09 05:21:37.477111800 +0000
@@ -3477,8 +3477,19 @@
 SELECT m.* FROM filenode_mapping m LEFT JOIN pg_class c ON c.oid = m.oid
 WHERE c.oid IS NOT NULL OR m.mapped_oid IS NOT NULL;
  oid | mapped_oid | reltablespace | relfilenode | relname 
------+------------+---------------+-------------+---------
-(0 rows)
+-------+------------+---------------+-------------+----------------------
+ 36031 |            |             0 |       36031 | pktable_pkey
+ 36027 |            |             0 |       36027 | pktable
+ 36034 |            |             0 |       36034 | fktable
+ 37862 |            |             0 |       37872 | foo
+ 37879 |            |             0 |       37879 | pg_toast_37862_index
+ 37876 |            |             0 |       37876 | pg_toast_37862
+ 38285 |            |             0 |       38285 | old_oids
+ 38304 |            |             0 |       38304 | pg_toast_38301
+ 38305 |            |             0 |       38305 | pg_toast_38301_index
+ 38301 |            |             0 |       38301 | recur2
...

diff -U3 /Users/admin/pgsql/src/test/regress/expected/alter_table.out /Users/admin/pgsql/build/testrun/pg_upgrade/002_pg...
--- /Users/admin/pgsql/src/test/regress/expected/alter_table.out	2024-05-09 05:17:49
+++ /Users/admin/pgsql/build/testrun/pg_upgrade/002_pg_upgrade/data/results/alter_table.out	2024-05-09 05:20:18
@@ -3476,9 +3476,20 @@
 WHERE relkind IN ('r', 'i', 'S', 't', 'm') AND mapped_oid IS DISTINCT FROM oid;
 SELECT m.* FROM filenode_mapping m LEFT JOIN pg_class c ON c.oid = m.oid
 WHERE c.oid IS NOT NULL OR m.mapped_oid IS NOT NULL;
- oid | mapped_oid | reltablespace | relfilenode | relname 
------+------------+---------------+-------------+---------
-(0 rows)
+  oid  | mapped_oid | reltablespace | relfilenode |       relname        
+-------+------------+---------------+-------------+----------------------
+ 37645 |            |             0 |       37645 | pktable_pkey
+ 37639 |            |             0 |       37639 | pktable
+ 37649 |            |             0 |       37649 | fktable
+ 38473 |            |             0 |       38478 | foo
+ 38482 |            |             0 |       38482 | pg_toast_38473_index
+ 38481 |            |             0 |       38481 | pg_toast_38473
+ 38687 |            |             0 |       38687 | pg_toast_38683_index
+ 38683 |            |             0 |       38683 | recur2
...

diff -U3 /Users/admin/pgsql/src/test/regress/expected/alter_table.out /Users/admin/pgsql/build/testrun/recovery/027_stre...
--- /Users/admin/pgsql/src/test/regress/expected/alter_table.out	2024-05-09 05:17:49
+++ /Users/admin/pgsql/build/testrun/recovery/027_stream_regress/data/results/alter_table.out	2024-05-09 05:21:36
@@ -3476,9 +3476,20 @@
 WHERE relkind IN ('r', 'i', 'S', 't', 'm') AND mapped_oid IS DISTINCT FROM oid;
 SELECT m.* FROM filenode_mapping m LEFT JOIN pg_class c ON c.oid = m.oid
 WHERE c.oid IS NOT NULL OR m.mapped_oid IS NOT NULL;
- oid | mapped_oid | reltablespace | relfilenode | relname 
------+------------+---------------+-------------+---------
-(0 rows)
+  oid  | mapped_oid | reltablespace | relfilenode |       relname        
+-------+------------+---------------+-------------+----------------------
+ 37780 |            |             0 |       37780 | pktable_pkey
+ 37777 |            |             0 |       37777 | pktable
+ 37782 |            |             0 |       37782 | fktable
+ 38245 |            |             0 |       38252 | foo
+ 38256 |            |             0 |       38256 | pg_toast_38245_index
+ 38255 |            |             0 |       38255 | pg_toast_38245
+ 38472 |            |             0 |       38472 | old_oids
+ 38491 |            |             0 |       38491 | pg_toast_38488
...

diff -U3 /Users/admin/pgsql/src/test/regress/expected/alter_table.out /Users/admin/pgsql/build/testrun/regress/regress/r...
--- /Users/admin/pgsql/src/test/regress/expected/alter_table.out	2024-05-09 05:17:49
+++ /Users/admin/pgsql/build/testrun/regress/regress/results/alter_table.out	2024-05-09 05:20:12
@@ -3476,9 +3476,20 @@
 WHERE relkind IN ('r', 'i', 'S', 't', 'm') AND mapped_oid IS DISTINCT FROM oid;
 SELECT m.* FROM filenode_mapping m LEFT JOIN pg_class c ON c.oid = m.oid
 WHERE c.oid IS NOT NULL OR m.mapped_oid IS NOT NULL;
- oid | mapped_oid | reltablespace | relfilenode | relname 
------+------------+---------------+-------------+---------
-(0 rows)
+  oid  | mapped_oid | reltablespace | relfilenode |       relname        
+-------+------------+---------------+-------------+----------------------
+ 37854 |            |             0 |       37854 | pktable_pkey
+ 37851 |            |             0 |       37851 | pktable
+ 37856 |            |             0 |       37856 | fktable
+ 38439 |            |             0 |       38448 | foo
+ 38452 |            |             0 |       38452 | pg_toast_38439_index
+ 38451 |            |             0 |       38451 | pg_toast_38439
+ 38677 |            |             0 |       38677 | pg_toast_38674
+ 38678 |            |             0 |       38678 | pg_toast_38674_index
...

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/stats_export_import.out /tmp/cirrus-ci-build/build/testrun/pg_up...
--- /tmp/cirrus-ci-build/src/test/regress/expected/stats_export_import.out	2024-05-09 04:29:01.479715000 +0000
+++ /tmp/cirrus-ci-build/build/testrun/pg_upgrade/002_pg_upgrade/data/results/stats_export_import.out	2024-05-09 04:30:2...
@@ -366,7 +366,7 @@
  stats_export_import | test      | id      | f         |       0.5 |         2 |       -0.1 |                  |       ...
 (1 row)
 
--- warn: scalars can't have mcelem 
+-- warn: scalars can't have mcelem
 SELECT pg_catalog.pg_set_attribute_stats(
     'stats_export_import.test'::regclass,
     'id'::name,
@@ -419,7 +419,7 @@
  t
 (1 row)
 
--- ok: mcelem 
+-- ok: mcelem
 SELECT pg_catalog.pg_set_attribute_stats(
     'stats_export_import.test'::regclass,
...

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/stats_export_import.out /tmp/cirrus-ci-build/build/testrun/recov...
--- /tmp/cirrus-ci-build/src/test/regress/expected/stats_export_import.out	2024-05-09 04:29:01.479715000 +0000
+++ /tmp/cirrus-ci-build/build/testrun/recovery/027_stream_regress/data/results/stats_export_import.out	2024-05-09 04:30...
@@ -366,7 +366,7 @@
  stats_export_import | test      | id      | f         |       0.5 |         2 |       -0.1 |                  |       ...
 (1 row)
 
--- warn: scalars can't have mcelem 
+-- warn: scalars can't have mcelem
 SELECT pg_catalog.pg_set_attribute_stats(
     'stats_export_import.test'::regclass,
     'id'::name,
@@ -419,7 +419,7 @@
  t
 (1 row)
 
--- ok: mcelem 
+-- ok: mcelem
 SELECT pg_catalog.pg_set_attribute_stats(
     'stats_export_import.test'::regclass,
...

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/stats_export_import.out /tmp/cirrus-ci-build/build/testrun/regre...
--- /tmp/cirrus-ci-build/src/test/regress/expected/stats_export_import.out	2024-05-09 04:29:01.479715000 +0000
+++ /tmp/cirrus-ci-build/build/testrun/regress/regress/results/stats_export_import.out	2024-05-09 04:30:26.636647000 +00...
@@ -366,7 +366,7 @@
  stats_export_import | test      | id      | f         |       0.5 |         2 |       -0.1 |                  |       ...
 (1 row)
 
--- warn: scalars can't have mcelem 
+-- warn: scalars can't have mcelem
 SELECT pg_catalog.pg_set_attribute_stats(
     'stats_export_import.test'::regclass,
     'id'::name,
@@ -419,7 +419,7 @@
  t
 (1 row)
 
--- ok: mcelem 
+-- ok: mcelem
 SELECT pg_catalog.pg_set_attribute_stats(
     'stats_export_import.test'::regclass,
...

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/stats_export_import.out /tmp/cirrus-ci-build/src/test/recovery/t...
--- /tmp/cirrus-ci-build/src/test/regress/expected/stats_export_import.out	2024-05-09 04:28:23.814965474 +0000
+++ /tmp/cirrus-ci-build/src/test/recovery/tmp_check/results/stats_export_import.out	2024-05-09 04:34:35.850974894 +0000
@@ -366,7 +366,7 @@
  stats_export_import | test      | id      | f         |       0.5 |         2 |       -0.1 |                  |       ...
 (1 row)
 
--- warn: scalars can't have mcelem 
+-- warn: scalars can't have mcelem
 SELECT pg_catalog.pg_set_attribute_stats(
     'stats_export_import.test'::regclass,
     'id'::name,
@@ -419,7 +419,7 @@
  t
 (1 row)
 
--- ok: mcelem 
+-- ok: mcelem
 SELECT pg_catalog.pg_set_attribute_stats(
     'stats_export_import.test'::regclass,
...

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/stats_export_import.out /tmp/cirrus-ci-build/src/test/regress/re...
--- /tmp/cirrus-ci-build/src/test/regress/expected/stats_export_import.out	2024-05-09 04:28:23.814965474 +0000
+++ /tmp/cirrus-ci-build/src/test/regress/results/stats_export_import.out	2024-05-09 04:31:04.771005344 +0000
@@ -366,7 +366,7 @@
  stats_export_import | test      | id      | f         |       0.5 |         2 |       -0.1 |                  |       ...
 (1 row)
 
--- warn: scalars can't have mcelem 
+-- warn: scalars can't have mcelem
 SELECT pg_catalog.pg_set_attribute_stats(
     'stats_export_import.test'::regclass,
     'id'::name,
@@ -419,7 +419,7 @@
  t
 (1 row)
 
--- ok: mcelem 
+-- ok: mcelem
 SELECT pg_catalog.pg_set_attribute_stats(
     'stats_export_import.test'::regclass,
...

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/stats_export_import.out /tmp/cirrus-ci-build/build/testrun/pg_up...
--- /tmp/cirrus-ci-build/src/test/regress/expected/stats_export_import.out	2024-05-09 04:28:23.810834132 +0000
+++ /tmp/cirrus-ci-build/build/testrun/pg_upgrade/002_pg_upgrade/data/results/stats_export_import.out	2024-05-09 04:31:3...
@@ -366,7 +366,7 @@
  stats_export_import | test      | id      | f         |       0.5 |         2 |       -0.1 |                  |       ...
 (1 row)
 
--- warn: scalars can't have mcelem 
+-- warn: scalars can't have mcelem
 SELECT pg_catalog.pg_set_attribute_stats(
     'stats_export_import.test'::regclass,
     'id'::name,
@@ -419,7 +419,7 @@
  t
 (1 row)
 
--- ok: mcelem 
+-- ok: mcelem
 SELECT pg_catalog.pg_set_attribute_stats(
     'stats_export_import.test'::regclass,
...

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/stats_export_import.out /tmp/cirrus-ci-build/build/testrun/recov...
--- /tmp/cirrus-ci-build/src/test/regress/expected/stats_export_import.out	2024-05-09 04:28:23.810834132 +0000
+++ /tmp/cirrus-ci-build/build/testrun/recovery/027_stream_regress/data/results/stats_export_import.out	2024-05-09 04:32...
@@ -366,7 +366,7 @@
  stats_export_import | test      | id      | f         |       0.5 |         2 |       -0.1 |                  |       ...
 (1 row)
 
--- warn: scalars can't have mcelem 
+-- warn: scalars can't have mcelem
 SELECT pg_catalog.pg_set_attribute_stats(
     'stats_export_import.test'::regclass,
     'id'::name,
@@ -419,7 +419,7 @@
  t
 (1 row)
 
--- ok: mcelem 
+-- ok: mcelem
 SELECT pg_catalog.pg_set_attribute_stats(
     'stats_export_import.test'::regclass,
...

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/stats_export_import.out /tmp/cirrus-ci-build/build/testrun/regre...
--- /tmp/cirrus-ci-build/src/test/regress/expected/stats_export_import.out	2024-05-09 04:28:23.810834132 +0000
+++ /tmp/cirrus-ci-build/build/testrun/regress/regress/results/stats_export_import.out	2024-05-09 04:31:35.478856929 +00...
@@ -366,7 +366,7 @@
  stats_export_import | test      | id      | f         |       0.5 |         2 |       -0.1 |                  |       ...
 (1 row)
 
--- warn: scalars can't have mcelem 
+-- warn: scalars can't have mcelem
 SELECT pg_catalog.pg_set_attribute_stats(
     'stats_export_import.test'::regclass,
     'id'::name,
@@ -419,7 +419,7 @@
  t
 (1 row)
 
--- ok: mcelem 
+-- ok: mcelem
 SELECT pg_catalog.pg_set_attribute_stats(
     'stats_export_import.test'::regclass,
...

diff -U3 /Users/admin/pgsql/src/test/regress/expected/stats_export_import.out /Users/admin/pgsql/build/testrun/pg_upgrad...
--- /Users/admin/pgsql/src/test/regress/expected/stats_export_import.out	2024-05-09 04:28:22
+++ /Users/admin/pgsql/build/testrun/pg_upgrade/002_pg_upgrade/data/results/stats_export_import.out	2024-05-09 04:29:53
@@ -366,7 +366,7 @@
  stats_export_import | test      | id      | f         |       0.5 |         2 |       -0.1 |                  |       ...
 (1 row)
 
--- warn: scalars can't have mcelem 
+-- warn: scalars can't have mcelem
 SELECT pg_catalog.pg_set_attribute_stats(
     'stats_export_import.test'::regclass,
     'id'::name,
@@ -419,7 +419,7 @@
  t
 (1 row)
 
--- ok: mcelem 
+-- ok: mcelem
 SELECT pg_catalog.pg_set_attribute_stats(
     'stats_export_import.test'::regclass,
...

diff -U3 /Users/admin/pgsql/src/test/regress/expected/stats_export_import.out /Users/admin/pgsql/build/testrun/recovery/...
--- /Users/admin/pgsql/src/test/regress/expected/stats_export_import.out	2024-05-09 04:28:22
+++ /Users/admin/pgsql/build/testrun/recovery/027_stream_regress/data/results/stats_export_import.out	2024-05-09 04:30:5...
@@ -366,7 +366,7 @@
  stats_export_import | test      | id      | f         |       0.5 |         2 |       -0.1 |                  |       ...
 (1 row)
 
--- warn: scalars can't have mcelem 
+-- warn: scalars can't have mcelem
 SELECT pg_catalog.pg_set_attribute_stats(
     'stats_export_import.test'::regclass,
     'id'::name,
@@ -419,7 +419,7 @@
  t
 (1 row)
 
--- ok: mcelem 
+-- ok: mcelem
 SELECT pg_catalog.pg_set_attribute_stats(
     'stats_export_import.test'::regclass,
...

diff -U3 /Users/admin/pgsql/src/test/regress/expected/stats_export_import.out /Users/admin/pgsql/build/testrun/regress/r...
--- /Users/admin/pgsql/src/test/regress/expected/stats_export_import.out	2024-05-09 04:28:22
+++ /Users/admin/pgsql/build/testrun/regress/regress/results/stats_export_import.out	2024-05-09 04:29:52
@@ -366,7 +366,7 @@
  stats_export_import | test      | id      | f         |       0.5 |         2 |       -0.1 |                  |       ...
 (1 row)
 
--- warn: scalars can't have mcelem 
+-- warn: scalars can't have mcelem
 SELECT pg_catalog.pg_set_attribute_stats(
     'stats_export_import.test'::regclass,
     'id'::name,
@@ -419,7 +419,7 @@
  t
 (1 row)
 
--- ok: mcelem 
+-- ok: mcelem
 SELECT pg_catalog.pg_set_attribute_stats(
     'stats_export_import.test'::regclass,
...

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/constraints.out /tmp/cirrus-ci-build/build/testrun/pg_upgrade/00...
--- /tmp/cirrus-ci-build/src/test/regress/expected/constraints.out	2024-05-09 02:07:41.215888000 +0000
+++ /tmp/cirrus-ci-build/build/testrun/pg_upgrade/002_pg_upgrade/data/results/constraints.out	2024-05-09 02:09:02.664730...
@@ -1247,61 +1247,7 @@
 Inherits: notnull_tbl4
 
 \d+ notnull_tbl4_cld3
-                             Table "public.notnull_tbl4_cld3"
- Column |  Type   | Collation | Nullable | Default | Storage | Stats target | Description 
---------+---------+-----------+----------+---------+---------+--------------+-------------
- a      | integer |           | not null |         | plain   |              | 
-Indexes:
-    "notnull_tbl4_cld3_pkey" PRIMARY KEY, btree (a) DEFERRABLE
-Not-null constraints:
-    "a_nn" NOT NULL "a" (local, inherited)
-Inherits: notnull_tbl4
-
--- leave these tables around for pg_upgrade testing
--- also, if a NOT NULL is dropped underneath a deferrable PK, the column
--- should still be nullable afterwards.  This mimics what pg_dump does.
...

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/constraints.out /tmp/cirrus-ci-build/build/testrun/recovery/027_...
--- /tmp/cirrus-ci-build/src/test/regress/expected/constraints.out	2024-05-09 02:07:41.215888000 +0000
+++ /tmp/cirrus-ci-build/build/testrun/recovery/027_stream_regress/data/results/constraints.out	2024-05-09 02:09:28.0463...
@@ -1247,61 +1247,7 @@
 Inherits: notnull_tbl4
 
 \d+ notnull_tbl4_cld3
-                             Table "public.notnull_tbl4_cld3"
- Column |  Type   | Collation | Nullable | Default | Storage | Stats target | Description 
---------+---------+-----------+----------+---------+---------+--------------+-------------
- a      | integer |           | not null |         | plain   |              | 
-Indexes:
-    "notnull_tbl4_cld3_pkey" PRIMARY KEY, btree (a) DEFERRABLE
-Not-null constraints:
-    "a_nn" NOT NULL "a" (local, inherited)
-Inherits: notnull_tbl4
-
--- leave these tables around for pg_upgrade testing
--- also, if a NOT NULL is dropped underneath a deferrable PK, the column
--- should still be nullable afterwards.  This mimics what pg_dump does.
...

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/constraints.out /tmp/cirrus-ci-build/build/testrun/regress/regre...
--- /tmp/cirrus-ci-build/src/test/regress/expected/constraints.out	2024-05-09 02:07:41.215888000 +0000
+++ /tmp/cirrus-ci-build/build/testrun/regress/regress/results/constraints.out	2024-05-09 02:08:59.855101000 +0000
@@ -1277,31 +1277,10 @@
 CREATE ROLE regress_constraint_comments;
 SET SESSION AUTHORIZATION regress_constraint_comments;
 CREATE TABLE constraint_comments_tbl (a int CONSTRAINT the_constraint CHECK (a > 0));
-CREATE DOMAIN constraint_comments_dom AS int CONSTRAINT the_constraint CHECK (value > 0);
-COMMENT ON CONSTRAINT the_constraint ON constraint_comments_tbl IS 'yes, the comment';
-COMMENT ON CONSTRAINT the_constraint ON DOMAIN constraint_comments_dom IS 'yes, another comment';
--- no such constraint
-COMMENT ON CONSTRAINT no_constraint ON constraint_comments_tbl IS 'yes, the comment';
-ERROR:  constraint "no_constraint" for table "constraint_comments_tbl" does not exist
-COMMENT ON CONSTRAINT no_constraint ON DOMAIN constraint_comments_dom IS 'yes, another comment';
-ERROR:  constraint "no_constraint" for domain constraint_comments_dom does not exist
--- no such table/domain
-COMMENT ON CONSTRAINT the_constraint ON no_comments_tbl IS 'bad comment';
-ERROR:  relation "no_comments_tbl" does not exist
-COMMENT ON CONSTRAINT the_constraint ON DOMAIN no_comments_dom IS 'another bad comment';
-ERROR:  type "no_comments_dom" does not exist
...

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/triggers.out /tmp/cirrus-ci-build/src/bin/pg_upgrade/tmp_check/r...
--- /tmp/cirrus-ci-build/src/test/regress/expected/triggers.out	2024-05-09 02:07:07.763924957 +0000
+++ /tmp/cirrus-ci-build/src/bin/pg_upgrade/tmp_check/results/triggers.out	2024-05-09 02:11:21.419667976 +0000
@@ -2684,1063 +2684,10 @@
 -- verify that the "AFTER UPDATE OF columns" event is propagated correctly
 create table parted_trigger (a int, b text) partition by range (a);
 create table parted_trigger_1 partition of parted_trigger for values from (0) to (1000);
-create table parted_trigger_2 (drp int, a int, b text);
-alter table parted_trigger_2 drop column drp;
-alter table parted_trigger attach partition parted_trigger_2 for values from (1000) to (2000);
-create trigger parted_trigger after update of b on parted_trigger
-  for each row execute procedure trigger_notice_ab();
-create table parted_trigger_3 (b text, a int) partition by range (length(b));
-create table parted_trigger_3_1 partition of parted_trigger_3 for values from (1) to (4);
-create table parted_trigger_3_2 partition of parted_trigger_3 for values from (4) to (8);
-alter table parted_trigger attach partition parted_trigger_3 for values from (2000) to (3000);
-insert into parted_trigger values (0, 'a'), (1000, 'c'), (2000, 'e'), (2001, 'eeee');
-update parted_trigger set a = a + 2;	-- no notices here
-update parted_trigger set b = b || 'b';	-- all triggers should fire
-NOTICE:  trigger parted_trigger on parted_trigger_1 AFTER UPDATE for ROW: (a,b)=(2,ab)
...

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/triggers.out /tmp/cirrus-ci-build/src/test/regress/results/trigg...
--- /tmp/cirrus-ci-build/src/test/regress/expected/triggers.out	2024-05-09 02:07:07.763924957 +0000
+++ /tmp/cirrus-ci-build/src/test/regress/results/triggers.out	2024-05-09 02:09:52.463846018 +0000
@@ -2681,1066 +2681,10 @@
 (7 rows)
 
 drop table parted_referenced, parted_trigger, unparted_trigger;
--- verify that the "AFTER UPDATE OF columns" event is propagated correctly
-create table parted_trigger (a int, b text) partition by range (a);
-create table parted_trigger_1 partition of parted_trigger for values from (0) to (1000);
-create table parted_trigger_2 (drp int, a int, b text);
-alter table parted_trigger_2 drop column drp;
-alter table parted_trigger attach partition parted_trigger_2 for values from (1000) to (2000);
-create trigger parted_trigger after update of b on parted_trigger
-  for each row execute procedure trigger_notice_ab();
-create table parted_trigger_3 (b text, a int) partition by range (length(b));
-create table parted_trigger_3_1 partition of parted_trigger_3 for values from (1) to (4);
-create table parted_trigger_3_2 partition of parted_trigger_3 for values from (4) to (8);
-alter table parted_trigger attach partition parted_trigger_3 for values from (2000) to (3000);
-insert into parted_trigger values (0, 'a'), (1000, 'c'), (2000, 'e'), (2001, 'eeee');
...

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/triggers.out /tmp/cirrus-ci-build/build/testrun/pg_upgrade/002_p...
--- /tmp/cirrus-ci-build/src/test/regress/expected/triggers.out	2024-05-09 02:07:11.493754500 +0000
+++ /tmp/cirrus-ci-build/build/testrun/pg_upgrade/002_pg_upgrade/data/results/triggers.out	2024-05-09 02:09:24.209746611...
@@ -2541,1206 +2541,10 @@
 -- there's no partition for a=0, but this update works anyway because
 -- the trigger causes the tuple to be routed to another partition
 update parted set a = 0;
-select tableoid::regclass, * from parted;
-  tableoid  | a | b |                                 c                                 
-------------+---+---+-------------------------------------------------------------------
- parted_1_1 | 1 | 1 | uno uno v6 did INSERT did UPDATE did INSERT did UPDATE did INSERT
-(1 row)
-
-drop table parted;
-create table parted (a int, b int, c text) partition by list ((a + b));
-create or replace function parted_trigfunc() returns trigger language plpgsql as $$
-begin
-  new.a = new.a + new.b;
-  return new;
-end;
...

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/constraints.out /tmp/cirrus-ci-build/build/testrun/recovery/027_...
--- /tmp/cirrus-ci-build/src/test/regress/expected/constraints.out	2024-05-09 02:07:11.409754526 +0000
+++ /tmp/cirrus-ci-build/build/testrun/recovery/027_stream_regress/data/results/constraints.out	2024-05-09 02:09:47.5417...
@@ -952,356 +952,10 @@
 CREATE TABLE notnull_tbl1 (c0 notnull_dom1, c1 int, PRIMARY KEY (c0, c1));
 DROP DOMAIN notnull_dom1 CASCADE;
 NOTICE:  drop cascades to column c0 of table notnull_tbl1
-\d+ notnull_tbl1
-                               Table "public.notnull_tbl1"
- Column |  Type   | Collation | Nullable | Default | Storage | Stats target | Description 
---------+---------+-----------+----------+---------+---------+--------------+-------------
- c1     | integer |           |          |         | plain   |              | 
-
-DROP TABLE notnull_tbl1;
--- with a REPLICA IDENTITY column.  Here the not-nulls must be kept
-CREATE DOMAIN notnull_dom1 AS INTEGER;
-CREATE TABLE notnull_tbl1 (c0 notnull_dom1, c1 int UNIQUE, c2 int generated by default as identity, PRIMARY KEY (c0, c1...
-ALTER TABLE notnull_tbl1 DROP CONSTRAINT notnull_tbl1_c2_not_null;
-ALTER TABLE notnull_tbl1 REPLICA IDENTITY USING INDEX notnull_tbl1_c1_key;
-DROP DOMAIN notnull_dom1 CASCADE;
...

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/triggers.out /tmp/cirrus-ci-build/build/testrun/regress/regress/...
--- /tmp/cirrus-ci-build/src/test/regress/expected/triggers.out	2024-05-09 02:07:11.493754500 +0000
+++ /tmp/cirrus-ci-build/build/testrun/regress/regress/results/triggers.out	2024-05-09 02:09:20.933748888 +0000
@@ -2685,1062 +2685,10 @@
 create table parted_trigger (a int, b text) partition by range (a);
 create table parted_trigger_1 partition of parted_trigger for values from (0) to (1000);
 create table parted_trigger_2 (drp int, a int, b text);
-alter table parted_trigger_2 drop column drp;
-alter table parted_trigger attach partition parted_trigger_2 for values from (1000) to (2000);
-create trigger parted_trigger after update of b on parted_trigger
-  for each row execute procedure trigger_notice_ab();
-create table parted_trigger_3 (b text, a int) partition by range (length(b));
-create table parted_trigger_3_1 partition of parted_trigger_3 for values from (1) to (4);
-create table parted_trigger_3_2 partition of parted_trigger_3 for values from (4) to (8);
-alter table parted_trigger attach partition parted_trigger_3 for values from (2000) to (3000);
-insert into parted_trigger values (0, 'a'), (1000, 'c'), (2000, 'e'), (2001, 'eeee');
-update parted_trigger set a = a + 2;	-- no notices here
-update parted_trigger set b = b || 'b';	-- all triggers should fire
-NOTICE:  trigger parted_trigger on parted_trigger_1 AFTER UPDATE for ROW: (a,b)=(2,ab)
-NOTICE:  trigger parted_trigger on parted_trigger_2 AFTER UPDATE for ROW: (a,b)=(1002,cb)
...

diff -w -U3 C:/cirrus/src/test/regress/expected/updatable_views.out C:/cirrus/build/testrun/pg_upgrade/002_pg_upgrade/da...
--- C:/cirrus/src/test/regress/expected/updatable_views.out	2024-05-09 02:07:47.530660200 +0000
+++ C:/cirrus/build/testrun/pg_upgrade/002_pg_upgrade/data/results/updatable_views.out	2024-05-09 02:10:14.293678000 +00...
@@ -1155,2847 +1155,7 @@
   WHEN MATCHED THEN UPDATE SET b = s.b
   WHEN NOT MATCHED AND s.a > 0 THEN INSERT VALUES (s.a, s.b)
   RETURNING merge_action(), s.*, t.*;
- merge_action | a | b  | a |   b   
---------------+---+----+---+-------
- DELETE       | 1 | R1 | 1 | Row 1
- UPDATE       | 2 | R2 | 2 | R2
- INSERT       | 3 | R3 | 3 | R3
-(3 rows)
-
-SELECT * FROM base_tbl ORDER BY a;
- a  |   b    
-----+--------
- -2 | Row -2
- -1 | Row -1
-  0 | Row 0
...

diff -w -U3 C:/cirrus/src/test/regress/expected/triggers.out C:/cirrus/build/testrun/recovery/027_stream_regress/data/re...
--- C:/cirrus/src/test/regress/expected/triggers.out	2024-05-09 02:07:47.523735900 +0000
+++ C:/cirrus/build/testrun/recovery/027_stream_regress/data/results/triggers.out	2024-05-09 02:12:02.153460300 +0000
@@ -3670,77 +3670,10 @@
 drop function convslot_trig4();
 -- Test trigger renaming on partitioned tables
 create table grandparent (id int, primary key (id)) partition by range (id);
-create table middle partition of grandparent for values from (1) to (10)
-partition by range (id);
-create table chi partition of middle for values from (1) to (5);
-create table cho partition of middle for values from (6) to (10);
-create function f () returns trigger as
-$$ begin return new; end; $$
-language plpgsql;
-create trigger a after insert on grandparent
-for each row execute procedure f();
-alter trigger a on grandparent rename to b;
-select tgrelid::regclass, tgname,
-(select tgname from pg_trigger tr where tr.oid = pg_trigger.tgparentid) parent_tgname
-from pg_trigger where tgrelid in (select relid from pg_partition_tree('grandparent'))
...

diff -w -U3 C:/cirrus/src/test/regress/expected/updatable_views.out C:/cirrus/build/testrun/regress/regress/results/upda...
--- C:/cirrus/src/test/regress/expected/updatable_views.out	2024-05-09 02:07:47.530660200 +0000
+++ C:/cirrus/build/testrun/regress/regress/results/updatable_views.out	2024-05-09 02:10:13.543687900 +0000
@@ -1155,2847 +1155,7 @@
   WHEN MATCHED THEN UPDATE SET b = s.b
   WHEN NOT MATCHED AND s.a > 0 THEN INSERT VALUES (s.a, s.b)
   RETURNING merge_action(), s.*, t.*;
- merge_action | a | b  | a |   b   
---------------+---+----+---+-------
- DELETE       | 1 | R1 | 1 | Row 1
- UPDATE       | 2 | R2 | 2 | R2
- INSERT       | 3 | R3 | 3 | R3
-(3 rows)
-
-SELECT * FROM base_tbl ORDER BY a;
- a  |   b    
-----+--------
- -2 | Row -2
- -1 | Row -1
-  0 | Row 0
...

diff -U3 /Users/admin/pgsql/src/test/regress/expected/updatable_views.out /Users/admin/pgsql/build/testrun/pg_upgrade/00...
--- /Users/admin/pgsql/src/test/regress/expected/updatable_views.out	2024-05-09 02:07:20
+++ /Users/admin/pgsql/build/testrun/pg_upgrade/002_pg_upgrade/data/results/updatable_views.out	2024-05-09 02:11:38
@@ -1152,2850 +1152,10 @@
 MERGE INTO rw_view2 t
   USING (SELECT x, 'R'||x FROM generate_series(0,3) x) AS s(a,b) ON t.a = s.a
   WHEN MATCHED AND t.a <= 1 THEN DELETE
-  WHEN MATCHED THEN UPDATE SET b = s.b
-  WHEN NOT MATCHED AND s.a > 0 THEN INSERT VALUES (s.a, s.b)
-  RETURNING merge_action(), s.*, t.*;
- merge_action | a | b  | a |   b   
---------------+---+----+---+-------
- DELETE       | 1 | R1 | 1 | Row 1
- UPDATE       | 2 | R2 | 2 | R2
- INSERT       | 3 | R3 | 3 | R3
-(3 rows)
-
-SELECT * FROM base_tbl ORDER BY a;
- a  |   b    
-----+--------
...

diff -U3 /Users/admin/pgsql/src/test/regress/expected/updatable_views.out /Users/admin/pgsql/build/testrun/recovery/027_...
--- /Users/admin/pgsql/src/test/regress/expected/updatable_views.out	2024-05-09 02:07:20
+++ /Users/admin/pgsql/build/testrun/recovery/027_stream_regress/data/results/updatable_views.out	2024-05-09 02:11:46
@@ -1152,2850 +1152,10 @@
 MERGE INTO rw_view2 t
   USING (SELECT x, 'R'||x FROM generate_series(0,3) x) AS s(a,b) ON t.a = s.a
   WHEN MATCHED AND t.a <= 1 THEN DELETE
-  WHEN MATCHED THEN UPDATE SET b = s.b
-  WHEN NOT MATCHED AND s.a > 0 THEN INSERT VALUES (s.a, s.b)
-  RETURNING merge_action(), s.*, t.*;
- merge_action | a | b  | a |   b   
---------------+---+----+---+-------
- DELETE       | 1 | R1 | 1 | Row 1
- UPDATE       | 2 | R2 | 2 | R2
- INSERT       | 3 | R3 | 3 | R3
-(3 rows)
-
-SELECT * FROM base_tbl ORDER BY a;
- a  |   b    
-----+--------
...

diff -U3 /Users/admin/pgsql/src/test/regress/expected/updatable_views.out /Users/admin/pgsql/build/testrun/regress/regre...
--- /Users/admin/pgsql/src/test/regress/expected/updatable_views.out	2024-05-09 02:07:20
+++ /Users/admin/pgsql/build/testrun/regress/regress/results/updatable_views.out	2024-05-09 02:11:38
@@ -1152,2850 +1152,10 @@
 MERGE INTO rw_view2 t
   USING (SELECT x, 'R'||x FROM generate_series(0,3) x) AS s(a,b) ON t.a = s.a
   WHEN MATCHED AND t.a <= 1 THEN DELETE
-  WHEN MATCHED THEN UPDATE SET b = s.b
-  WHEN NOT MATCHED AND s.a > 0 THEN INSERT VALUES (s.a, s.b)
-  RETURNING merge_action(), s.*, t.*;
- merge_action | a | b  | a |   b   
---------------+---+----+---+-------
- DELETE       | 1 | R1 | 1 | Row 1
- UPDATE       | 2 | R2 | 2 | R2
- INSERT       | 3 | R3 | 3 | R3
-(3 rows)
-
-SELECT * FROM base_tbl ORDER BY a;
- a  |   b    
-----+--------
...

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/sysviews.out /tmp/cirrus-ci-build/build/testrun/pg_upgrade/002_p...
--- /tmp/cirrus-ci-build/src/test/regress/expected/sysviews.out	2024-05-08 12:05:03.379756000 +0000
+++ /tmp/cirrus-ci-build/build/testrun/pg_upgrade/002_pg_upgrade/data/results/sysviews.out	2024-05-08 12:07:07.613043000...
@@ -156,7 +156,8 @@
  enable_seqscan                 | on
  enable_sort                    | on
  enable_tidscan                 | on
-(22 rows)
+ enable_toast_cache             | off
+(23 rows)
 
 -- There are always wait event descriptions for various types.
 select type, count(*) > 0 as ok FROM pg_wait_events

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/sysviews.out /tmp/cirrus-ci-build/build/testrun/recovery/027_str...
--- /tmp/cirrus-ci-build/src/test/regress/expected/sysviews.out	2024-05-08 12:05:03.379756000 +0000
+++ /tmp/cirrus-ci-build/build/testrun/recovery/027_stream_regress/data/results/sysviews.out	2024-05-08 12:07:43.5917050...
@@ -156,7 +156,8 @@
  enable_seqscan                 | on
  enable_sort                    | on
  enable_tidscan                 | on
-(22 rows)
+ enable_toast_cache             | off
+(23 rows)
 
 -- There are always wait event descriptions for various types.
 select type, count(*) > 0 as ok FROM pg_wait_events

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/sysviews.out /tmp/cirrus-ci-build/build/testrun/regress/regress/...
--- /tmp/cirrus-ci-build/src/test/regress/expected/sysviews.out	2024-05-08 12:05:03.379756000 +0000
+++ /tmp/cirrus-ci-build/build/testrun/regress/regress/results/sysviews.out	2024-05-08 12:07:04.516597000 +0000
@@ -156,7 +156,8 @@
  enable_seqscan                 | on
  enable_sort                    | on
  enable_tidscan                 | on
-(22 rows)
+ enable_toast_cache             | off
+(23 rows)
 
 -- There are always wait event descriptions for various types.
 select type, count(*) > 0 as ok FROM pg_wait_events

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/sysviews.out /tmp/cirrus-ci-build/src/bin/pg_upgrade/tmp_check/r...
--- /tmp/cirrus-ci-build/src/test/regress/expected/sysviews.out	2024-05-08 12:04:22.841308178 +0000
+++ /tmp/cirrus-ci-build/src/bin/pg_upgrade/tmp_check/results/sysviews.out	2024-05-08 12:09:49.969324209 +0000
@@ -156,7 +156,8 @@
  enable_seqscan                 | on
  enable_sort                    | on
  enable_tidscan                 | on
-(22 rows)
+ enable_toast_cache             | off
+(23 rows)
 
 -- There are always wait event descriptions for various types.
 select type, count(*) > 0 as ok FROM pg_wait_events

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/sysviews.out /tmp/cirrus-ci-build/src/test/regress/results/sysvi...
--- /tmp/cirrus-ci-build/src/test/regress/expected/sysviews.out	2024-05-08 12:04:22.841308178 +0000
+++ /tmp/cirrus-ci-build/src/test/regress/results/sysviews.out	2024-05-08 12:08:17.853312162 +0000
@@ -156,7 +156,8 @@
  enable_seqscan                 | on
  enable_sort                    | on
  enable_tidscan                 | on
-(22 rows)
+ enable_toast_cache             | off
+(23 rows)
 
 -- There are always wait event descriptions for various types.
 select type, count(*) > 0 as ok FROM pg_wait_events

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/sysviews.out /tmp/cirrus-ci-build/build/testrun/pg_upgrade/002_p...
--- /tmp/cirrus-ci-build/src/test/regress/expected/sysviews.out	2024-05-08 12:04:23.963964540 +0000
+++ /tmp/cirrus-ci-build/build/testrun/pg_upgrade/002_pg_upgrade/data/results/sysviews.out	2024-05-08 12:09:52.911778840...
@@ -156,7 +156,8 @@
  enable_seqscan                 | on
  enable_sort                    | on
  enable_tidscan                 | on
-(22 rows)
+ enable_toast_cache             | off
+(23 rows)
 
 -- There are always wait event descriptions for various types.
 select type, count(*) > 0 as ok FROM pg_wait_events

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/sysviews.out /tmp/cirrus-ci-build/build/testrun/recovery/027_str...
--- /tmp/cirrus-ci-build/src/test/regress/expected/sysviews.out	2024-05-08 12:04:23.963964540 +0000
+++ /tmp/cirrus-ci-build/build/testrun/recovery/027_stream_regress/data/results/sysviews.out	2024-05-08 12:10:46.4637060...
@@ -156,7 +156,8 @@
  enable_seqscan                 | on
  enable_sort                    | on
  enable_tidscan                 | on
-(22 rows)
+ enable_toast_cache             | off
+(23 rows)
 
 -- There are always wait event descriptions for various types.
 select type, count(*) > 0 as ok FROM pg_wait_events

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/sysviews.out /tmp/cirrus-ci-build/build/testrun/regress/regress/...
--- /tmp/cirrus-ci-build/src/test/regress/expected/sysviews.out	2024-05-08 12:04:23.963964540 +0000
+++ /tmp/cirrus-ci-build/build/testrun/regress/regress/results/sysviews.out	2024-05-08 12:09:48.791782398 +0000
@@ -156,7 +156,8 @@
  enable_seqscan                 | on
  enable_sort                    | on
  enable_tidscan                 | on
-(22 rows)
+ enable_toast_cache             | off
+(23 rows)
 
 -- There are always wait event descriptions for various types.
 select type, count(*) > 0 as ok FROM pg_wait_events

diff -w -U3 C:/cirrus/src/test/regress/expected/sysviews.out C:/cirrus/build/testrun/pg_upgrade/002_pg_upgrade/data/resu...
--- C:/cirrus/src/test/regress/expected/sysviews.out	2024-05-08 12:04:34.949269000 +0000
+++ C:/cirrus/build/testrun/pg_upgrade/002_pg_upgrade/data/results/sysviews.out	2024-05-08 12:07:35.289359900 +0000
@@ -156,7 +156,8 @@
  enable_seqscan                 | on
  enable_sort                    | on
  enable_tidscan                 | on
-(22 rows)
+ enable_toast_cache             | off
+(23 rows)
 
 -- There are always wait event descriptions for various types.
 select type, count(*) > 0 as ok FROM pg_wait_events

diff -w -U3 C:/cirrus/src/test/regress/expected/sysviews.out C:/cirrus/build/testrun/recovery/027_stream_regress/data/re...
--- C:/cirrus/src/test/regress/expected/sysviews.out	2024-05-08 12:04:34.949269000 +0000
+++ C:/cirrus/build/testrun/recovery/027_stream_regress/data/results/sysviews.out	2024-05-08 12:10:00.180409900 +0000
@@ -156,7 +156,8 @@
  enable_seqscan                 | on
  enable_sort                    | on
  enable_tidscan                 | on
-(22 rows)
+ enable_toast_cache             | off
+(23 rows)
 
 -- There are always wait event descriptions for various types.
 select type, count(*) > 0 as ok FROM pg_wait_events

diff -w -U3 C:/cirrus/src/test/regress/expected/sysviews.out C:/cirrus/build/testrun/regress/regress/results/sysviews.ou...
--- C:/cirrus/src/test/regress/expected/sysviews.out	2024-05-08 12:04:34.949269000 +0000
+++ C:/cirrus/build/testrun/regress/regress/results/sysviews.out	2024-05-08 12:07:32.349422600 +0000
@@ -156,7 +156,8 @@
  enable_seqscan                 | on
  enable_sort                    | on
  enable_tidscan                 | on
-(22 rows)
+ enable_toast_cache             | off
+(23 rows)
 
 -- There are always wait event descriptions for various types.
 select type, count(*) > 0 as ok FROM pg_wait_events

diff -U3 /Users/admin/pgsql/src/test/regress/expected/sysviews.out /Users/admin/pgsql/build/testrun/pg_upgrade/002_pg_up...
--- /Users/admin/pgsql/src/test/regress/expected/sysviews.out	2024-05-08 12:04:15
+++ /Users/admin/pgsql/build/testrun/pg_upgrade/002_pg_upgrade/data/results/sysviews.out	2024-05-08 12:06:00
@@ -156,7 +156,8 @@
  enable_seqscan                 | on
  enable_sort                    | on
  enable_tidscan                 | on
-(22 rows)
+ enable_toast_cache             | off
+(23 rows)
 
 -- There are always wait event descriptions for various types.
 select type, count(*) > 0 as ok FROM pg_wait_events

diff -U3 /Users/admin/pgsql/src/test/regress/expected/sysviews.out /Users/admin/pgsql/build/testrun/recovery/027_stream_...
--- /Users/admin/pgsql/src/test/regress/expected/sysviews.out	2024-05-08 12:04:15
+++ /Users/admin/pgsql/build/testrun/recovery/027_stream_regress/data/results/sysviews.out	2024-05-08 12:07:28
@@ -156,7 +156,8 @@
  enable_seqscan                 | on
  enable_sort                    | on
  enable_tidscan                 | on
-(22 rows)
+ enable_toast_cache             | off
+(23 rows)
 
 -- There are always wait event descriptions for various types.
 select type, count(*) > 0 as ok FROM pg_wait_events

diff -U3 /Users/admin/pgsql/src/test/regress/expected/sysviews.out /Users/admin/pgsql/build/testrun/regress/regress/resu...
--- /Users/admin/pgsql/src/test/regress/expected/sysviews.out	2024-05-08 12:04:15
+++ /Users/admin/pgsql/build/testrun/regress/regress/results/sysviews.out	2024-05-08 12:06:00
@@ -156,7 +156,8 @@
  enable_seqscan                 | on
  enable_sort                    | on
  enable_tidscan                 | on
-(22 rows)
+ enable_toast_cache             | off
+(23 rows)
 
 -- There are always wait event descriptions for various types.
 select type, count(*) > 0 as ok FROM pg_wait_events

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/create_index.out /tmp/cirrus-ci-build/build/testrun/pg_upgrade/0...
--- /tmp/cirrus-ci-build/src/test/regress/expected/create_index.out	2024-05-08 06:59:49.242327000 +0000
+++ /tmp/cirrus-ci-build/build/testrun/pg_upgrade/002_pg_upgrade/data/results/create_index.out	2024-05-08 07:00:55.63623...
@@ -2135,11 +2135,19 @@
 --
 explain (costs off)
 SELECT unique1 FROM tenk1 WHERE unique1 IN (1, 42, 7) and unique1 = ANY('{7, 8, 9}');
-                                             QUERY PLAN                                             
-----------------------------------------------------------------------------------------------------
- Index Only Scan using tenk1_unique1 on tenk1
-   Index Cond: ((unique1 = ANY ('{1,42,7}'::integer[])) AND (unique1 = ANY ('{7,8,9}'::integer[])))
-(2 rows)
+                            QUERY PLAN                             
+-------------------------------------------------------------------
+ Bitmap Heap Scan on tenk1
+   Recheck Cond: ((unique1 = 7) OR (unique1 = 8) OR (unique1 = 9))
+   Filter: (unique1 = ANY ('{1,42,7}'::integer[]))
+   ->  BitmapOr
+         ->  Bitmap Index Scan on tenk1_unique1
+               Index Cond: (unique1 = 7)
...

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/create_index.out /tmp/cirrus-ci-build/build/testrun/recovery/027...
--- /tmp/cirrus-ci-build/src/test/regress/expected/create_index.out	2024-05-08 06:59:49.242327000 +0000
+++ /tmp/cirrus-ci-build/build/testrun/recovery/027_stream_regress/data/results/create_index.out	2024-05-08 07:01:26.045...
@@ -2135,11 +2135,19 @@
 --
 explain (costs off)
 SELECT unique1 FROM tenk1 WHERE unique1 IN (1, 42, 7) and unique1 = ANY('{7, 8, 9}');
-                                             QUERY PLAN                                             
-----------------------------------------------------------------------------------------------------
- Index Only Scan using tenk1_unique1 on tenk1
-   Index Cond: ((unique1 = ANY ('{1,42,7}'::integer[])) AND (unique1 = ANY ('{7,8,9}'::integer[])))
-(2 rows)
+                            QUERY PLAN                             
+-------------------------------------------------------------------
+ Bitmap Heap Scan on tenk1
+   Recheck Cond: ((unique1 = 7) OR (unique1 = 8) OR (unique1 = 9))
+   Filter: (unique1 = ANY ('{1,42,7}'::integer[]))
+   ->  BitmapOr
+         ->  Bitmap Index Scan on tenk1_unique1
+               Index Cond: (unique1 = 7)
...

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/create_index.out /tmp/cirrus-ci-build/build/testrun/regress/regr...
--- /tmp/cirrus-ci-build/src/test/regress/expected/create_index.out	2024-05-08 06:59:49.242327000 +0000
+++ /tmp/cirrus-ci-build/build/testrun/regress/regress/results/create_index.out	2024-05-08 07:00:52.334883000 +0000
@@ -2135,11 +2135,19 @@
 --
 explain (costs off)
 SELECT unique1 FROM tenk1 WHERE unique1 IN (1, 42, 7) and unique1 = ANY('{7, 8, 9}');
-                                             QUERY PLAN                                             
-----------------------------------------------------------------------------------------------------
- Index Only Scan using tenk1_unique1 on tenk1
-   Index Cond: ((unique1 = ANY ('{1,42,7}'::integer[])) AND (unique1 = ANY ('{7,8,9}'::integer[])))
-(2 rows)
+                            QUERY PLAN                             
+-------------------------------------------------------------------
+ Bitmap Heap Scan on tenk1
+   Recheck Cond: ((unique1 = 7) OR (unique1 = 8) OR (unique1 = 9))
+   Filter: (unique1 = ANY ('{1,42,7}'::integer[]))
+   ->  BitmapOr
+         ->  Bitmap Index Scan on tenk1_unique1
+               Index Cond: (unique1 = 7)
...

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/create_index.out /tmp/cirrus-ci-build/src/bin/pg_upgrade/tmp_che...
--- /tmp/cirrus-ci-build/src/test/regress/expected/create_index.out	2024-05-08 06:59:14.967701286 +0000
+++ /tmp/cirrus-ci-build/src/bin/pg_upgrade/tmp_check/results/create_index.out	2024-05-08 07:02:56.919775047 +0000
@@ -2135,11 +2135,19 @@
 --
 explain (costs off)
 SELECT unique1 FROM tenk1 WHERE unique1 IN (1, 42, 7) and unique1 = ANY('{7, 8, 9}');
-                                             QUERY PLAN                                             
-----------------------------------------------------------------------------------------------------
- Index Only Scan using tenk1_unique1 on tenk1
-   Index Cond: ((unique1 = ANY ('{1,42,7}'::integer[])) AND (unique1 = ANY ('{7,8,9}'::integer[])))
-(2 rows)
+                            QUERY PLAN                             
+-------------------------------------------------------------------
+ Bitmap Heap Scan on tenk1
+   Recheck Cond: ((unique1 = 7) OR (unique1 = 8) OR (unique1 = 9))
+   Filter: (unique1 = ANY ('{1,42,7}'::integer[]))
+   ->  BitmapOr
+         ->  Bitmap Index Scan on tenk1_unique1
+               Index Cond: (unique1 = 7)
...

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/create_index.out /tmp/cirrus-ci-build/src/test/recovery/tmp_chec...
--- /tmp/cirrus-ci-build/src/test/regress/expected/create_index.out	2024-05-08 06:59:14.967701286 +0000
+++ /tmp/cirrus-ci-build/src/test/recovery/tmp_check/results/create_index.out	2024-05-08 07:05:12.151747813 +0000
@@ -2135,11 +2135,19 @@
 --
 explain (costs off)
 SELECT unique1 FROM tenk1 WHERE unique1 IN (1, 42, 7) and unique1 = ANY('{7, 8, 9}');
-                                             QUERY PLAN                                             
-----------------------------------------------------------------------------------------------------
- Index Only Scan using tenk1_unique1 on tenk1
-   Index Cond: ((unique1 = ANY ('{1,42,7}'::integer[])) AND (unique1 = ANY ('{7,8,9}'::integer[])))
-(2 rows)
+                            QUERY PLAN                             
+-------------------------------------------------------------------
+ Bitmap Heap Scan on tenk1
+   Recheck Cond: ((unique1 = 7) OR (unique1 = 8) OR (unique1 = 9))
+   Filter: (unique1 = ANY ('{1,42,7}'::integer[]))
+   ->  BitmapOr
+         ->  Bitmap Index Scan on tenk1_unique1
+               Index Cond: (unique1 = 7)
...

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/create_index.out /tmp/cirrus-ci-build/src/test/regress/results/c...
--- /tmp/cirrus-ci-build/src/test/regress/expected/create_index.out	2024-05-08 06:59:14.967701286 +0000
+++ /tmp/cirrus-ci-build/src/test/regress/results/create_index.out	2024-05-08 07:01:15.671725331 +0000
@@ -2135,11 +2135,19 @@
 --
 explain (costs off)
 SELECT unique1 FROM tenk1 WHERE unique1 IN (1, 42, 7) and unique1 = ANY('{7, 8, 9}');
-                                             QUERY PLAN                                             
-----------------------------------------------------------------------------------------------------
- Index Only Scan using tenk1_unique1 on tenk1
-   Index Cond: ((unique1 = ANY ('{1,42,7}'::integer[])) AND (unique1 = ANY ('{7,8,9}'::integer[])))
-(2 rows)
+                            QUERY PLAN                             
+-------------------------------------------------------------------
+ Bitmap Heap Scan on tenk1
+   Recheck Cond: ((unique1 = 7) OR (unique1 = 8) OR (unique1 = 9))
+   Filter: (unique1 = ANY ('{1,42,7}'::integer[]))
+   ->  BitmapOr
+         ->  Bitmap Index Scan on tenk1_unique1
+               Index Cond: (unique1 = 7)
...

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/create_index.out /tmp/cirrus-ci-build/build/testrun/pg_upgrade/0...
--- /tmp/cirrus-ci-build/src/test/regress/expected/create_index.out	2024-05-08 06:59:17.089771961 +0000
+++ /tmp/cirrus-ci-build/build/testrun/pg_upgrade/002_pg_upgrade/data/results/create_index.out	2024-05-08 07:01:42.95380...
@@ -2135,11 +2135,19 @@
 --
 explain (costs off)
 SELECT unique1 FROM tenk1 WHERE unique1 IN (1, 42, 7) and unique1 = ANY('{7, 8, 9}');
-                                             QUERY PLAN                                             
-----------------------------------------------------------------------------------------------------
- Index Only Scan using tenk1_unique1 on tenk1
-   Index Cond: ((unique1 = ANY ('{1,42,7}'::integer[])) AND (unique1 = ANY ('{7,8,9}'::integer[])))
-(2 rows)
+                            QUERY PLAN                             
+-------------------------------------------------------------------
+ Bitmap Heap Scan on tenk1
+   Recheck Cond: ((unique1 = 7) OR (unique1 = 8) OR (unique1 = 9))
+   Filter: (unique1 = ANY ('{1,42,7}'::integer[]))
+   ->  BitmapOr
+         ->  Bitmap Index Scan on tenk1_unique1
+               Index Cond: (unique1 = 7)
...

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/create_index.out /tmp/cirrus-ci-build/build/testrun/recovery/027...
--- /tmp/cirrus-ci-build/src/test/regress/expected/create_index.out	2024-05-08 06:59:17.089771961 +0000
+++ /tmp/cirrus-ci-build/build/testrun/recovery/027_stream_regress/data/results/create_index.out	2024-05-08 07:02:17.321...
@@ -2135,11 +2135,19 @@
 --
 explain (costs off)
 SELECT unique1 FROM tenk1 WHERE unique1 IN (1, 42, 7) and unique1 = ANY('{7, 8, 9}');
-                                             QUERY PLAN                                             
-----------------------------------------------------------------------------------------------------
- Index Only Scan using tenk1_unique1 on tenk1
-   Index Cond: ((unique1 = ANY ('{1,42,7}'::integer[])) AND (unique1 = ANY ('{7,8,9}'::integer[])))
-(2 rows)
+                            QUERY PLAN                             
+-------------------------------------------------------------------
+ Bitmap Heap Scan on tenk1
+   Recheck Cond: ((unique1 = 7) OR (unique1 = 8) OR (unique1 = 9))
+   Filter: (unique1 = ANY ('{1,42,7}'::integer[]))
+   ->  BitmapOr
+         ->  Bitmap Index Scan on tenk1_unique1
+               Index Cond: (unique1 = 7)
...

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/create_index.out /tmp/cirrus-ci-build/build/testrun/regress/regr...
--- /tmp/cirrus-ci-build/src/test/regress/expected/create_index.out	2024-05-08 06:59:17.089771961 +0000
+++ /tmp/cirrus-ci-build/build/testrun/regress/regress/results/create_index.out	2024-05-08 07:01:39.429802500 +0000
@@ -2135,11 +2135,19 @@
 --
 explain (costs off)
 SELECT unique1 FROM tenk1 WHERE unique1 IN (1, 42, 7) and unique1 = ANY('{7, 8, 9}');
-                                             QUERY PLAN                                             
-----------------------------------------------------------------------------------------------------
- Index Only Scan using tenk1_unique1 on tenk1
-   Index Cond: ((unique1 = ANY ('{1,42,7}'::integer[])) AND (unique1 = ANY ('{7,8,9}'::integer[])))
-(2 rows)
+                            QUERY PLAN                             
+-------------------------------------------------------------------
+ Bitmap Heap Scan on tenk1
+   Recheck Cond: ((unique1 = 7) OR (unique1 = 8) OR (unique1 = 9))
+   Filter: (unique1 = ANY ('{1,42,7}'::integer[]))
+   ->  BitmapOr
+         ->  Bitmap Index Scan on tenk1_unique1
+               Index Cond: (unique1 = 7)
...

diff -w -U3 C:/cirrus/src/test/regress/expected/create_index.out C:/cirrus/build/testrun/pg_upgrade/002_pg_upgrade/data/...
--- C:/cirrus/src/test/regress/expected/create_index.out	2024-05-08 06:59:35.650681100 +0000
+++ C:/cirrus/build/testrun/pg_upgrade/002_pg_upgrade/data/results/create_index.out	2024-05-08 07:01:49.420483700 +0000
@@ -2136,10 +2136,18 @@
 explain (costs off)
 SELECT unique1 FROM tenk1 WHERE unique1 IN (1, 42, 7) and unique1 = ANY('{7, 8, 9}');
                                              QUERY PLAN                                             
-----------------------------------------------------------------------------------------------------
- Index Only Scan using tenk1_unique1 on tenk1
-   Index Cond: ((unique1 = ANY ('{1,42,7}'::integer[])) AND (unique1 = ANY ('{7,8,9}'::integer[])))
-(2 rows)
+-------------------------------------------------------------------
+ Bitmap Heap Scan on tenk1
+   Recheck Cond: ((unique1 = 7) OR (unique1 = 8) OR (unique1 = 9))
+   Filter: (unique1 = ANY ('{1,42,7}'::integer[]))
+   ->  BitmapOr
+         ->  Bitmap Index Scan on tenk1_unique1
+               Index Cond: (unique1 = 7)
+         ->  Bitmap Index Scan on tenk1_unique1
+               Index Cond: (unique1 = 8)
...

diff -w -U3 C:/cirrus/src/test/regress/expected/create_index.out C:/cirrus/build/testrun/recovery/027_stream_regress/dat...
--- C:/cirrus/src/test/regress/expected/create_index.out	2024-05-08 06:59:35.650681100 +0000
+++ C:/cirrus/build/testrun/recovery/027_stream_regress/data/results/create_index.out	2024-05-08 07:04:02.450821500 +000...
@@ -2136,10 +2136,18 @@
 explain (costs off)
 SELECT unique1 FROM tenk1 WHERE unique1 IN (1, 42, 7) and unique1 = ANY('{7, 8, 9}');
                                              QUERY PLAN                                             
-----------------------------------------------------------------------------------------------------
- Index Only Scan using tenk1_unique1 on tenk1
-   Index Cond: ((unique1 = ANY ('{1,42,7}'::integer[])) AND (unique1 = ANY ('{7,8,9}'::integer[])))
-(2 rows)
+-------------------------------------------------------------------
+ Bitmap Heap Scan on tenk1
+   Recheck Cond: ((unique1 = 7) OR (unique1 = 8) OR (unique1 = 9))
+   Filter: (unique1 = ANY ('{1,42,7}'::integer[]))
+   ->  BitmapOr
+         ->  Bitmap Index Scan on tenk1_unique1
+               Index Cond: (unique1 = 7)
+         ->  Bitmap Index Scan on tenk1_unique1
+               Index Cond: (unique1 = 8)
...

diff -w -U3 C:/cirrus/src/test/regress/expected/create_index.out C:/cirrus/build/testrun/regress/regress/results/create_...
--- C:/cirrus/src/test/regress/expected/create_index.out	2024-05-08 06:59:35.650681100 +0000
+++ C:/cirrus/build/testrun/regress/regress/results/create_index.out	2024-05-08 07:01:41.344537200 +0000
@@ -2136,10 +2136,18 @@
 explain (costs off)
 SELECT unique1 FROM tenk1 WHERE unique1 IN (1, 42, 7) and unique1 = ANY('{7, 8, 9}');
                                              QUERY PLAN                                             
-----------------------------------------------------------------------------------------------------
- Index Only Scan using tenk1_unique1 on tenk1
-   Index Cond: ((unique1 = ANY ('{1,42,7}'::integer[])) AND (unique1 = ANY ('{7,8,9}'::integer[])))
-(2 rows)
+-------------------------------------------------------------------
+ Bitmap Heap Scan on tenk1
+   Recheck Cond: ((unique1 = 7) OR (unique1 = 8) OR (unique1 = 9))
+   Filter: (unique1 = ANY ('{1,42,7}'::integer[]))
+   ->  BitmapOr
+         ->  Bitmap Index Scan on tenk1_unique1
+               Index Cond: (unique1 = 7)
+         ->  Bitmap Index Scan on tenk1_unique1
+               Index Cond: (unique1 = 8)
...

diff -U3 /Users/admin/pgsql/src/test/regress/expected/create_index.out /Users/admin/pgsql/build/testrun/pg_upgrade/002_p...
--- /Users/admin/pgsql/src/test/regress/expected/create_index.out	2024-05-08 06:59:21
+++ /Users/admin/pgsql/build/testrun/pg_upgrade/002_pg_upgrade/data/results/create_index.out	2024-05-08 07:00:29
@@ -2135,11 +2135,19 @@
 --
 explain (costs off)
 SELECT unique1 FROM tenk1 WHERE unique1 IN (1, 42, 7) and unique1 = ANY('{7, 8, 9}');
-                                             QUERY PLAN                                             
-----------------------------------------------------------------------------------------------------
- Index Only Scan using tenk1_unique1 on tenk1
-   Index Cond: ((unique1 = ANY ('{1,42,7}'::integer[])) AND (unique1 = ANY ('{7,8,9}'::integer[])))
-(2 rows)
+                            QUERY PLAN                             
+-------------------------------------------------------------------
+ Bitmap Heap Scan on tenk1
+   Recheck Cond: ((unique1 = 7) OR (unique1 = 8) OR (unique1 = 9))
+   Filter: (unique1 = ANY ('{1,42,7}'::integer[]))
+   ->  BitmapOr
+         ->  Bitmap Index Scan on tenk1_unique1
+               Index Cond: (unique1 = 7)
...

diff -U3 /Users/admin/pgsql/src/test/regress/expected/create_index.out /Users/admin/pgsql/build/testrun/recovery/027_str...
--- /Users/admin/pgsql/src/test/regress/expected/create_index.out	2024-05-08 06:59:21
+++ /Users/admin/pgsql/build/testrun/recovery/027_stream_regress/data/results/create_index.out	2024-05-08 07:01:29
@@ -2135,11 +2135,19 @@
 --
 explain (costs off)
 SELECT unique1 FROM tenk1 WHERE unique1 IN (1, 42, 7) and unique1 = ANY('{7, 8, 9}');
-                                             QUERY PLAN                                             
-----------------------------------------------------------------------------------------------------
- Index Only Scan using tenk1_unique1 on tenk1
-   Index Cond: ((unique1 = ANY ('{1,42,7}'::integer[])) AND (unique1 = ANY ('{7,8,9}'::integer[])))
-(2 rows)
+                            QUERY PLAN                             
+-------------------------------------------------------------------
+ Bitmap Heap Scan on tenk1
+   Recheck Cond: ((unique1 = 7) OR (unique1 = 8) OR (unique1 = 9))
+   Filter: (unique1 = ANY ('{1,42,7}'::integer[]))
+   ->  BitmapOr
+         ->  Bitmap Index Scan on tenk1_unique1
+               Index Cond: (unique1 = 7)
...

diff -U3 /Users/admin/pgsql/src/test/regress/expected/create_index.out /Users/admin/pgsql/build/testrun/regress/regress/...
--- /Users/admin/pgsql/src/test/regress/expected/create_index.out	2024-05-08 06:59:21
+++ /Users/admin/pgsql/build/testrun/regress/regress/results/create_index.out	2024-05-08 07:00:25
@@ -2135,11 +2135,19 @@
 --
 explain (costs off)
 SELECT unique1 FROM tenk1 WHERE unique1 IN (1, 42, 7) and unique1 = ANY('{7, 8, 9}');
-                                             QUERY PLAN                                             
-----------------------------------------------------------------------------------------------------
- Index Only Scan using tenk1_unique1 on tenk1
-   Index Cond: ((unique1 = ANY ('{1,42,7}'::integer[])) AND (unique1 = ANY ('{7,8,9}'::integer[])))
-(2 rows)
+                            QUERY PLAN                             
+-------------------------------------------------------------------
+ Bitmap Heap Scan on tenk1
+   Recheck Cond: ((unique1 = 7) OR (unique1 = 8) OR (unique1 = 9))
+   Filter: (unique1 = ANY ('{1,42,7}'::integer[]))
+   ->  BitmapOr
+         ->  Bitmap Index Scan on tenk1_unique1
+               Index Cond: (unique1 = 7)
...

diff -U3 /tmp/cirrus-ci-build/contrib/pg_freespacemap/expected/pg_freespacemap.out /tmp/cirrus-ci-build/build/testrun/pg...
--- /tmp/cirrus-ci-build/contrib/pg_freespacemap/expected/pg_freespacemap.out	2024-05-08 06:53:30.822244000 +0000
+++ /tmp/cirrus-ci-build/build/testrun/pg_freespacemap/regress/results/pg_freespacemap.out	2024-05-08 06:55:27.101359000...
@@ -1,4 +1,5 @@
 CREATE EXTENSION pg_freespacemap;
+ERROR:  extension "pg_freespacemap" has no installation script nor update path for version "1.3"
 CREATE TABLE freespace_tab (c1 int) WITH (autovacuum_enabled = off);
 CREATE INDEX freespace_brin ON freespace_tab USING brin (c1);
 CREATE INDEX freespace_btree ON freespace_tab USING btree (c1);
@@ -8,78 +9,39 @@
   SELECT rel.id, fsm.blkno, (fsm.avail > 0) AS is_avail
     FROM rel, LATERAL pg_freespace(rel.id) AS fsm
     ORDER BY 1, 2;
-       id        | blkno | is_avail 
------------------+-------+----------
- freespace_brin  |     0 | f
- freespace_brin  |     1 | f
- freespace_brin  |     2 | t
- freespace_btree |     0 | f
- freespace_hash  |     0 | f
...

diff -U3 /tmp/cirrus-ci-build/contrib/pg_freespacemap/expected/pg_freespacemap.out /tmp/cirrus-ci-build/build/testrun/pg...
--- /tmp/cirrus-ci-build/contrib/pg_freespacemap/expected/pg_freespacemap.out	2024-05-08 06:53:02.442982009 +0000
+++ /tmp/cirrus-ci-build/build/testrun/pg_freespacemap/regress/results/pg_freespacemap.out	2024-05-08 06:57:13.098988442...
@@ -1,4 +1,5 @@
 CREATE EXTENSION pg_freespacemap;
+ERROR:  extension "pg_freespacemap" has no installation script nor update path for version "1.3"
 CREATE TABLE freespace_tab (c1 int) WITH (autovacuum_enabled = off);
 CREATE INDEX freespace_brin ON freespace_tab USING brin (c1);
 CREATE INDEX freespace_btree ON freespace_tab USING btree (c1);
@@ -8,78 +9,39 @@
   SELECT rel.id, fsm.blkno, (fsm.avail > 0) AS is_avail
     FROM rel, LATERAL pg_freespace(rel.id) AS fsm
     ORDER BY 1, 2;
-       id        | blkno | is_avail 
------------------+-------+----------
- freespace_brin  |     0 | f
- freespace_brin  |     1 | f
- freespace_brin  |     2 | t
- freespace_btree |     0 | f
- freespace_hash  |     0 | f
...

diff -w -U3 C:/cirrus/contrib/pg_freespacemap/expected/pg_freespacemap.out C:/cirrus/build/testrun/pg_freespacemap/regre...
--- C:/cirrus/contrib/pg_freespacemap/expected/pg_freespacemap.out	2024-05-08 06:53:25.212555200 +0000
+++ C:/cirrus/build/testrun/pg_freespacemap/regress/results/pg_freespacemap.out	2024-05-08 07:00:38.014753700 +0000
@@ -1,4 +1,5 @@
 CREATE EXTENSION pg_freespacemap;
+ERROR:  extension "pg_freespacemap" has no installation script nor update path for version "1.3"
 CREATE TABLE freespace_tab (c1 int) WITH (autovacuum_enabled = off);
 CREATE INDEX freespace_brin ON freespace_tab USING brin (c1);
 CREATE INDEX freespace_btree ON freespace_tab USING btree (c1);
@@ -8,78 +9,39 @@
   SELECT rel.id, fsm.blkno, (fsm.avail > 0) AS is_avail
     FROM rel, LATERAL pg_freespace(rel.id) AS fsm
     ORDER BY 1, 2;
-       id        | blkno | is_avail 
------------------+-------+----------
- freespace_brin  |     0 | f
- freespace_brin  |     1 | f
- freespace_brin  |     2 | t
- freespace_btree |     0 | f
- freespace_hash  |     0 | f
...

diff -U3 /Users/admin/pgsql/contrib/pg_freespacemap/expected/pg_freespacemap.out /Users/admin/pgsql/build/testrun/pg_fre...
--- /Users/admin/pgsql/contrib/pg_freespacemap/expected/pg_freespacemap.out	2024-05-08 06:52:54
+++ /Users/admin/pgsql/build/testrun/pg_freespacemap/regress/results/pg_freespacemap.out	2024-05-08 06:55:56
@@ -1,4 +1,5 @@
 CREATE EXTENSION pg_freespacemap;
+ERROR:  extension "pg_freespacemap" has no installation script nor update path for version "1.3"
 CREATE TABLE freespace_tab (c1 int) WITH (autovacuum_enabled = off);
 CREATE INDEX freespace_brin ON freespace_tab USING brin (c1);
 CREATE INDEX freespace_btree ON freespace_tab USING btree (c1);
@@ -8,78 +9,39 @@
   SELECT rel.id, fsm.blkno, (fsm.avail > 0) AS is_avail
     FROM rel, LATERAL pg_freespace(rel.id) AS fsm
     ORDER BY 1, 2;
-       id        | blkno | is_avail 
------------------+-------+----------
- freespace_brin  |     0 | f
- freespace_brin  |     1 | f
- freespace_brin  |     2 | t
- freespace_btree |     0 | f
- freespace_hash  |     0 | f
...

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/triggers.out /tmp/cirrus-ci-build/build/testrun/pg_upgrade/002_p...
--- /tmp/cirrus-ci-build/src/test/regress/expected/triggers.out	2024-05-08 04:15:33.243689000 +0000
+++ /tmp/cirrus-ci-build/build/testrun/pg_upgrade/002_pg_upgrade/data/results/triggers.out	2024-05-08 04:16:39.144549000...
@@ -3720,7 +3720,9 @@
 -- test who runs deferred trigger functions
 -- setup
 create role groot;
+WARNING:  roles created by regression test cases should have names starting with "regress_"
 create role outis;
+WARNING:  roles created by regression test cases should have names starting with "regress_"
 create function whoami() returns trigger language plpgsql
 as $$
 begin

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/triggers.out /tmp/cirrus-ci-build/build/testrun/recovery/027_str...
--- /tmp/cirrus-ci-build/src/test/regress/expected/triggers.out	2024-05-08 04:15:33.243689000 +0000
+++ /tmp/cirrus-ci-build/build/testrun/recovery/027_stream_regress/data/results/triggers.out	2024-05-08 04:17:08.7169920...
@@ -3720,7 +3720,9 @@
 -- test who runs deferred trigger functions
 -- setup
 create role groot;
+WARNING:  roles created by regression test cases should have names starting with "regress_"
 create role outis;
+WARNING:  roles created by regression test cases should have names starting with "regress_"
 create function whoami() returns trigger language plpgsql
 as $$
 begin

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/triggers.out /tmp/cirrus-ci-build/build/testrun/regress/regress/...
--- /tmp/cirrus-ci-build/src/test/regress/expected/triggers.out	2024-05-08 04:15:33.243689000 +0000
+++ /tmp/cirrus-ci-build/build/testrun/regress/regress/results/triggers.out	2024-05-08 04:16:34.659200000 +0000
@@ -3720,7 +3720,9 @@
 -- test who runs deferred trigger functions
 -- setup
 create role groot;
+WARNING:  roles created by regression test cases should have names starting with "regress_"
 create role outis;
+WARNING:  roles created by regression test cases should have names starting with "regress_"
 create function whoami() returns trigger language plpgsql
 as $$
 begin

diff -U3 /tmp/cirrus-ci-build/contrib/btree_gist/expected/without_overlaps.out /tmp/cirrus-ci-build/build/testrun/btree_...
--- /tmp/cirrus-ci-build/contrib/btree_gist/expected/without_overlaps.out	2024-05-08 04:04:49.063757000 +0000
+++ /tmp/cirrus-ci-build/build/testrun/btree_gist/regress/results/without_overlaps.out	2024-05-08 04:06:45.421207000 +00...
@@ -16,6 +16,8 @@
  valid_at | daterange |           | not null | 
 Indexes:
     "temporal_rng_pk" PRIMARY KEY (id, valid_at WITHOUT OVERLAPS)
+Check constraints:
+    "valid_at_not_empty" CHECK (NOT isempty(valid_at))
 
 SELECT pg_get_constraintdef(oid) FROM pg_constraint WHERE conname = 'temporal_rng_pk';
             pg_get_constraintdef             
@@ -60,6 +62,8 @@
  parent_id | integer   |           |          | 
 Indexes:
     "temporal_fk_rng2rng_pk" PRIMARY KEY (id, valid_at WITHOUT OVERLAPS)
+Check constraints:
+    "valid_at_not_empty" CHECK (NOT isempty(valid_at))
 Foreign-key constraints:
     "temporal_fk_rng2rng_fk" FOREIGN KEY (parent_id, PERIOD valid_at) REFERENCES temporal_rng(id, PERIOD valid_at)
...

diff -U3 /tmp/cirrus-ci-build/contrib/btree_gist/expected/without_overlaps.out /tmp/cirrus-ci-build/contrib/btree_gist/r...
--- /tmp/cirrus-ci-build/contrib/btree_gist/expected/without_overlaps.out	2024-05-08 04:04:14.867503378 +0000
+++ /tmp/cirrus-ci-build/contrib/btree_gist/results/without_overlaps.out	2024-05-08 04:07:49.347401889 +0000
@@ -16,6 +16,8 @@
  valid_at | daterange |           | not null | 
 Indexes:
     "temporal_rng_pk" PRIMARY KEY (id, valid_at WITHOUT OVERLAPS)
+Check constraints:
+    "valid_at_not_empty" CHECK (NOT isempty(valid_at))
 
 SELECT pg_get_constraintdef(oid) FROM pg_constraint WHERE conname = 'temporal_rng_pk';
             pg_get_constraintdef             
@@ -60,6 +62,8 @@
  parent_id | integer   |           |          | 
 Indexes:
     "temporal_fk_rng2rng_pk" PRIMARY KEY (id, valid_at WITHOUT OVERLAPS)
+Check constraints:
+    "valid_at_not_empty" CHECK (NOT isempty(valid_at))
 Foreign-key constraints:
     "temporal_fk_rng2rng_fk" FOREIGN KEY (parent_id, PERIOD valid_at) REFERENCES temporal_rng(id, PERIOD valid_at)
...

diff -U3 /tmp/cirrus-ci-build/contrib/btree_gist/expected/without_overlaps.out /tmp/cirrus-ci-build/build/testrun/btree_...
--- /tmp/cirrus-ci-build/contrib/btree_gist/expected/without_overlaps.out	2024-05-08 04:04:16.000448726 +0000
+++ /tmp/cirrus-ci-build/build/testrun/btree_gist/regress/results/without_overlaps.out	2024-05-08 04:08:06.104467973 +00...
@@ -16,6 +16,8 @@
  valid_at | daterange |           | not null | 
 Indexes:
     "temporal_rng_pk" PRIMARY KEY (id, valid_at WITHOUT OVERLAPS)
+Check constraints:
+    "valid_at_not_empty" CHECK (NOT isempty(valid_at))
 
 SELECT pg_get_constraintdef(oid) FROM pg_constraint WHERE conname = 'temporal_rng_pk';
             pg_get_constraintdef             
@@ -60,6 +62,8 @@
  parent_id | integer   |           |          | 
 Indexes:
     "temporal_fk_rng2rng_pk" PRIMARY KEY (id, valid_at WITHOUT OVERLAPS)
+Check constraints:
+    "valid_at_not_empty" CHECK (NOT isempty(valid_at))
 Foreign-key constraints:
     "temporal_fk_rng2rng_fk" FOREIGN KEY (parent_id, PERIOD valid_at) REFERENCES temporal_rng(id, PERIOD valid_at)
...

diff -w -U3 C:/cirrus/contrib/btree_gist/expected/without_overlaps.out C:/cirrus/build/testrun/btree_gist/regress/result...
--- C:/cirrus/contrib/btree_gist/expected/without_overlaps.out	2024-05-08 04:04:30.147650300 +0000
+++ C:/cirrus/build/testrun/btree_gist/regress/results/without_overlaps.out	2024-05-08 04:10:17.508382500 +0000
@@ -16,6 +16,8 @@
  valid_at | daterange |           | not null | 
 Indexes:
     "temporal_rng_pk" PRIMARY KEY (id, valid_at WITHOUT OVERLAPS)
+Check constraints:
+    "valid_at_not_empty" CHECK (NOT isempty(valid_at))
 
 SELECT pg_get_constraintdef(oid) FROM pg_constraint WHERE conname = 'temporal_rng_pk';
             pg_get_constraintdef             
@@ -60,6 +62,8 @@
  parent_id | integer   |           |          | 
 Indexes:
     "temporal_fk_rng2rng_pk" PRIMARY KEY (id, valid_at WITHOUT OVERLAPS)
+Check constraints:
+    "valid_at_not_empty" CHECK (NOT isempty(valid_at))
 Foreign-key constraints:
     "temporal_fk_rng2rng_fk" FOREIGN KEY (parent_id, PERIOD valid_at) REFERENCES temporal_rng(id, PERIOD valid_at)
...

diff -U3 /Users/admin/pgsql/contrib/btree_gist/expected/without_overlaps.out /Users/admin/pgsql/build/testrun/btree_gist...
--- /Users/admin/pgsql/contrib/btree_gist/expected/without_overlaps.out	2024-05-08 04:04:09
+++ /Users/admin/pgsql/build/testrun/btree_gist/regress/results/without_overlaps.out	2024-05-08 04:07:10
@@ -16,6 +16,8 @@
  valid_at | daterange |           | not null | 
 Indexes:
     "temporal_rng_pk" PRIMARY KEY (id, valid_at WITHOUT OVERLAPS)
+Check constraints:
+    "valid_at_not_empty" CHECK (NOT isempty(valid_at))
 
 SELECT pg_get_constraintdef(oid) FROM pg_constraint WHERE conname = 'temporal_rng_pk';
             pg_get_constraintdef             
@@ -60,6 +62,8 @@
  parent_id | integer   |           |          | 
 Indexes:
     "temporal_fk_rng2rng_pk" PRIMARY KEY (id, valid_at WITHOUT OVERLAPS)
+Check constraints:
+    "valid_at_not_empty" CHECK (NOT isempty(valid_at))
 Foreign-key constraints:
     "temporal_fk_rng2rng_fk" FOREIGN KEY (parent_id, PERIOD valid_at) REFERENCES temporal_rng(id, PERIOD valid_at)
...

diff -U3 /tmp/cirrus-ci-build/contrib/unaccent/expected/unaccent.out /tmp/cirrus-ci-build/build/testrun/unaccent/regress...
--- /tmp/cirrus-ci-build/contrib/unaccent/expected/unaccent.out	2024-05-08 01:57:33.197565000 +0000
+++ /tmp/cirrus-ci-build/build/testrun/unaccent/regress/results/unaccent.out	2024-05-08 01:59:33.894187000 +0000
@@ -8,8 +8,10 @@
 \quit
 \endif
 CREATE EXTENSION unaccent;
+WARNING:  duplicate source strings, first one will be used
 SET client_encoding TO 'UTF8';
 SELECT unaccent('foobar');
+WARNING:  duplicate source strings, first one will be used
  unaccent 
 ----------
  foobar

diff -U3 /tmp/cirrus-ci-build/contrib/unaccent/expected/unaccent.out /tmp/cirrus-ci-build/contrib/unaccent/results/unacc...
--- /tmp/cirrus-ci-build/contrib/unaccent/expected/unaccent.out	2024-05-08 01:56:50.201738571 +0000
+++ /tmp/cirrus-ci-build/contrib/unaccent/results/unaccent.out	2024-05-08 02:00:04.985721598 +0000
@@ -8,8 +8,10 @@
 \quit
 \endif
 CREATE EXTENSION unaccent;
+WARNING:  duplicate source strings, first one will be used
 SET client_encoding TO 'UTF8';
 SELECT unaccent('foobar');
+WARNING:  duplicate source strings, first one will be used
  unaccent 
 ----------
  foobar

diff -U3 /tmp/cirrus-ci-build/contrib/unaccent/expected/unaccent.out /tmp/cirrus-ci-build/build/testrun/unaccent/regress...
--- /tmp/cirrus-ci-build/contrib/unaccent/expected/unaccent.out	2024-05-08 01:56:48.429288521 +0000
+++ /tmp/cirrus-ci-build/build/testrun/unaccent/regress/results/unaccent.out	2024-05-08 01:59:24.049151896 +0000
@@ -8,8 +8,10 @@
 \quit
 \endif
 CREATE EXTENSION unaccent;
+WARNING:  duplicate source strings, first one will be used
 SET client_encoding TO 'UTF8';
 SELECT unaccent('foobar');
+WARNING:  duplicate source strings, first one will be used
  unaccent 
 ----------
  foobar

diff -U3 /Users/admin/pgsql/contrib/unaccent/expected/unaccent.out /Users/admin/pgsql/build/testrun/unaccent/regress/res...
--- /Users/admin/pgsql/contrib/unaccent/expected/unaccent.out	2024-05-08 01:56:59
+++ /Users/admin/pgsql/build/testrun/unaccent/regress/results/unaccent.out	2024-05-08 02:00:17
@@ -8,8 +8,10 @@
 \quit
 \endif
 CREATE EXTENSION unaccent;
+WARNING:  duplicate source strings, first one will be used
 SET client_encoding TO 'UTF8';
 SELECT unaccent('foobar');
+WARNING:  duplicate source strings, first one will be used
  unaccent 
 ----------
  foobar

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/select_parallel.out /tmp/cirrus-ci-build/build/testrun/pg_upgrad...
--- /tmp/cirrus-ci-build/src/test/regress/expected/select_parallel.out	2024-05-07 17:07:42.241784000 +0000
+++ /tmp/cirrus-ci-build/build/testrun/pg_upgrade/002_pg_upgrade/data/results/select_parallel.out	2024-05-07 17:09:11.19...
@@ -451,26 +451,36 @@
   join tenk1 t3 on t3.stringu1 = tenk1.stringu1
   where tenk1.four = t.four
 );
-                                                                                                                       ...
------------------------------------------------------------------------------------------------------------------------...
- Seq Scan on public.tenk1 t
+                                                                                                                       ...
+-----------------------------------------------------------------------------------------------------------------------...
+ Hash Join
    Output: t.unique1, t.unique2, t.two, t.four, t.ten, t.twenty, t.hundred, t.thousand, t.twothousand, t.fivethous, t.t...
-   Filter: (SubPlan 1)
-   SubPlan 1
-     ->  Hash Join
-           Output: t.two
-           Hash Cond: (tenk1.stringu1 = t3.stringu1)
-           ->  Seq Scan on public.tenk1
...

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/select_parallel.out /tmp/cirrus-ci-build/build/testrun/recovery/...
--- /tmp/cirrus-ci-build/src/test/regress/expected/select_parallel.out	2024-05-07 17:07:42.241784000 +0000
+++ /tmp/cirrus-ci-build/build/testrun/recovery/027_stream_regress/data/results/select_parallel.out	2024-05-07 17:09:48....
@@ -451,26 +451,36 @@
   join tenk1 t3 on t3.stringu1 = tenk1.stringu1
   where tenk1.four = t.four
 );
-                                                                                                                       ...
------------------------------------------------------------------------------------------------------------------------...
- Seq Scan on public.tenk1 t
+                                                                                                                       ...
+-----------------------------------------------------------------------------------------------------------------------...
+ Hash Join
    Output: t.unique1, t.unique2, t.two, t.four, t.ten, t.twenty, t.hundred, t.thousand, t.twothousand, t.fivethous, t.t...
-   Filter: (SubPlan 1)
-   SubPlan 1
-     ->  Hash Join
-           Output: t.two
-           Hash Cond: (tenk1.stringu1 = t3.stringu1)
-           ->  Seq Scan on public.tenk1
...

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/select_parallel.out /tmp/cirrus-ci-build/build/testrun/regress/r...
--- /tmp/cirrus-ci-build/src/test/regress/expected/select_parallel.out	2024-05-07 17:07:42.241784000 +0000
+++ /tmp/cirrus-ci-build/build/testrun/regress/regress/results/select_parallel.out	2024-05-07 17:09:11.460723000 +0000
@@ -451,26 +451,36 @@
   join tenk1 t3 on t3.stringu1 = tenk1.stringu1
   where tenk1.four = t.four
 );
-                                                                                                                       ...
------------------------------------------------------------------------------------------------------------------------...
- Seq Scan on public.tenk1 t
+                                                                                                                       ...
+-----------------------------------------------------------------------------------------------------------------------...
+ Hash Join
    Output: t.unique1, t.unique2, t.two, t.four, t.ten, t.twenty, t.hundred, t.thousand, t.twothousand, t.fivethous, t.t...
-   Filter: (SubPlan 1)
-   SubPlan 1
-     ->  Hash Join
-           Output: t.two
-           Hash Cond: (tenk1.stringu1 = t3.stringu1)
-           ->  Seq Scan on public.tenk1
...

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/select_parallel.out /tmp/cirrus-ci-build/src/bin/pg_upgrade/tmp_...
--- /tmp/cirrus-ci-build/src/test/regress/expected/select_parallel.out	2024-05-07 17:07:05.428550973 +0000
+++ /tmp/cirrus-ci-build/src/bin/pg_upgrade/tmp_check/results/select_parallel.out	2024-05-07 17:11:48.196606903 +0000
@@ -451,26 +451,36 @@
   join tenk1 t3 on t3.stringu1 = tenk1.stringu1
   where tenk1.four = t.four
 );
-                                                                                                                       ...
------------------------------------------------------------------------------------------------------------------------...
- Seq Scan on public.tenk1 t
+                                                                                                                       ...
+-----------------------------------------------------------------------------------------------------------------------...
+ Hash Join
    Output: t.unique1, t.unique2, t.two, t.four, t.ten, t.twenty, t.hundred, t.thousand, t.twothousand, t.fivethous, t.t...
-   Filter: (SubPlan 1)
-   SubPlan 1
-     ->  Hash Join
-           Output: t.two
-           Hash Cond: (tenk1.stringu1 = t3.stringu1)
-           ->  Seq Scan on public.tenk1
...

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/select_parallel.out /tmp/cirrus-ci-build/src/test/regress/result...
--- /tmp/cirrus-ci-build/src/test/regress/expected/select_parallel.out	2024-05-07 17:07:05.428550973 +0000
+++ /tmp/cirrus-ci-build/src/test/regress/results/select_parallel.out	2024-05-07 17:10:13.860601770 +0000
@@ -451,26 +451,36 @@
   join tenk1 t3 on t3.stringu1 = tenk1.stringu1
   where tenk1.four = t.four
 );
-                                                                                                                       ...
------------------------------------------------------------------------------------------------------------------------...
- Seq Scan on public.tenk1 t
+                                                                                                                       ...
+-----------------------------------------------------------------------------------------------------------------------...
+ Hash Join
    Output: t.unique1, t.unique2, t.two, t.four, t.ten, t.twenty, t.hundred, t.thousand, t.twothousand, t.fivethous, t.t...
-   Filter: (SubPlan 1)
-   SubPlan 1
-     ->  Hash Join
-           Output: t.two
-           Hash Cond: (tenk1.stringu1 = t3.stringu1)
-           ->  Seq Scan on public.tenk1
...

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/select_parallel.out /tmp/cirrus-ci-build/build/testrun/pg_upgrad...
--- /tmp/cirrus-ci-build/src/test/regress/expected/select_parallel.out	2024-05-07 17:07:06.383566738 +0000
+++ /tmp/cirrus-ci-build/build/testrun/pg_upgrade/002_pg_upgrade/data/results/select_parallel.out	2024-05-07 17:09:52.54...
@@ -451,26 +451,36 @@
   join tenk1 t3 on t3.stringu1 = tenk1.stringu1
   where tenk1.four = t.four
 );
-                                                                                                                       ...
------------------------------------------------------------------------------------------------------------------------...
- Seq Scan on public.tenk1 t
+                                                                                                                       ...
+-----------------------------------------------------------------------------------------------------------------------...
+ Hash Join
    Output: t.unique1, t.unique2, t.two, t.four, t.ten, t.twenty, t.hundred, t.thousand, t.twothousand, t.fivethous, t.t...
-   Filter: (SubPlan 1)
-   SubPlan 1
-     ->  Hash Join
-           Output: t.two
-           Hash Cond: (tenk1.stringu1 = t3.stringu1)
-           ->  Seq Scan on public.tenk1
...

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/select_parallel.out /tmp/cirrus-ci-build/build/testrun/recovery/...
--- /tmp/cirrus-ci-build/src/test/regress/expected/select_parallel.out	2024-05-07 17:07:06.383566738 +0000
+++ /tmp/cirrus-ci-build/build/testrun/recovery/027_stream_regress/data/results/select_parallel.out	2024-05-07 17:10:29....
@@ -451,26 +451,36 @@
   join tenk1 t3 on t3.stringu1 = tenk1.stringu1
   where tenk1.four = t.four
 );
-                                                                                                                       ...
------------------------------------------------------------------------------------------------------------------------...
- Seq Scan on public.tenk1 t
+                                                                                                                       ...
+-----------------------------------------------------------------------------------------------------------------------...
+ Hash Join
    Output: t.unique1, t.unique2, t.two, t.four, t.ten, t.twenty, t.hundred, t.thousand, t.twothousand, t.fivethous, t.t...
-   Filter: (SubPlan 1)
-   SubPlan 1
-     ->  Hash Join
-           Output: t.two
-           Hash Cond: (tenk1.stringu1 = t3.stringu1)
-           ->  Seq Scan on public.tenk1
...

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/select_parallel.out /tmp/cirrus-ci-build/build/testrun/regress/r...
--- /tmp/cirrus-ci-build/src/test/regress/expected/select_parallel.out	2024-05-07 17:07:06.383566738 +0000
+++ /tmp/cirrus-ci-build/build/testrun/regress/regress/results/select_parallel.out	2024-05-07 17:09:50.055432866 +0000
@@ -451,26 +451,36 @@
   join tenk1 t3 on t3.stringu1 = tenk1.stringu1
   where tenk1.four = t.four
 );
-                                                                                                                       ...
------------------------------------------------------------------------------------------------------------------------...
- Seq Scan on public.tenk1 t
+                                                                                                                       ...
+-----------------------------------------------------------------------------------------------------------------------...
+ Hash Join
    Output: t.unique1, t.unique2, t.two, t.four, t.ten, t.twenty, t.hundred, t.thousand, t.twothousand, t.fivethous, t.t...
-   Filter: (SubPlan 1)
-   SubPlan 1
-     ->  Hash Join
-           Output: t.two
-           Hash Cond: (tenk1.stringu1 = t3.stringu1)
-           ->  Seq Scan on public.tenk1
...

diff -w -U3 C:/cirrus/src/test/regress/expected/select_parallel.out C:/cirrus/build/testrun/pg_upgrade/002_pg_upgrade/da...
--- C:/cirrus/src/test/regress/expected/select_parallel.out	2024-05-07 17:07:17.849990900 +0000
+++ C:/cirrus/build/testrun/pg_upgrade/002_pg_upgrade/data/results/select_parallel.out	2024-05-07 17:10:39.950806100 +00...
@@ -452,25 +452,35 @@
   where tenk1.four = t.four
 );
                                                                                                                        ...
------------------------------------------------------------------------------------------------------------------------...
- Seq Scan on public.tenk1 t
+-----------------------------------------------------------------------------------------------------------------------...
+ Hash Join
    Output: t.unique1, t.unique2, t.two, t.four, t.ten, t.twenty, t.hundred, t.thousand, t.twothousand, t.fivethous, t.t...
-   Filter: (SubPlan 1)
-   SubPlan 1
-     ->  Hash Join
-           Output: t.two
-           Hash Cond: (tenk1.stringu1 = t3.stringu1)
-           ->  Seq Scan on public.tenk1
-                 Output: tenk1.unique1, tenk1.unique2, tenk1.two, tenk1.four, tenk1.ten, tenk1.twenty, tenk1.hundred, t...
-                 Filter: (tenk1.four = t.four)
...

diff -w -U3 C:/cirrus/src/test/regress/expected/select_parallel.out C:/cirrus/build/testrun/recovery/027_stream_regress/...
--- C:/cirrus/src/test/regress/expected/select_parallel.out	2024-05-07 17:07:17.849990900 +0000
+++ C:/cirrus/build/testrun/recovery/027_stream_regress/data/results/select_parallel.out	2024-05-07 17:13:06.879970100 +...
@@ -452,25 +452,35 @@
   where tenk1.four = t.four
 );
                                                                                                                        ...
------------------------------------------------------------------------------------------------------------------------...
- Seq Scan on public.tenk1 t
+-----------------------------------------------------------------------------------------------------------------------...
+ Hash Join
    Output: t.unique1, t.unique2, t.two, t.four, t.ten, t.twenty, t.hundred, t.thousand, t.twothousand, t.fivethous, t.t...
-   Filter: (SubPlan 1)
-   SubPlan 1
-     ->  Hash Join
-           Output: t.two
-           Hash Cond: (tenk1.stringu1 = t3.stringu1)
-           ->  Seq Scan on public.tenk1
-                 Output: tenk1.unique1, tenk1.unique2, tenk1.two, tenk1.four, tenk1.ten, tenk1.twenty, tenk1.hundred, t...
-                 Filter: (tenk1.four = t.four)
...

diff -w -U3 C:/cirrus/src/test/regress/expected/select_parallel.out C:/cirrus/build/testrun/regress/regress/results/sele...
--- C:/cirrus/src/test/regress/expected/select_parallel.out	2024-05-07 17:07:17.849990900 +0000
+++ C:/cirrus/build/testrun/regress/regress/results/select_parallel.out	2024-05-07 17:10:37.633909600 +0000
@@ -452,25 +452,35 @@
   where tenk1.four = t.four
 );
                                                                                                                        ...
------------------------------------------------------------------------------------------------------------------------...
- Seq Scan on public.tenk1 t
+-----------------------------------------------------------------------------------------------------------------------...
+ Hash Join
    Output: t.unique1, t.unique2, t.two, t.four, t.ten, t.twenty, t.hundred, t.thousand, t.twothousand, t.fivethous, t.t...
-   Filter: (SubPlan 1)
-   SubPlan 1
-     ->  Hash Join
-           Output: t.two
-           Hash Cond: (tenk1.stringu1 = t3.stringu1)
-           ->  Seq Scan on public.tenk1
-                 Output: tenk1.unique1, tenk1.unique2, tenk1.two, tenk1.four, tenk1.ten, tenk1.twenty, tenk1.hundred, t...
-                 Filter: (tenk1.four = t.four)
...

diff -U3 /Users/admin/pgsql/src/test/regress/expected/select_parallel.out /Users/admin/pgsql/build/testrun/pg_upgrade/00...
--- /Users/admin/pgsql/src/test/regress/expected/select_parallel.out	2024-05-07 17:06:10
+++ /Users/admin/pgsql/build/testrun/pg_upgrade/002_pg_upgrade/data/results/select_parallel.out	2024-05-07 17:09:00
@@ -451,26 +451,36 @@
   join tenk1 t3 on t3.stringu1 = tenk1.stringu1
   where tenk1.four = t.four
 );
-                                                                                                                       ...
------------------------------------------------------------------------------------------------------------------------...
- Seq Scan on public.tenk1 t
+                                                                                                                       ...
+-----------------------------------------------------------------------------------------------------------------------...
+ Hash Join
    Output: t.unique1, t.unique2, t.two, t.four, t.ten, t.twenty, t.hundred, t.thousand, t.twothousand, t.fivethous, t.t...
-   Filter: (SubPlan 1)
-   SubPlan 1
-     ->  Hash Join
-           Output: t.two
-           Hash Cond: (tenk1.stringu1 = t3.stringu1)
-           ->  Seq Scan on public.tenk1
...

diff -U3 /Users/admin/pgsql/src/test/regress/expected/select_parallel.out /Users/admin/pgsql/build/testrun/recovery/027_...
--- /Users/admin/pgsql/src/test/regress/expected/select_parallel.out	2024-05-07 17:06:10
+++ /Users/admin/pgsql/build/testrun/recovery/027_stream_regress/data/results/select_parallel.out	2024-05-07 17:10:40
@@ -451,26 +451,36 @@
   join tenk1 t3 on t3.stringu1 = tenk1.stringu1
   where tenk1.four = t.four
 );
-                                                                                                                       ...
------------------------------------------------------------------------------------------------------------------------...
- Seq Scan on public.tenk1 t
+                                                                                                                       ...
+-----------------------------------------------------------------------------------------------------------------------...
+ Hash Join
    Output: t.unique1, t.unique2, t.two, t.four, t.ten, t.twenty, t.hundred, t.thousand, t.twothousand, t.fivethous, t.t...
-   Filter: (SubPlan 1)
-   SubPlan 1
-     ->  Hash Join
-           Output: t.two
-           Hash Cond: (tenk1.stringu1 = t3.stringu1)
-           ->  Seq Scan on public.tenk1
...

diff -U3 /Users/admin/pgsql/src/test/regress/expected/select_parallel.out /Users/admin/pgsql/build/testrun/regress/regre...
--- /Users/admin/pgsql/src/test/regress/expected/select_parallel.out	2024-05-07 17:06:10
+++ /Users/admin/pgsql/build/testrun/regress/regress/results/select_parallel.out	2024-05-07 17:09:01
@@ -451,26 +451,36 @@
   join tenk1 t3 on t3.stringu1 = tenk1.stringu1
   where tenk1.four = t.four
 );
-                                                                                                                       ...
------------------------------------------------------------------------------------------------------------------------...
- Seq Scan on public.tenk1 t
+                                                                                                                       ...
+-----------------------------------------------------------------------------------------------------------------------...
+ Hash Join
    Output: t.unique1, t.unique2, t.two, t.four, t.ten, t.twenty, t.hundred, t.thousand, t.twothousand, t.fivethous, t.t...
-   Filter: (SubPlan 1)
-   SubPlan 1
-     ->  Hash Join
-           Output: t.two
-           Hash Cond: (tenk1.stringu1 = t3.stringu1)
-           ->  Seq Scan on public.tenk1
...

diff -U3 /tmp/cirrus-ci-build/src/test/isolation/expected/horizons.out /tmp/cirrus-ci-build/build/testrun/isolation/isol...
--- /tmp/cirrus-ci-build/src/test/isolation/expected/horizons.out	2024-05-07 13:05:01.880551000 +0000
+++ /tmp/cirrus-ci-build/build/testrun/isolation/isolation/results/horizons.out	2024-05-07 13:07:20.597291000 +0000
@@ -251,7 +251,7 @@
 
 ?column?
 --------
-       2
+       0
 (1 row)
 
 step pruner_query: 
@@ -261,7 +261,7 @@
 
 ?column?
 --------
-       2
+       0
 (1 row)
 
...

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/partition_join.out /tmp/cirrus-ci-build/build/testrun/pg_upgrade...
--- /tmp/cirrus-ci-build/src/test/regress/expected/partition_join.out	2024-05-07 11:52:22.566524000 +0000
+++ /tmp/cirrus-ci-build/build/testrun/pg_upgrade/002_pg_upgrade/data/results/partition_join.out	2024-05-07 11:54:02.384...
@@ -5133,17 +5133,15 @@
                               QUERY PLAN                               
 -----------------------------------------------------------------------
  Limit
-   ->  Merge Append
-         Sort Key: x.id
-         ->  Merge Left Join
-               Merge Cond: (x_1.id = y_1.id)
+   ->  Merge Left Join
+         Merge Cond: (x.id = y.id)
+         ->  Append
                ->  Index Only Scan using fract_t0_pkey on fract_t0 x_1
-               ->  Index Only Scan using fract_t0_pkey on fract_t0 y_1
-         ->  Merge Left Join
-               Merge Cond: (x_2.id = y_2.id)
                ->  Index Only Scan using fract_t1_pkey on fract_t1 x_2
+         ->  Append
...

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/partition_join.out /tmp/cirrus-ci-build/build/testrun/recovery/0...
--- /tmp/cirrus-ci-build/src/test/regress/expected/partition_join.out	2024-05-07 11:52:22.566524000 +0000
+++ /tmp/cirrus-ci-build/build/testrun/recovery/027_stream_regress/data/results/partition_join.out	2024-05-07 11:54:32.1...
@@ -5133,17 +5133,15 @@
                               QUERY PLAN                               
 -----------------------------------------------------------------------
  Limit
-   ->  Merge Append
-         Sort Key: x.id
-         ->  Merge Left Join
-               Merge Cond: (x_1.id = y_1.id)
+   ->  Merge Left Join
+         Merge Cond: (x.id = y.id)
+         ->  Append
                ->  Index Only Scan using fract_t0_pkey on fract_t0 x_1
-               ->  Index Only Scan using fract_t0_pkey on fract_t0 y_1
-         ->  Merge Left Join
-               Merge Cond: (x_2.id = y_2.id)
                ->  Index Only Scan using fract_t1_pkey on fract_t1 x_2
+         ->  Append
...

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/partition_join.out /tmp/cirrus-ci-build/build/testrun/regress/re...
--- /tmp/cirrus-ci-build/src/test/regress/expected/partition_join.out	2024-05-07 11:52:22.566524000 +0000
+++ /tmp/cirrus-ci-build/build/testrun/regress/regress/results/partition_join.out	2024-05-07 11:53:57.482745000 +0000
@@ -5133,17 +5133,15 @@
                               QUERY PLAN                               
 -----------------------------------------------------------------------
  Limit
-   ->  Merge Append
-         Sort Key: x.id
-         ->  Merge Left Join
-               Merge Cond: (x_1.id = y_1.id)
+   ->  Merge Left Join
+         Merge Cond: (x.id = y.id)
+         ->  Append
                ->  Index Only Scan using fract_t0_pkey on fract_t0 x_1
-               ->  Index Only Scan using fract_t0_pkey on fract_t0 y_1
-         ->  Merge Left Join
-               Merge Cond: (x_2.id = y_2.id)
                ->  Index Only Scan using fract_t1_pkey on fract_t1 x_2
+         ->  Append
...

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/partition_join.out /tmp/cirrus-ci-build/src/bin/pg_upgrade/tmp_c...
--- /tmp/cirrus-ci-build/src/test/regress/expected/partition_join.out	2024-05-07 11:51:54.947867195 +0000
+++ /tmp/cirrus-ci-build/src/bin/pg_upgrade/tmp_check/results/partition_join.out	2024-05-07 11:56:04.279919186 +0000
@@ -5133,17 +5133,15 @@
                               QUERY PLAN                               
 -----------------------------------------------------------------------
  Limit
-   ->  Merge Append
-         Sort Key: x.id
-         ->  Merge Left Join
-               Merge Cond: (x_1.id = y_1.id)
+   ->  Merge Left Join
+         Merge Cond: (x.id = y.id)
+         ->  Append
                ->  Index Only Scan using fract_t0_pkey on fract_t0 x_1
-               ->  Index Only Scan using fract_t0_pkey on fract_t0 y_1
-         ->  Merge Left Join
-               Merge Cond: (x_2.id = y_2.id)
                ->  Index Only Scan using fract_t1_pkey on fract_t1 x_2
+         ->  Append
...

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/partition_join.out /tmp/cirrus-ci-build/src/test/recovery/tmp_ch...
--- /tmp/cirrus-ci-build/src/test/regress/expected/partition_join.out	2024-05-07 11:51:54.947867195 +0000
+++ /tmp/cirrus-ci-build/src/test/recovery/tmp_check/results/partition_join.out	2024-05-07 11:57:35.103921618 +0000
@@ -5133,17 +5133,15 @@
                               QUERY PLAN                               
 -----------------------------------------------------------------------
  Limit
-   ->  Merge Append
-         Sort Key: x.id
-         ->  Merge Left Join
-               Merge Cond: (x_1.id = y_1.id)
+   ->  Merge Left Join
+         Merge Cond: (x.id = y.id)
+         ->  Append
                ->  Index Only Scan using fract_t0_pkey on fract_t0 x_1
-               ->  Index Only Scan using fract_t0_pkey on fract_t0 y_1
-         ->  Merge Left Join
-               Merge Cond: (x_2.id = y_2.id)
                ->  Index Only Scan using fract_t1_pkey on fract_t1 x_2
+         ->  Append
...

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/partition_join.out /tmp/cirrus-ci-build/src/test/regress/results...
--- /tmp/cirrus-ci-build/src/test/regress/expected/partition_join.out	2024-05-07 11:51:54.947867195 +0000
+++ /tmp/cirrus-ci-build/src/test/regress/results/partition_join.out	2024-05-07 11:54:36.435901837 +0000
@@ -5133,17 +5133,15 @@
                               QUERY PLAN                               
 -----------------------------------------------------------------------
  Limit
-   ->  Merge Append
-         Sort Key: x.id
-         ->  Merge Left Join
-               Merge Cond: (x_1.id = y_1.id)
+   ->  Merge Left Join
+         Merge Cond: (x.id = y.id)
+         ->  Append
                ->  Index Only Scan using fract_t0_pkey on fract_t0 x_1
-               ->  Index Only Scan using fract_t0_pkey on fract_t0 y_1
-         ->  Merge Left Join
-               Merge Cond: (x_2.id = y_2.id)
                ->  Index Only Scan using fract_t1_pkey on fract_t1 x_2
+         ->  Append
...

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/partition_join.out /tmp/cirrus-ci-build/build/testrun/pg_upgrade...
--- /tmp/cirrus-ci-build/src/test/regress/expected/partition_join.out	2024-05-07 11:51:58.044808743 +0000
+++ /tmp/cirrus-ci-build/build/testrun/pg_upgrade/002_pg_upgrade/data/results/partition_join.out	2024-05-07 11:54:17.392...
@@ -5133,17 +5133,15 @@
                               QUERY PLAN                               
 -----------------------------------------------------------------------
  Limit
-   ->  Merge Append
-         Sort Key: x.id
-         ->  Merge Left Join
-               Merge Cond: (x_1.id = y_1.id)
+   ->  Merge Left Join
+         Merge Cond: (x.id = y.id)
+         ->  Append
                ->  Index Only Scan using fract_t0_pkey on fract_t0 x_1
-               ->  Index Only Scan using fract_t0_pkey on fract_t0 y_1
-         ->  Merge Left Join
-               Merge Cond: (x_2.id = y_2.id)
                ->  Index Only Scan using fract_t1_pkey on fract_t1 x_2
+         ->  Append
...

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/partition_join.out /tmp/cirrus-ci-build/build/testrun/recovery/0...
--- /tmp/cirrus-ci-build/src/test/regress/expected/partition_join.out	2024-05-07 11:51:58.044808743 +0000
+++ /tmp/cirrus-ci-build/build/testrun/recovery/027_stream_regress/data/results/partition_join.out	2024-05-07 11:54:48.2...
@@ -5133,17 +5133,15 @@
                               QUERY PLAN                               
 -----------------------------------------------------------------------
  Limit
-   ->  Merge Append
-         Sort Key: x.id
-         ->  Merge Left Join
-               Merge Cond: (x_1.id = y_1.id)
+   ->  Merge Left Join
+         Merge Cond: (x.id = y.id)
+         ->  Append
                ->  Index Only Scan using fract_t0_pkey on fract_t0 x_1
-               ->  Index Only Scan using fract_t0_pkey on fract_t0 y_1
-         ->  Merge Left Join
-               Merge Cond: (x_2.id = y_2.id)
                ->  Index Only Scan using fract_t1_pkey on fract_t1 x_2
+         ->  Append
...

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/partition_join.out /tmp/cirrus-ci-build/build/testrun/regress/re...
--- /tmp/cirrus-ci-build/src/test/regress/expected/partition_join.out	2024-05-07 11:51:58.044808743 +0000
+++ /tmp/cirrus-ci-build/build/testrun/regress/regress/results/partition_join.out	2024-05-07 11:54:12.620838314 +0000
@@ -5133,17 +5133,15 @@
                               QUERY PLAN                               
 -----------------------------------------------------------------------
  Limit
-   ->  Merge Append
-         Sort Key: x.id
-         ->  Merge Left Join
-               Merge Cond: (x_1.id = y_1.id)
+   ->  Merge Left Join
+         Merge Cond: (x.id = y.id)
+         ->  Append
                ->  Index Only Scan using fract_t0_pkey on fract_t0 x_1
-               ->  Index Only Scan using fract_t0_pkey on fract_t0 y_1
-         ->  Merge Left Join
-               Merge Cond: (x_2.id = y_2.id)
                ->  Index Only Scan using fract_t1_pkey on fract_t1 x_2
+         ->  Append
...

diff -w -U3 C:/cirrus/src/test/regress/expected/partition_join.out C:/cirrus/build/testrun/pg_upgrade/002_pg_upgrade/dat...
--- C:/cirrus/src/test/regress/expected/partition_join.out	2024-05-07 11:52:06.801233500 +0000
+++ C:/cirrus/build/testrun/pg_upgrade/002_pg_upgrade/data/results/partition_join.out	2024-05-07 11:55:57.542383600 +000...
@@ -5133,17 +5133,15 @@
                               QUERY PLAN                               
 -----------------------------------------------------------------------
  Limit
-   ->  Merge Append
-         Sort Key: x.id
          ->  Merge Left Join
-               Merge Cond: (x_1.id = y_1.id)
+         Merge Cond: (x.id = y.id)
+         ->  Append
                ->  Index Only Scan using fract_t0_pkey on fract_t0 x_1
-               ->  Index Only Scan using fract_t0_pkey on fract_t0 y_1
-         ->  Merge Left Join
-               Merge Cond: (x_2.id = y_2.id)
                ->  Index Only Scan using fract_t1_pkey on fract_t1 x_2
+         ->  Append
+               ->  Index Only Scan using fract_t0_pkey on fract_t0 y_1
...

diff -w -U3 C:/cirrus/src/test/regress/expected/partition_join.out C:/cirrus/build/testrun/recovery/027_stream_regress/d...
--- C:/cirrus/src/test/regress/expected/partition_join.out	2024-05-07 11:52:06.801233500 +0000
+++ C:/cirrus/build/testrun/recovery/027_stream_regress/data/results/partition_join.out	2024-05-07 11:58:01.442019500 +0...
@@ -5133,17 +5133,15 @@
                               QUERY PLAN                               
 -----------------------------------------------------------------------
  Limit
-   ->  Merge Append
-         Sort Key: x.id
          ->  Merge Left Join
-               Merge Cond: (x_1.id = y_1.id)
+         Merge Cond: (x.id = y.id)
+         ->  Append
                ->  Index Only Scan using fract_t0_pkey on fract_t0 x_1
-               ->  Index Only Scan using fract_t0_pkey on fract_t0 y_1
-         ->  Merge Left Join
-               Merge Cond: (x_2.id = y_2.id)
                ->  Index Only Scan using fract_t1_pkey on fract_t1 x_2
+         ->  Append
+               ->  Index Only Scan using fract_t0_pkey on fract_t0 y_1
...

diff -w -U3 C:/cirrus/src/test/regress/expected/partition_join.out C:/cirrus/build/testrun/regress/regress/results/parti...
--- C:/cirrus/src/test/regress/expected/partition_join.out	2024-05-07 11:52:06.801233500 +0000
+++ C:/cirrus/build/testrun/regress/regress/results/partition_join.out	2024-05-07 11:55:49.915427800 +0000
@@ -5133,17 +5133,15 @@
                               QUERY PLAN                               
 -----------------------------------------------------------------------
  Limit
-   ->  Merge Append
-         Sort Key: x.id
          ->  Merge Left Join
-               Merge Cond: (x_1.id = y_1.id)
+         Merge Cond: (x.id = y.id)
+         ->  Append
                ->  Index Only Scan using fract_t0_pkey on fract_t0 x_1
-               ->  Index Only Scan using fract_t0_pkey on fract_t0 y_1
-         ->  Merge Left Join
-               Merge Cond: (x_2.id = y_2.id)
                ->  Index Only Scan using fract_t1_pkey on fract_t1 x_2
+         ->  Append
+               ->  Index Only Scan using fract_t0_pkey on fract_t0 y_1
...

diff -U3 /Users/admin/pgsql/src/test/regress/expected/partition_join.out /Users/admin/pgsql/build/testrun/pg_upgrade/002...
--- /Users/admin/pgsql/src/test/regress/expected/partition_join.out	2024-05-07 11:52:00
+++ /Users/admin/pgsql/build/testrun/pg_upgrade/002_pg_upgrade/data/results/partition_join.out	2024-05-07 11:55:44
@@ -5133,17 +5133,15 @@
                               QUERY PLAN                               
 -----------------------------------------------------------------------
  Limit
-   ->  Merge Append
-         Sort Key: x.id
-         ->  Merge Left Join
-               Merge Cond: (x_1.id = y_1.id)
+   ->  Merge Left Join
+         Merge Cond: (x.id = y.id)
+         ->  Append
                ->  Index Only Scan using fract_t0_pkey on fract_t0 x_1
-               ->  Index Only Scan using fract_t0_pkey on fract_t0 y_1
-         ->  Merge Left Join
-               Merge Cond: (x_2.id = y_2.id)
                ->  Index Only Scan using fract_t1_pkey on fract_t1 x_2
+         ->  Append
...

diff -U3 /Users/admin/pgsql/src/test/regress/expected/partition_join.out /Users/admin/pgsql/build/testrun/recovery/027_s...
--- /Users/admin/pgsql/src/test/regress/expected/partition_join.out	2024-05-07 11:52:00
+++ /Users/admin/pgsql/build/testrun/recovery/027_stream_regress/data/results/partition_join.out	2024-05-07 11:58:12
@@ -5133,17 +5133,15 @@
                               QUERY PLAN                               
 -----------------------------------------------------------------------
  Limit
-   ->  Merge Append
-         Sort Key: x.id
-         ->  Merge Left Join
-               Merge Cond: (x_1.id = y_1.id)
+   ->  Merge Left Join
+         Merge Cond: (x.id = y.id)
+         ->  Append
                ->  Index Only Scan using fract_t0_pkey on fract_t0 x_1
-               ->  Index Only Scan using fract_t0_pkey on fract_t0 y_1
-         ->  Merge Left Join
-               Merge Cond: (x_2.id = y_2.id)
                ->  Index Only Scan using fract_t1_pkey on fract_t1 x_2
+         ->  Append
...

diff -U3 /Users/admin/pgsql/src/test/regress/expected/partition_join.out /Users/admin/pgsql/build/testrun/regress/regres...
--- /Users/admin/pgsql/src/test/regress/expected/partition_join.out	2024-05-07 11:52:00
+++ /Users/admin/pgsql/build/testrun/regress/regress/results/partition_join.out	2024-05-07 11:55:43
@@ -5133,17 +5133,15 @@
                               QUERY PLAN                               
 -----------------------------------------------------------------------
  Limit
-   ->  Merge Append
-         Sort Key: x.id
-         ->  Merge Left Join
-               Merge Cond: (x_1.id = y_1.id)
+   ->  Merge Left Join
+         Merge Cond: (x.id = y.id)
+         ->  Append
                ->  Index Only Scan using fract_t0_pkey on fract_t0 x_1
-               ->  Index Only Scan using fract_t0_pkey on fract_t0 y_1
-         ->  Merge Left Join
-               Merge Cond: (x_2.id = y_2.id)
                ->  Index Only Scan using fract_t1_pkey on fract_t1 x_2
+         ->  Append
...

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/alter_table.out /tmp/cirrus-ci-build/build/testrun/pg_upgrade/00...
--- /tmp/cirrus-ci-build/src/test/regress/expected/alter_table.out	2024-05-07 04:39:26.766518000 +0000
+++ /tmp/cirrus-ci-build/build/testrun/pg_upgrade/002_pg_upgrade/data/results/alter_table.out	2024-05-07 04:41:03.720283...
@@ -3476,9 +3476,20 @@
 WHERE relkind IN ('r', 'i', 'S', 't', 'm') AND mapped_oid IS DISTINCT FROM oid;
 SELECT m.* FROM filenode_mapping m LEFT JOIN pg_class c ON c.oid = m.oid
 WHERE c.oid IS NOT NULL OR m.mapped_oid IS NOT NULL;
- oid | mapped_oid | reltablespace | relfilenode | relname 
------+------------+---------------+-------------+---------
-(0 rows)
+  oid  | mapped_oid | reltablespace | relfilenode |       relname        
+-------+------------+---------------+-------------+----------------------
+ 37707 |            |             0 |       37707 | pktable_pkey
+ 37704 |            |             0 |       37704 | pktable
+ 37709 |            |             0 |       37709 | fktable
+ 38327 |            |             0 |       38335 | foo
+ 38339 |            |             0 |       38339 | pg_toast_38327_index
+ 38338 |            |             0 |       38338 | pg_toast_38327
+ 38576 |            |             0 |       38576 | old_oids
+ 38614 |            |             0 |       38614 | pg_toast_38611
...

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/alter_table.out /tmp/cirrus-ci-build/build/testrun/recovery/027_...
--- /tmp/cirrus-ci-build/src/test/regress/expected/alter_table.out	2024-05-07 04:39:26.766518000 +0000
+++ /tmp/cirrus-ci-build/build/testrun/recovery/027_stream_regress/data/results/alter_table.out	2024-05-07 04:41:39.8176...
@@ -3476,9 +3476,20 @@
 WHERE relkind IN ('r', 'i', 'S', 't', 'm') AND mapped_oid IS DISTINCT FROM oid;
 SELECT m.* FROM filenode_mapping m LEFT JOIN pg_class c ON c.oid = m.oid
 WHERE c.oid IS NOT NULL OR m.mapped_oid IS NOT NULL;
- oid | mapped_oid | reltablespace | relfilenode | relname 
------+------------+---------------+-------------+---------
-(0 rows)
+  oid  | mapped_oid | reltablespace | relfilenode |       relname        
+-------+------------+---------------+-------------+----------------------
+ 37710 |            |             0 |       37710 | pktable_pkey
+ 37707 |            |             0 |       37707 | pktable
+ 37712 |            |             0 |       37712 | fktable
+ 38264 |            |             0 |       38271 | foo
+ 38275 |            |             0 |       38275 | pg_toast_38264_index
+ 38274 |            |             0 |       38274 | pg_toast_38264
+ 38547 |            |             0 |       38547 | old_oids
+ 38564 |            |             0 |       38564 | pg_toast_38561
...

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/alter_table.out /tmp/cirrus-ci-build/build/testrun/regress/regre...
--- /tmp/cirrus-ci-build/src/test/regress/expected/alter_table.out	2024-05-07 04:39:26.766518000 +0000
+++ /tmp/cirrus-ci-build/build/testrun/regress/regress/results/alter_table.out	2024-05-07 04:41:00.086572000 +0000
@@ -3476,9 +3476,20 @@
 WHERE relkind IN ('r', 'i', 'S', 't', 'm') AND mapped_oid IS DISTINCT FROM oid;
 SELECT m.* FROM filenode_mapping m LEFT JOIN pg_class c ON c.oid = m.oid
 WHERE c.oid IS NOT NULL OR m.mapped_oid IS NOT NULL;
- oid | mapped_oid | reltablespace | relfilenode | relname 
------+------------+---------------+-------------+---------
-(0 rows)
+  oid  | mapped_oid | reltablespace | relfilenode |       relname        
+-------+------------+---------------+-------------+----------------------
+ 37806 |            |             0 |       37806 | pktable
+ 37811 |            |             0 |       37811 | fktable
+ 37809 |            |             0 |       37809 | pktable_pkey
+ 38342 |            |             0 |       38347 | foo
+ 38351 |            |             0 |       38351 | pg_toast_38342_index
+ 38350 |            |             0 |       38350 | pg_toast_38342
+ 38564 |            |             0 |       38564 | old_oids
+ 38582 |            |             0 |       38582 | pg_toast_38579
...

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/alter_table.out /tmp/cirrus-ci-build/src/bin/pg_upgrade/tmp_chec...
--- /tmp/cirrus-ci-build/src/test/regress/expected/alter_table.out	2024-05-07 04:38:55.388078207 +0000
+++ /tmp/cirrus-ci-build/src/bin/pg_upgrade/tmp_check/results/alter_table.out	2024-05-07 04:43:04.572148470 +0000
@@ -3476,9 +3476,20 @@
 WHERE relkind IN ('r', 'i', 'S', 't', 'm') AND mapped_oid IS DISTINCT FROM oid;
 SELECT m.* FROM filenode_mapping m LEFT JOIN pg_class c ON c.oid = m.oid
 WHERE c.oid IS NOT NULL OR m.mapped_oid IS NOT NULL;
- oid | mapped_oid | reltablespace | relfilenode | relname 
------+------------+---------------+-------------+---------
-(0 rows)
+  oid  | mapped_oid | reltablespace | relfilenode |       relname        
+-------+------------+---------------+-------------+----------------------
+ 37921 |            |             0 |       37921 | pktable_pkey
+ 37918 |            |             0 |       37918 | pktable
+ 37923 |            |             0 |       37923 | fktable
+ 38457 |            |             0 |       38463 | foo
+ 38467 |            |             0 |       38467 | pg_toast_38457_index
+ 38466 |            |             0 |       38466 | pg_toast_38457
+ 38726 |            |             0 |       38726 | old_oids
+ 38743 |            |             0 |       38743 | pg_toast_38740
...

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/alter_table.out /tmp/cirrus-ci-build/src/test/regress/results/al...
--- /tmp/cirrus-ci-build/src/test/regress/expected/alter_table.out	2024-05-07 04:38:55.388078207 +0000
+++ /tmp/cirrus-ci-build/src/test/regress/results/alter_table.out	2024-05-07 04:41:52.620088873 +0000
@@ -3476,9 +3476,20 @@
 WHERE relkind IN ('r', 'i', 'S', 't', 'm') AND mapped_oid IS DISTINCT FROM oid;
 SELECT m.* FROM filenode_mapping m LEFT JOIN pg_class c ON c.oid = m.oid
 WHERE c.oid IS NOT NULL OR m.mapped_oid IS NOT NULL;
- oid | mapped_oid | reltablespace | relfilenode | relname 
------+------------+---------------+-------------+---------
-(0 rows)
+  oid  | mapped_oid | reltablespace | relfilenode |       relname        
+-------+------------+---------------+-------------+----------------------
+ 37922 |            |             0 |       37922 | pktable_pkey
+ 37919 |            |             0 |       37919 | pktable
+ 37924 |            |             0 |       37924 | fktable
+ 38438 |            |             0 |       38443 | foo
+ 38447 |            |             0 |       38447 | pg_toast_38438_index
+ 38446 |            |             0 |       38446 | pg_toast_38438
+ 38661 |            |             0 |       38661 | old_oids
+ 38678 |            |             0 |       38678 | pg_toast_38675
...

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/alter_table.out /tmp/cirrus-ci-build/build/testrun/pg_upgrade/00...
--- /tmp/cirrus-ci-build/src/test/regress/expected/alter_table.out	2024-05-07 04:38:55.364995976 +0000
+++ /tmp/cirrus-ci-build/build/testrun/pg_upgrade/002_pg_upgrade/data/results/alter_table.out	2024-05-07 04:41:24.464977...
@@ -3476,9 +3476,29 @@
 WHERE relkind IN ('r', 'i', 'S', 't', 'm') AND mapped_oid IS DISTINCT FROM oid;
 SELECT m.* FROM filenode_mapping m LEFT JOIN pg_class c ON c.oid = m.oid
 WHERE c.oid IS NOT NULL OR m.mapped_oid IS NOT NULL;
- oid | mapped_oid | reltablespace | relfilenode | relname 
------+------------+---------------+-------------+---------
-(0 rows)
+  oid  | mapped_oid | reltablespace | relfilenode |       relname        
+-------+------------+---------------+-------------+----------------------
+ 38493 |            |             0 |       38493 | forc_test
+ 37943 |            |             0 |       37943 | users_id_seq
+ 37949 |            |             0 |       37949 | pg_toast_37944
+ 37950 |            |             0 |       37950 | pg_toast_37944_index
+ 37944 |            |             0 |       37944 | users
+ 38212 |            |             0 |       38212 | foo
+ 38873 |            |             0 |       38873 | pg_toast_38869_index
+ 38869 |            |             0 |       38869 | rtype
...

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/alter_table.out /tmp/cirrus-ci-build/build/testrun/recovery/027_...
--- /tmp/cirrus-ci-build/src/test/regress/expected/alter_table.out	2024-05-07 04:38:55.364995976 +0000
+++ /tmp/cirrus-ci-build/build/testrun/recovery/027_stream_regress/data/results/alter_table.out	2024-05-07 04:41:56.4809...
@@ -3476,9 +3476,25 @@
 WHERE relkind IN ('r', 'i', 'S', 't', 'm') AND mapped_oid IS DISTINCT FROM oid;
 SELECT m.* FROM filenode_mapping m LEFT JOIN pg_class c ON c.oid = m.oid
 WHERE c.oid IS NOT NULL OR m.mapped_oid IS NOT NULL;
- oid | mapped_oid | reltablespace | relfilenode | relname 
------+------------+---------------+-------------+---------
-(0 rows)
+  oid  | mapped_oid | reltablespace | relfilenode |       relname        
+-------+------------+---------------+-------------+----------------------
+ 38107 |            |             0 |       38107 | pg_toast_38098
+ 38109 |            |             0 |       38109 | pg_toast_38098_index
+ 38098 |            |             0 |       38098 | users
+ 38097 |            |             0 |       38097 | users_id_seq
+ 38469 |            |             0 |       38469 | foo
+ 37646 |            |             0 |       37646 | pktable_pkey
+ 37643 |            |             0 |       37643 | pktable
+ 37649 |            |             0 |       37649 | fktable
...

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/alter_table.out /tmp/cirrus-ci-build/build/testrun/regress/regre...
--- /tmp/cirrus-ci-build/src/test/regress/expected/alter_table.out	2024-05-07 04:38:55.364995976 +0000
+++ /tmp/cirrus-ci-build/build/testrun/regress/regress/results/alter_table.out	2024-05-07 04:41:15.700971430 +0000
@@ -3476,9 +3476,29 @@
 WHERE relkind IN ('r', 'i', 'S', 't', 'm') AND mapped_oid IS DISTINCT FROM oid;
 SELECT m.* FROM filenode_mapping m LEFT JOIN pg_class c ON c.oid = m.oid
 WHERE c.oid IS NOT NULL OR m.mapped_oid IS NOT NULL;
- oid | mapped_oid | reltablespace | relfilenode | relname 
------+------------+---------------+-------------+---------
-(0 rows)
+  oid  | mapped_oid | reltablespace | relfilenode |       relname        
+-------+------------+---------------+-------------+----------------------
+ 37753 |            |             0 |       37753 | users_id_seq
+ 37760 |            |             0 |       37760 | pg_toast_37755
+ 37761 |            |             0 |       37761 | pg_toast_37755_index
+ 37755 |            |             0 |       37755 | users
+ 38078 |            |             0 |       38078 | foo
+ 38412 |            |             0 |       38412 | forc_test
+ 38863 |            |             0 |       38863 | pg_toast_38860
+ 38864 |            |             0 |       38864 | pg_toast_38860_index
...

diff -w -U3 C:/cirrus/src/test/regress/expected/alter_table.out C:/cirrus/build/testrun/pg_upgrade/002_pg_upgrade/data/r...
--- C:/cirrus/src/test/regress/expected/alter_table.out	2024-05-07 04:39:12.562045900 +0000
+++ C:/cirrus/build/testrun/pg_upgrade/002_pg_upgrade/data/results/alter_table.out	2024-05-07 04:43:17.630442300 +0000
@@ -3477,8 +3477,19 @@
 SELECT m.* FROM filenode_mapping m LEFT JOIN pg_class c ON c.oid = m.oid
 WHERE c.oid IS NOT NULL OR m.mapped_oid IS NOT NULL;
  oid | mapped_oid | reltablespace | relfilenode | relname 
------+------------+---------------+-------------+---------
-(0 rows)
+-------+------------+---------------+-------------+----------------------
+ 36344 |            |             0 |       36344 | pktable_pkey
+ 36340 |            |             0 |       36340 | pktable
+ 36352 |            |             0 |       36352 | fktable
+ 37662 |            |             0 |       37683 | foo
+ 37687 |            |             0 |       37687 | pg_toast_37662_index
+ 37686 |            |             0 |       37686 | pg_toast_37662
+ 38146 |            |             0 |       38146 | old_oids
+ 38164 |            |             0 |       38164 | pg_toast_38161
+ 38165 |            |             0 |       38165 | pg_toast_38161_index
+ 38161 |            |             0 |       38161 | recur2
...

diff -w -U3 C:/cirrus/src/test/regress/expected/alter_table.out C:/cirrus/build/testrun/recovery/027_stream_regress/data...
--- C:/cirrus/src/test/regress/expected/alter_table.out	2024-05-07 04:39:12.562045900 +0000
+++ C:/cirrus/build/testrun/recovery/027_stream_regress/data/results/alter_table.out	2024-05-07 04:45:40.018140300 +0000
@@ -3477,8 +3477,19 @@
 SELECT m.* FROM filenode_mapping m LEFT JOIN pg_class c ON c.oid = m.oid
 WHERE c.oid IS NOT NULL OR m.mapped_oid IS NOT NULL;
  oid | mapped_oid | reltablespace | relfilenode | relname 
------+------------+---------------+-------------+---------
-(0 rows)
+-------+------------+---------------+-------------+----------------------
+ 37555 |            |             0 |       37555 | pktable_pkey
+ 37551 |            |             0 |       37551 | pktable
+ 37557 |            |             0 |       37557 | fktable
+ 38009 |            |             0 |       38014 | foo
+ 38018 |            |             0 |       38018 | pg_toast_38009_index
+ 38017 |            |             0 |       38017 | pg_toast_38009
+ 38277 |            |             0 |       38277 | old_oids
+ 38294 |            |             0 |       38294 | pg_toast_38291
+ 38295 |            |             0 |       38295 | pg_toast_38291_index
+ 38291 |            |             0 |       38291 | recur2
...

diff -w -U3 C:/cirrus/src/test/regress/expected/alter_table.out C:/cirrus/build/testrun/regress/regress/results/alter_ta...
--- C:/cirrus/src/test/regress/expected/alter_table.out	2024-05-07 04:39:12.562045900 +0000
+++ C:/cirrus/build/testrun/regress/regress/results/alter_table.out	2024-05-07 04:43:13.894119400 +0000
@@ -3477,8 +3477,28 @@
 SELECT m.* FROM filenode_mapping m LEFT JOIN pg_class c ON c.oid = m.oid
 WHERE c.oid IS NOT NULL OR m.mapped_oid IS NOT NULL;
  oid | mapped_oid | reltablespace | relfilenode | relname 
------+------------+---------------+-------------+---------
-(0 rows)
+-------+------------+---------------+-------------+----------------------
+ 36479 |            |             0 |       36479 | pktable_pkey
+ 36472 |            |             0 |       36472 | pktable
+ 36491 |            |             0 |       36491 | fktable
+ 37707 |            |             0 |       37712 | foo
+ 37716 |            |             0 |       37716 | pg_toast_37707_index
+ 37715 |            |             0 |       37715 | pg_toast_37707
+ 37972 |            |             0 |       37972 | users_id_seq
+ 37995 |            |             0 |       37995 | pg_toast_37975
+ 37996 |            |             0 |       37996 | pg_toast_37975_index
+ 37975 |            |             0 |       37975 | users
...

diff -U3 /Users/admin/pgsql/src/test/regress/expected/alter_table.out /Users/admin/pgsql/build/testrun/pg_upgrade/002_pg...
--- /Users/admin/pgsql/src/test/regress/expected/alter_table.out	2024-05-07 04:38:52
+++ /Users/admin/pgsql/build/testrun/pg_upgrade/002_pg_upgrade/data/results/alter_table.out	2024-05-07 04:41:41
@@ -3476,9 +3476,20 @@
 WHERE relkind IN ('r', 'i', 'S', 't', 'm') AND mapped_oid IS DISTINCT FROM oid;
 SELECT m.* FROM filenode_mapping m LEFT JOIN pg_class c ON c.oid = m.oid
 WHERE c.oid IS NOT NULL OR m.mapped_oid IS NOT NULL;
- oid | mapped_oid | reltablespace | relfilenode | relname 
------+------------+---------------+-------------+---------
-(0 rows)
+  oid  | mapped_oid | reltablespace | relfilenode |       relname        
+-------+------------+---------------+-------------+----------------------
+ 37541 |            |             0 |       37541 | pktable_pkey
+ 37538 |            |             0 |       37538 | pktable
+ 37546 |            |             0 |       37546 | fktable
+ 38311 |            |             0 |       38316 | foo
+ 38320 |            |             0 |       38320 | pg_toast_38311_index
+ 38319 |            |             0 |       38319 | pg_toast_38311
+ 38572 |            |             0 |       38572 | old_oids
+ 38589 |            |             0 |       38589 | pg_toast_38586
...

diff -U3 /Users/admin/pgsql/src/test/regress/expected/alter_table.out /Users/admin/pgsql/build/testrun/recovery/027_stre...
--- /Users/admin/pgsql/src/test/regress/expected/alter_table.out	2024-05-07 04:38:52
+++ /Users/admin/pgsql/build/testrun/recovery/027_stream_regress/data/results/alter_table.out	2024-05-07 04:42:39
@@ -3476,9 +3476,20 @@
 WHERE relkind IN ('r', 'i', 'S', 't', 'm') AND mapped_oid IS DISTINCT FROM oid;
 SELECT m.* FROM filenode_mapping m LEFT JOIN pg_class c ON c.oid = m.oid
 WHERE c.oid IS NOT NULL OR m.mapped_oid IS NOT NULL;
- oid | mapped_oid | reltablespace | relfilenode | relname 
------+------------+---------------+-------------+---------
-(0 rows)
+  oid  | mapped_oid | reltablespace | relfilenode |       relname        
+-------+------------+---------------+-------------+----------------------
+ 37690 |            |             0 |       37690 | pktable_pkey
+ 37687 |            |             0 |       37687 | pktable
+ 37693 |            |             0 |       37693 | fktable
+ 38265 |            |             0 |       38275 | foo
+ 38279 |            |             0 |       38279 | pg_toast_38265_index
+ 38278 |            |             0 |       38278 | pg_toast_38265
+ 38488 |            |             0 |       38488 | old_oids
+ 38509 |            |             0 |       38509 | pg_toast_38506
...

diff -U3 /Users/admin/pgsql/src/test/regress/expected/alter_table.out /Users/admin/pgsql/build/testrun/regress/regress/r...
--- /Users/admin/pgsql/src/test/regress/expected/alter_table.out	2024-05-07 04:38:52
+++ /Users/admin/pgsql/build/testrun/regress/regress/results/alter_table.out	2024-05-07 04:41:41
@@ -3476,9 +3476,20 @@
 WHERE relkind IN ('r', 'i', 'S', 't', 'm') AND mapped_oid IS DISTINCT FROM oid;
 SELECT m.* FROM filenode_mapping m LEFT JOIN pg_class c ON c.oid = m.oid
 WHERE c.oid IS NOT NULL OR m.mapped_oid IS NOT NULL;
- oid | mapped_oid | reltablespace | relfilenode | relname 
------+------------+---------------+-------------+---------
-(0 rows)
+  oid  | mapped_oid | reltablespace | relfilenode |       relname        
+-------+------------+---------------+-------------+----------------------
+ 37816 |            |             0 |       37816 | pktable_pkey
+ 37813 |            |             0 |       37813 | pktable
+ 37818 |            |             0 |       37818 | fktable
+ 38308 |            |             0 |       38313 | foo
+ 38317 |            |             0 |       38317 | pg_toast_38308_index
+ 38316 |            |             0 |       38316 | pg_toast_38308
+ 38504 |            |             0 |       38504 | old_oids
+ 38521 |            |             0 |       38521 | pg_toast_38518
...

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/stats_export_import.out /tmp/cirrus-ci-build/build/testrun/pg_up...
--- /tmp/cirrus-ci-build/src/test/regress/expected/stats_export_import.out	2024-05-07 04:05:04.161578000 +0000
+++ /tmp/cirrus-ci-build/build/testrun/pg_upgrade/002_pg_upgrade/data/results/stats_export_import.out	2024-05-07 04:06:4...
@@ -366,7 +366,7 @@
  stats_export_import | test      | id      | f         |       0.5 |         2 |       -0.1 |                  |       ...
 (1 row)
 
--- warn: scalars can't have mcelem 
+-- warn: scalars can't have mcelem
 SELECT pg_catalog.pg_set_attribute_stats(
     'stats_export_import.test'::regclass,
     'id'::name,
@@ -419,7 +419,7 @@
  t
 (1 row)
 
--- ok: mcelem 
+-- ok: mcelem
 SELECT pg_catalog.pg_set_attribute_stats(
     'stats_export_import.test'::regclass,
...

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/stats_export_import.out /tmp/cirrus-ci-build/build/testrun/recov...
--- /tmp/cirrus-ci-build/src/test/regress/expected/stats_export_import.out	2024-05-07 04:05:04.161578000 +0000
+++ /tmp/cirrus-ci-build/build/testrun/recovery/027_stream_regress/data/results/stats_export_import.out	2024-05-07 04:07...
@@ -366,7 +366,7 @@
  stats_export_import | test      | id      | f         |       0.5 |         2 |       -0.1 |                  |       ...
 (1 row)
 
--- warn: scalars can't have mcelem 
+-- warn: scalars can't have mcelem
 SELECT pg_catalog.pg_set_attribute_stats(
     'stats_export_import.test'::regclass,
     'id'::name,
@@ -419,7 +419,7 @@
  t
 (1 row)
 
--- ok: mcelem 
+-- ok: mcelem
 SELECT pg_catalog.pg_set_attribute_stats(
     'stats_export_import.test'::regclass,
...

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/stats_export_import.out /tmp/cirrus-ci-build/build/testrun/regre...
--- /tmp/cirrus-ci-build/src/test/regress/expected/stats_export_import.out	2024-05-07 04:05:04.161578000 +0000
+++ /tmp/cirrus-ci-build/build/testrun/regress/regress/results/stats_export_import.out	2024-05-07 04:06:37.253327000 +00...
@@ -366,7 +366,7 @@
  stats_export_import | test      | id      | f         |       0.5 |         2 |       -0.1 |                  |       ...
 (1 row)
 
--- warn: scalars can't have mcelem 
+-- warn: scalars can't have mcelem
 SELECT pg_catalog.pg_set_attribute_stats(
     'stats_export_import.test'::regclass,
     'id'::name,
@@ -419,7 +419,7 @@
  t
 (1 row)
 
--- ok: mcelem 
+-- ok: mcelem
 SELECT pg_catalog.pg_set_attribute_stats(
     'stats_export_import.test'::regclass,
...

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/stats_export_import.out /tmp/cirrus-ci-build/src/test/regress/re...
--- /tmp/cirrus-ci-build/src/test/regress/expected/stats_export_import.out	2024-05-07 04:04:29.975014591 +0000
+++ /tmp/cirrus-ci-build/src/test/regress/results/stats_export_import.out	2024-05-07 04:07:18.562885316 +0000
@@ -366,7 +366,7 @@
  stats_export_import | test      | id      | f         |       0.5 |         2 |       -0.1 |                  |       ...
 (1 row)
 
--- warn: scalars can't have mcelem 
+-- warn: scalars can't have mcelem
 SELECT pg_catalog.pg_set_attribute_stats(
     'stats_export_import.test'::regclass,
     'id'::name,
@@ -419,7 +419,7 @@
  t
 (1 row)
 
--- ok: mcelem 
+-- ok: mcelem
 SELECT pg_catalog.pg_set_attribute_stats(
     'stats_export_import.test'::regclass,
...

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/stats_export_import.out /tmp/cirrus-ci-build/build/testrun/pg_up...
--- /tmp/cirrus-ci-build/src/test/regress/expected/stats_export_import.out	2024-05-07 04:04:26.307734235 +0000
+++ /tmp/cirrus-ci-build/build/testrun/pg_upgrade/002_pg_upgrade/data/results/stats_export_import.out	2024-05-07 04:07:5...
@@ -366,7 +366,7 @@
  stats_export_import | test      | id      | f         |       0.5 |         2 |       -0.1 |                  |       ...
 (1 row)
 
--- warn: scalars can't have mcelem 
+-- warn: scalars can't have mcelem
 SELECT pg_catalog.pg_set_attribute_stats(
     'stats_export_import.test'::regclass,
     'id'::name,
@@ -419,7 +419,7 @@
  t
 (1 row)
 
--- ok: mcelem 
+-- ok: mcelem
 SELECT pg_catalog.pg_set_attribute_stats(
     'stats_export_import.test'::regclass,
...

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/stats_export_import.out /tmp/cirrus-ci-build/build/testrun/recov...
--- /tmp/cirrus-ci-build/src/test/regress/expected/stats_export_import.out	2024-05-07 04:04:26.307734235 +0000
+++ /tmp/cirrus-ci-build/build/testrun/recovery/027_stream_regress/data/results/stats_export_import.out	2024-05-07 04:08...
@@ -366,7 +366,7 @@
  stats_export_import | test      | id      | f         |       0.5 |         2 |       -0.1 |                  |       ...
 (1 row)
 
--- warn: scalars can't have mcelem 
+-- warn: scalars can't have mcelem
 SELECT pg_catalog.pg_set_attribute_stats(
     'stats_export_import.test'::regclass,
     'id'::name,
@@ -419,7 +419,7 @@
  t
 (1 row)
 
--- ok: mcelem 
+-- ok: mcelem
 SELECT pg_catalog.pg_set_attribute_stats(
     'stats_export_import.test'::regclass,
...

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/stats_export_import.out /tmp/cirrus-ci-build/build/testrun/regre...
--- /tmp/cirrus-ci-build/src/test/regress/expected/stats_export_import.out	2024-05-07 04:04:26.307734235 +0000
+++ /tmp/cirrus-ci-build/build/testrun/regress/regress/results/stats_export_import.out	2024-05-07 04:07:47.219572010 +00...
@@ -366,7 +366,7 @@
  stats_export_import | test      | id      | f         |       0.5 |         2 |       -0.1 |                  |       ...
 (1 row)
 
--- warn: scalars can't have mcelem 
+-- warn: scalars can't have mcelem
 SELECT pg_catalog.pg_set_attribute_stats(
     'stats_export_import.test'::regclass,
     'id'::name,
@@ -419,7 +419,7 @@
  t
 (1 row)
 
--- ok: mcelem 
+-- ok: mcelem
 SELECT pg_catalog.pg_set_attribute_stats(
     'stats_export_import.test'::regclass,
...

diff -U3 /Users/admin/pgsql/src/test/regress/expected/stats_export_import.out /Users/admin/pgsql/build/testrun/pg_upgrad...
--- /Users/admin/pgsql/src/test/regress/expected/stats_export_import.out	2024-05-07 04:04:25
+++ /Users/admin/pgsql/build/testrun/pg_upgrade/002_pg_upgrade/data/results/stats_export_import.out	2024-05-07 04:07:30
@@ -366,7 +366,7 @@
  stats_export_import | test      | id      | f         |       0.5 |         2 |       -0.1 |                  |       ...
 (1 row)
 
--- warn: scalars can't have mcelem 
+-- warn: scalars can't have mcelem
 SELECT pg_catalog.pg_set_attribute_stats(
     'stats_export_import.test'::regclass,
     'id'::name,
@@ -419,7 +419,7 @@
  t
 (1 row)
 
--- ok: mcelem 
+-- ok: mcelem
 SELECT pg_catalog.pg_set_attribute_stats(
     'stats_export_import.test'::regclass,
...

diff -U3 /Users/admin/pgsql/src/test/regress/expected/stats_export_import.out /Users/admin/pgsql/build/testrun/recovery/...
--- /Users/admin/pgsql/src/test/regress/expected/stats_export_import.out	2024-05-07 04:04:25
+++ /Users/admin/pgsql/build/testrun/recovery/027_stream_regress/data/results/stats_export_import.out	2024-05-07 04:08:0...
@@ -366,7 +366,7 @@
  stats_export_import | test      | id      | f         |       0.5 |         2 |       -0.1 |                  |       ...
 (1 row)
 
--- warn: scalars can't have mcelem 
+-- warn: scalars can't have mcelem
 SELECT pg_catalog.pg_set_attribute_stats(
     'stats_export_import.test'::regclass,
     'id'::name,
@@ -419,7 +419,7 @@
  t
 (1 row)
 
--- ok: mcelem 
+-- ok: mcelem
 SELECT pg_catalog.pg_set_attribute_stats(
     'stats_export_import.test'::regclass,
...

diff -U3 /Users/admin/pgsql/src/test/regress/expected/stats_export_import.out /Users/admin/pgsql/build/testrun/regress/r...
--- /Users/admin/pgsql/src/test/regress/expected/stats_export_import.out	2024-05-07 04:04:25
+++ /Users/admin/pgsql/build/testrun/regress/regress/results/stats_export_import.out	2024-05-07 04:07:28
@@ -366,7 +366,7 @@
  stats_export_import | test      | id      | f         |       0.5 |         2 |       -0.1 |                  |       ...
 (1 row)
 
--- warn: scalars can't have mcelem 
+-- warn: scalars can't have mcelem
 SELECT pg_catalog.pg_set_attribute_stats(
     'stats_export_import.test'::regclass,
     'id'::name,
@@ -419,7 +419,7 @@
  t
 (1 row)
 
--- ok: mcelem 
+-- ok: mcelem
 SELECT pg_catalog.pg_set_attribute_stats(
     'stats_export_import.test'::regclass,
...

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/constraints.out /tmp/cirrus-ci-build/build/testrun/pg_upgrade/00...
--- /tmp/cirrus-ci-build/src/test/regress/expected/constraints.out	2024-05-07 01:31:53.169878000 +0000
+++ /tmp/cirrus-ci-build/build/testrun/pg_upgrade/002_pg_upgrade/data/results/constraints.out	2024-05-07 01:33:12.512687...
@@ -1190,118 +1190,10 @@
 CREATE TABLE notnull_tbl4_cld2 (PRIMARY KEY (a) DEFERRABLE) INHERITS (notnull_tbl4);
 CREATE TABLE notnull_tbl4_cld3 (PRIMARY KEY (a) DEFERRABLE, CONSTRAINT a_nn NOT NULL a) INHERITS (notnull_tbl4);
 \d+ notnull_tbl4
-                               Table "public.notnull_tbl4"
- Column |  Type   | Collation | Nullable | Default | Storage | Stats target | Description 
---------+---------+-----------+----------+---------+---------+--------------+-------------
- a      | integer |           | not null |         | plain   |              | 
-Indexes:
-    "notnull_tbl4_pkey" PRIMARY KEY, btree (a) DEFERRABLE INITIALLY DEFERRED
-Child tables: notnull_tbl4_cld,
-              notnull_tbl4_cld2,
-              notnull_tbl4_cld3
-
-\d+ notnull_tbl4_lk
-                              Table "public.notnull_tbl4_lk"
- Column |  Type   | Collation | Nullable | Default | Storage | Stats target | Description 
...

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/constraints.out /tmp/cirrus-ci-build/build/testrun/recovery/027_...
--- /tmp/cirrus-ci-build/src/test/regress/expected/constraints.out	2024-05-07 01:31:53.169878000 +0000
+++ /tmp/cirrus-ci-build/build/testrun/recovery/027_stream_regress/data/results/constraints.out	2024-05-07 01:33:33.4161...
@@ -1150,158 +1150,10 @@
 create table cnn2_part1 (a int unique);
 alter table cnn2_parted attach partition cnn2_part1 for values in (1);
 \d+ cnn2_part1
-                                Table "public.cnn2_part1"
- Column |  Type   | Collation | Nullable | Default | Storage | Stats target | Description 
---------+---------+-----------+----------+---------+---------+--------------+-------------
- a      | integer |           | not null |         | plain   |              | 
-Partition of: cnn2_parted FOR VALUES IN (1)
-Partition constraint: ((a IS NOT NULL) AND (a = 1))
-Indexes:
-    "cnn2_part1_pkey" PRIMARY KEY, btree (a)
-    "cnn2_part1_a_key" UNIQUE CONSTRAINT, btree (a)
-
-drop table cnn2_parted;
--- ensure columns in partitions are marked not-null
-create table cnn2_parted(a int primary key) partition by list (a);
...

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/constraints.out /tmp/cirrus-ci-build/build/testrun/regress/regre...
--- /tmp/cirrus-ci-build/src/test/regress/expected/constraints.out	2024-05-07 01:31:53.169878000 +0000
+++ /tmp/cirrus-ci-build/build/testrun/regress/regress/results/constraints.out	2024-05-07 01:33:09.464686000 +0000
@@ -1217,91 +1217,10 @@
     "notnull_tbl4_lk2_pkey" PRIMARY KEY, btree (a) DEFERRABLE INITIALLY DEFERRED
 
 \d+ notnull_tbl4_lk3
-                             Table "public.notnull_tbl4_lk3"
- Column |  Type   | Collation | Nullable | Default | Storage | Stats target | Description 
---------+---------+-----------+----------+---------+---------+--------------+-------------
- a      | integer |           | not null |         | plain   |              | 
-Indexes:
-    "notnull_tbl4_lk3_pkey" PRIMARY KEY, btree (a) DEFERRABLE INITIALLY DEFERRED
-Not-null constraints:
-    "a_nn" NOT NULL "a"
-
-\d+ notnull_tbl4_cld
-                             Table "public.notnull_tbl4_cld"
- Column |  Type   | Collation | Nullable | Default | Storage | Stats target | Description 
---------+---------+-----------+----------+---------+---------+--------------+-------------
...

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/triggers.out /tmp/cirrus-ci-build/src/bin/pg_upgrade/tmp_check/r...
--- /tmp/cirrus-ci-build/src/test/regress/expected/triggers.out	2024-05-07 01:31:25.538668907 +0000
+++ /tmp/cirrus-ci-build/src/bin/pg_upgrade/tmp_check/results/triggers.out	2024-05-07 01:34:58.454531268 +0000
@@ -2652,1095 +2652,10 @@
 create table parted_trigger (a int, b text) partition by range (a);
 create table parted_trigger_1 partition of parted_trigger for values from (0) to (1000);
 create table parted_trigger_2 (drp int, a int, b text);
-alter table parted_trigger_2 drop column drp;
-alter table parted_trigger attach partition parted_trigger_2 for values from (1000) to (2000);
-create constraint trigger parted_trigger after update on parted_trigger
-  from parted_referenced
-  for each row execute procedure trigger_notice_ab();
-create constraint trigger parted_trigger after update on unparted_trigger
-  from parted_referenced
-  for each row execute procedure trigger_notice_ab();
-create table parted_trigger_3 (b text, a int) partition by range (length(b));
-create table parted_trigger_3_1 partition of parted_trigger_3 for values from (1) to (3);
-create table parted_trigger_3_2 partition of parted_trigger_3 for values from (3) to (5);
-alter table parted_trigger attach partition parted_trigger_3 for values from (2000) to (3000);
-select tgname, conname, t.tgrelid::regclass, t.tgconstrrelid::regclass,
...

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/triggers.out /tmp/cirrus-ci-build/src/test/regress/results/trigg...
--- /tmp/cirrus-ci-build/src/test/regress/expected/triggers.out	2024-05-07 01:31:25.538668907 +0000
+++ /tmp/cirrus-ci-build/src/test/regress/results/triggers.out	2024-05-07 01:34:01.582577855 +0000
@@ -2701,1046 +2701,10 @@
 NOTICE:  trigger parted_trigger on parted_trigger_3_1 AFTER UPDATE for ROW: (a,b)=(2002,eb)
 NOTICE:  trigger parted_trigger on parted_trigger_3_2 AFTER UPDATE for ROW: (a,b)=(2003,eeeeb)
 drop table parted_trigger;
-drop function trigger_notice_ab();
--- Make sure we don't end up with unnecessary copies of triggers, when
--- cloning them.
-create table trg_clone (a int) partition by range (a);
-create table trg_clone1 partition of trg_clone for values from (0) to (1000);
-alter table trg_clone add constraint uniq unique (a) deferrable;
-create table trg_clone2 partition of trg_clone for values from (1000) to (2000);
-create table trg_clone3 partition of trg_clone for values from (2000) to (3000)
-  partition by range (a);
-create table trg_clone_3_3 partition of trg_clone3 for values from (2000) to (2100);
-select tgrelid::regclass, count(*) from pg_trigger
-  where tgrelid::regclass in ('trg_clone', 'trg_clone1', 'trg_clone2',
-	'trg_clone3', 'trg_clone_3_3')
...

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/triggers.out /tmp/cirrus-ci-build/build/testrun/pg_upgrade/002_p...
--- /tmp/cirrus-ci-build/src/test/regress/expected/triggers.out	2024-05-07 01:31:23.657362987 +0000
+++ /tmp/cirrus-ci-build/build/testrun/pg_upgrade/002_pg_upgrade/data/results/triggers.out	2024-05-07 01:34:25.769231176...
@@ -2326,1421 +2326,7 @@
 drop table parted_stmt_trig, parted2_stmt_trig;
 -- Verify that triggers fire in alphabetical order
 create table parted_trig (a int) partition by range (a);
-create table parted_trig_1 partition of parted_trig for values from (0) to (1000)
-   partition by range (a);
-create table parted_trig_1_1 partition of parted_trig_1 for values from (0) to (100);
-create table parted_trig_2 partition of parted_trig for values from (1000) to (2000);
-create trigger zzz after insert on parted_trig for each row execute procedure trigger_notice();
-create trigger mmm after insert on parted_trig_1_1 for each row execute procedure trigger_notice();
-create trigger aaa after insert on parted_trig_1 for each row execute procedure trigger_notice();
-create trigger bbb after insert on parted_trig for each row execute procedure trigger_notice();
-create trigger qqq after insert on parted_trig_1_1 for each row execute procedure trigger_notice();
-insert into parted_trig values (50), (1500);
-NOTICE:  trigger aaa on parted_trig_1_1 AFTER INSERT for ROW
-NOTICE:  trigger bbb on parted_trig_1_1 AFTER INSERT for ROW
-NOTICE:  trigger mmm on parted_trig_1_1 AFTER INSERT for ROW
...

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/constraints.out /tmp/cirrus-ci-build/build/testrun/recovery/027_...
--- /tmp/cirrus-ci-build/src/test/regress/expected/constraints.out	2024-05-07 01:31:23.573363065 +0000
+++ /tmp/cirrus-ci-build/build/testrun/recovery/027_stream_regress/data/results/constraints.out	2024-05-07 01:34:48.8132...
@@ -916,392 +916,10 @@
 ALTER TABLE notnull_tbl1 ALTER a DROP NOT NULL;
 ALTER TABLE notnull_tbl1 ADD CONSTRAINT foobar NOT NULL a;
 \d notnull_tbl1
-            Table "public.notnull_tbl1"
- Column |  Type   | Collation | Nullable | Default 
---------+---------+-----------+----------+---------
- a      | integer |           | not null | 
-
-select conname, contype, conkey from pg_constraint where conrelid = 'notnull_tbl1'::regclass;
- conname | contype | conkey 
----------+---------+--------
- foobar  | n       | {1}
-(1 row)
-
-DROP TABLE notnull_tbl1;
--- nope
...

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/triggers.out /tmp/cirrus-ci-build/build/testrun/regress/regress/...
--- /tmp/cirrus-ci-build/src/test/regress/expected/triggers.out	2024-05-07 01:31:23.657362987 +0000
+++ /tmp/cirrus-ci-build/build/testrun/regress/regress/results/triggers.out	2024-05-07 01:34:21.413234078 +0000
@@ -2499,1248 +2499,10 @@
   return new;
 end;
 $$;
-insert into parted values (1, 1, 'uno uno');       -- works
-update parted set c = c || ' v6';                   -- works
-select tableoid::regclass, * from parted;
-  tableoid  | a | b |                c                 
-------------+---+---+----------------------------------
- parted_1_1 | 1 | 1 | uno uno v1 v6 did UPDATE
- parted_1_1 | 1 | 1 | uno uno did INSERT v6 did UPDATE
-(2 rows)
-
--- update itself moves tuple to new partition; trigger still works
-truncate table parted;
-create table parted_2 partition of parted for values in (2);
-insert into parted values (1, 1, 'uno uno v5');
...

diff -w -U3 C:/cirrus/src/test/regress/expected/updatable_views.out C:/cirrus/build/testrun/pg_upgrade/002_pg_upgrade/da...
--- C:/cirrus/src/test/regress/expected/updatable_views.out	2024-05-07 01:31:32.653027300 +0000
+++ C:/cirrus/build/testrun/pg_upgrade/002_pg_upgrade/data/results/updatable_views.out	2024-05-07 01:33:59.779676200 +00...
@@ -1155,2847 +1155,7 @@
   WHEN MATCHED THEN UPDATE SET b = s.b
   WHEN NOT MATCHED AND s.a > 0 THEN INSERT VALUES (s.a, s.b)
   RETURNING merge_action(), s.*, t.*;
- merge_action | a | b  | a |   b   
---------------+---+----+---+-------
- DELETE       | 1 | R1 | 1 | Row 1
- UPDATE       | 2 | R2 | 2 | R2
- INSERT       | 3 | R3 | 3 | R3
-(3 rows)
-
-SELECT * FROM base_tbl ORDER BY a;
- a  |   b    
-----+--------
- -2 | Row -2
- -1 | Row -1
-  0 | Row 0
...

diff -w -U3 C:/cirrus/src/test/regress/expected/updatable_views.out C:/cirrus/build/testrun/recovery/027_stream_regress/...
--- C:/cirrus/src/test/regress/expected/updatable_views.out	2024-05-07 01:31:32.653027300 +0000
+++ C:/cirrus/build/testrun/recovery/027_stream_regress/data/results/updatable_views.out	2024-05-07 01:35:52.372107600 +...
@@ -1155,2847 +1155,7 @@
   WHEN MATCHED THEN UPDATE SET b = s.b
   WHEN NOT MATCHED AND s.a > 0 THEN INSERT VALUES (s.a, s.b)
   RETURNING merge_action(), s.*, t.*;
- merge_action | a | b  | a |   b   
---------------+---+----+---+-------
- DELETE       | 1 | R1 | 1 | Row 1
- UPDATE       | 2 | R2 | 2 | R2
- INSERT       | 3 | R3 | 3 | R3
-(3 rows)
-
-SELECT * FROM base_tbl ORDER BY a;
- a  |   b    
-----+--------
- -2 | Row -2
- -1 | Row -1
-  0 | Row 0
...

diff -w -U3 C:/cirrus/src/test/regress/expected/updatable_views.out C:/cirrus/build/testrun/regress/regress/results/upda...
--- C:/cirrus/src/test/regress/expected/updatable_views.out	2024-05-07 01:31:32.653027300 +0000
+++ C:/cirrus/build/testrun/regress/regress/results/updatable_views.out	2024-05-07 01:33:59.451550600 +0000
@@ -1155,2847 +1155,7 @@
   WHEN MATCHED THEN UPDATE SET b = s.b
   WHEN NOT MATCHED AND s.a > 0 THEN INSERT VALUES (s.a, s.b)
   RETURNING merge_action(), s.*, t.*;
- merge_action | a | b  | a |   b   
---------------+---+----+---+-------
- DELETE       | 1 | R1 | 1 | Row 1
- UPDATE       | 2 | R2 | 2 | R2
- INSERT       | 3 | R3 | 3 | R3
-(3 rows)
-
-SELECT * FROM base_tbl ORDER BY a;
- a  |   b    
-----+--------
- -2 | Row -2
- -1 | Row -1
-  0 | Row 0
...

diff -U3 /Users/admin/pgsql/src/test/regress/expected/updatable_views.out /Users/admin/pgsql/build/testrun/pg_upgrade/00...
--- /Users/admin/pgsql/src/test/regress/expected/updatable_views.out	2024-05-07 01:31:00
+++ /Users/admin/pgsql/build/testrun/pg_upgrade/002_pg_upgrade/data/results/updatable_views.out	2024-05-07 01:34:21
@@ -1152,2850 +1152,10 @@
 MERGE INTO rw_view2 t
   USING (SELECT x, 'R'||x FROM generate_series(0,3) x) AS s(a,b) ON t.a = s.a
   WHEN MATCHED AND t.a <= 1 THEN DELETE
-  WHEN MATCHED THEN UPDATE SET b = s.b
-  WHEN NOT MATCHED AND s.a > 0 THEN INSERT VALUES (s.a, s.b)
-  RETURNING merge_action(), s.*, t.*;
- merge_action | a | b  | a |   b   
---------------+---+----+---+-------
- DELETE       | 1 | R1 | 1 | Row 1
- UPDATE       | 2 | R2 | 2 | R2
- INSERT       | 3 | R3 | 3 | R3
-(3 rows)
-
-SELECT * FROM base_tbl ORDER BY a;
- a  |   b    
-----+--------
...

diff -U3 /Users/admin/pgsql/src/test/regress/expected/updatable_views.out /Users/admin/pgsql/build/testrun/recovery/027_...
--- /Users/admin/pgsql/src/test/regress/expected/updatable_views.out	2024-05-07 01:31:00
+++ /Users/admin/pgsql/build/testrun/recovery/027_stream_regress/data/results/updatable_views.out	2024-05-07 01:34:28
@@ -1152,2850 +1152,10 @@
 MERGE INTO rw_view2 t
   USING (SELECT x, 'R'||x FROM generate_series(0,3) x) AS s(a,b) ON t.a = s.a
   WHEN MATCHED AND t.a <= 1 THEN DELETE
-  WHEN MATCHED THEN UPDATE SET b = s.b
-  WHEN NOT MATCHED AND s.a > 0 THEN INSERT VALUES (s.a, s.b)
-  RETURNING merge_action(), s.*, t.*;
- merge_action | a | b  | a |   b   
---------------+---+----+---+-------
- DELETE       | 1 | R1 | 1 | Row 1
- UPDATE       | 2 | R2 | 2 | R2
- INSERT       | 3 | R3 | 3 | R3
-(3 rows)
-
-SELECT * FROM base_tbl ORDER BY a;
- a  |   b    
-----+--------
...

diff -U3 /Users/admin/pgsql/src/test/regress/expected/updatable_views.out /Users/admin/pgsql/build/testrun/regress/regre...
--- /Users/admin/pgsql/src/test/regress/expected/updatable_views.out	2024-05-07 01:31:00
+++ /Users/admin/pgsql/build/testrun/regress/regress/results/updatable_views.out	2024-05-07 01:34:21
@@ -1152,2850 +1152,10 @@
 MERGE INTO rw_view2 t
   USING (SELECT x, 'R'||x FROM generate_series(0,3) x) AS s(a,b) ON t.a = s.a
   WHEN MATCHED AND t.a <= 1 THEN DELETE
-  WHEN MATCHED THEN UPDATE SET b = s.b
-  WHEN NOT MATCHED AND s.a > 0 THEN INSERT VALUES (s.a, s.b)
-  RETURNING merge_action(), s.*, t.*;
- merge_action | a | b  | a |   b   
---------------+---+----+---+-------
- DELETE       | 1 | R1 | 1 | Row 1
- UPDATE       | 2 | R2 | 2 | R2
- INSERT       | 3 | R3 | 3 | R3
-(3 rows)
-
-SELECT * FROM base_tbl ORDER BY a;
- a  |   b    
-----+--------
...

diff -U3 /tmp/cirrus-ci-build/contrib/postgres_fdw/expected/postgres_fdw.out /tmp/cirrus-ci-build/build/testrun/postgres...
--- /tmp/cirrus-ci-build/contrib/postgres_fdw/expected/postgres_fdw.out	2024-05-06 17:56:17.127923938 +0000
+++ /tmp/cirrus-ci-build/build/testrun/postgres_fdw/regress/results/postgres_fdw.out	2024-05-06 18:02:15.711653494 +0000
@@ -2754,6 +2754,7 @@
 SET LOCAL statement_timeout = '10ms';
 select count(*) from ft1 CROSS JOIN ft2 CROSS JOIN ft4 CROSS JOIN ft5; -- this takes very long
 ERROR:  canceling statement due to statement timeout
+WARNING:  could not get result of cancel request due to timeout
 COMMIT;
 -- ====================================================================
 -- Check that userid to use when querying the remote table is correctly

diff -U3 /Users/admin/pgsql/src/test/regress/expected/incremental_matview.out /Users/admin/pgsql/build/testrun/pg_upgrad...
--- /Users/admin/pgsql/src/test/regress/expected/incremental_matview.out	2024-05-06 15:02:29
+++ /Users/admin/pgsql/build/testrun/pg_upgrade/002_pg_upgrade/data/results/incremental_matview.out	2024-05-06 15:05:43
@@ -601,17 +601,9 @@
 INSERT INTO base_s VALUES (1, 100), (2, 200), (3, 300);
 CREATE INCREMENTAL MATERIALIZED VIEW mv(v1, v2) AS
  SELECT r.v, s.v FROM base_r AS r JOIN base_s AS s USING(i);
-NOTICE:  could not create an index on materialized view "mv" automatically
-DETAIL:  This target list does not have all the primary key columns, or this view does not contain GROUP BY or DISTINCT...
-HINT:  Create an index on the materialized view for efficient incremental maintenance.
+ERROR:  relation "mv" already exists
 SELECT * FROM mv ORDER BY v1;
- v1 | v2  
-----+-----
- 10 | 100
- 20 | 200
- 30 | 300
-(3 rows)
-
+ERROR:  current transaction is aborted, commands ignored until end of transaction block
...

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/sysviews.out /tmp/cirrus-ci-build/build/testrun/pg_upgrade/002_p...
--- /tmp/cirrus-ci-build/src/test/regress/expected/sysviews.out	2024-05-06 10:48:16.496430000 +0000
+++ /tmp/cirrus-ci-build/build/testrun/pg_upgrade/002_pg_upgrade/data/results/sysviews.out	2024-05-06 10:50:01.772601000...
@@ -157,7 +157,8 @@
  enable_seqscan                 | on
  enable_sort                    | on
  enable_tidscan                 | on
-(23 rows)
+ enable_toast_cache             | off
+(24 rows)
 
 -- There are always wait event descriptions for various types.
 select type, count(*) > 0 as ok FROM pg_wait_events

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/sysviews.out /tmp/cirrus-ci-build/build/testrun/recovery/027_str...
--- /tmp/cirrus-ci-build/src/test/regress/expected/sysviews.out	2024-05-06 10:48:16.496430000 +0000
+++ /tmp/cirrus-ci-build/build/testrun/recovery/027_stream_regress/data/results/sysviews.out	2024-05-06 10:50:36.8168750...
@@ -157,7 +157,8 @@
  enable_seqscan                 | on
  enable_sort                    | on
  enable_tidscan                 | on
-(23 rows)
+ enable_toast_cache             | off
+(24 rows)
 
 -- There are always wait event descriptions for various types.
 select type, count(*) > 0 as ok FROM pg_wait_events

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/sysviews.out /tmp/cirrus-ci-build/build/testrun/regress/regress/...
--- /tmp/cirrus-ci-build/src/test/regress/expected/sysviews.out	2024-05-06 10:48:16.496430000 +0000
+++ /tmp/cirrus-ci-build/build/testrun/regress/regress/results/sysviews.out	2024-05-06 10:49:59.181968000 +0000
@@ -157,7 +157,8 @@
  enable_seqscan                 | on
  enable_sort                    | on
  enable_tidscan                 | on
-(23 rows)
+ enable_toast_cache             | off
+(24 rows)
 
 -- There are always wait event descriptions for various types.
 select type, count(*) > 0 as ok FROM pg_wait_events

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/sysviews.out /tmp/cirrus-ci-build/src/bin/pg_upgrade/tmp_check/r...
--- /tmp/cirrus-ci-build/src/test/regress/expected/sysviews.out	2024-05-06 10:48:20.247369663 +0000
+++ /tmp/cirrus-ci-build/src/bin/pg_upgrade/tmp_check/results/sysviews.out	2024-05-06 10:53:23.031143425 +0000
@@ -157,7 +157,8 @@
  enable_seqscan                 | on
  enable_sort                    | on
  enable_tidscan                 | on
-(23 rows)
+ enable_toast_cache             | off
+(24 rows)
 
 -- There are always wait event descriptions for various types.
 select type, count(*) > 0 as ok FROM pg_wait_events

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/sysviews.out /tmp/cirrus-ci-build/src/test/regress/results/sysvi...
--- /tmp/cirrus-ci-build/src/test/regress/expected/sysviews.out	2024-05-06 10:48:20.247369663 +0000
+++ /tmp/cirrus-ci-build/src/test/regress/results/sysviews.out	2024-05-06 10:52:00.471191565 +0000
@@ -157,7 +157,8 @@
  enable_seqscan                 | on
  enable_sort                    | on
  enable_tidscan                 | on
-(23 rows)
+ enable_toast_cache             | off
+(24 rows)
 
 -- There are always wait event descriptions for various types.
 select type, count(*) > 0 as ok FROM pg_wait_events

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/sysviews.out /tmp/cirrus-ci-build/build/testrun/pg_upgrade/002_p...
--- /tmp/cirrus-ci-build/src/test/regress/expected/sysviews.out	2024-05-06 10:48:16.672379928 +0000
+++ /tmp/cirrus-ci-build/build/testrun/pg_upgrade/002_pg_upgrade/data/results/sysviews.out	2024-05-06 10:52:08.696222001...
@@ -157,7 +157,8 @@
  enable_seqscan                 | on
  enable_sort                    | on
  enable_tidscan                 | on
-(23 rows)
+ enable_toast_cache             | off
+(24 rows)
 
 -- There are always wait event descriptions for various types.
 select type, count(*) > 0 as ok FROM pg_wait_events

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/sysviews.out /tmp/cirrus-ci-build/build/testrun/recovery/027_str...
--- /tmp/cirrus-ci-build/src/test/regress/expected/sysviews.out	2024-05-06 10:48:16.672379928 +0000
+++ /tmp/cirrus-ci-build/build/testrun/recovery/027_stream_regress/data/results/sysviews.out	2024-05-06 10:52:44.0641918...
@@ -157,7 +157,8 @@
  enable_seqscan                 | on
  enable_sort                    | on
  enable_tidscan                 | on
-(23 rows)
+ enable_toast_cache             | off
+(24 rows)
 
 -- There are always wait event descriptions for various types.
 select type, count(*) > 0 as ok FROM pg_wait_events

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/sysviews.out /tmp/cirrus-ci-build/build/testrun/regress/regress/...
--- /tmp/cirrus-ci-build/src/test/regress/expected/sysviews.out	2024-05-06 10:48:16.672379928 +0000
+++ /tmp/cirrus-ci-build/build/testrun/regress/regress/results/sysviews.out	2024-05-06 10:52:06.784223835 +0000
@@ -157,7 +157,8 @@
  enable_seqscan                 | on
  enable_sort                    | on
  enable_tidscan                 | on
-(23 rows)
+ enable_toast_cache             | off
+(24 rows)
 
 -- There are always wait event descriptions for various types.
 select type, count(*) > 0 as ok FROM pg_wait_events

diff -w -U3 C:/cirrus/src/test/regress/expected/sysviews.out C:/cirrus/build/testrun/pg_upgrade/002_pg_upgrade/data/resu...
--- C:/cirrus/src/test/regress/expected/sysviews.out	2024-05-06 10:48:38.821724700 +0000
+++ C:/cirrus/build/testrun/pg_upgrade/002_pg_upgrade/data/results/sysviews.out	2024-05-06 10:52:02.856768300 +0000
@@ -157,7 +157,8 @@
  enable_seqscan                 | on
  enable_sort                    | on
  enable_tidscan                 | on
-(23 rows)
+ enable_toast_cache             | off
+(24 rows)
 
 -- There are always wait event descriptions for various types.
 select type, count(*) > 0 as ok FROM pg_wait_events

diff -w -U3 C:/cirrus/src/test/regress/expected/sysviews.out C:/cirrus/build/testrun/recovery/027_stream_regress/data/re...
--- C:/cirrus/src/test/regress/expected/sysviews.out	2024-05-06 10:48:38.821724700 +0000
+++ C:/cirrus/build/testrun/recovery/027_stream_regress/data/results/sysviews.out	2024-05-06 10:54:31.086249100 +0000
@@ -157,7 +157,8 @@
  enable_seqscan                 | on
  enable_sort                    | on
  enable_tidscan                 | on
-(23 rows)
+ enable_toast_cache             | off
+(24 rows)
 
 -- There are always wait event descriptions for various types.
 select type, count(*) > 0 as ok FROM pg_wait_events

diff -w -U3 C:/cirrus/src/test/regress/expected/sysviews.out C:/cirrus/build/testrun/regress/regress/results/sysviews.ou...
--- C:/cirrus/src/test/regress/expected/sysviews.out	2024-05-06 10:48:38.821724700 +0000
+++ C:/cirrus/build/testrun/regress/regress/results/sysviews.out	2024-05-06 10:51:58.867022700 +0000
@@ -157,7 +157,8 @@
  enable_seqscan                 | on
  enable_sort                    | on
  enable_tidscan                 | on
-(23 rows)
+ enable_toast_cache             | off
+(24 rows)
 
 -- There are always wait event descriptions for various types.
 select type, count(*) > 0 as ok FROM pg_wait_events

diff -U3 /Users/admin/pgsql/src/test/regress/expected/sysviews.out /Users/admin/pgsql/build/testrun/pg_upgrade/002_pg_up...
--- /Users/admin/pgsql/src/test/regress/expected/sysviews.out	2024-05-06 10:48:09
+++ /Users/admin/pgsql/build/testrun/pg_upgrade/002_pg_upgrade/data/results/sysviews.out	2024-05-06 10:51:40
@@ -157,7 +157,8 @@
  enable_seqscan                 | on
  enable_sort                    | on
  enable_tidscan                 | on
-(23 rows)
+ enable_toast_cache             | off
+(24 rows)
 
 -- There are always wait event descriptions for various types.
 select type, count(*) > 0 as ok FROM pg_wait_events

diff -U3 /Users/admin/pgsql/src/test/regress/expected/sysviews.out /Users/admin/pgsql/build/testrun/recovery/027_stream_...
--- /Users/admin/pgsql/src/test/regress/expected/sysviews.out	2024-05-06 10:48:09
+++ /Users/admin/pgsql/build/testrun/recovery/027_stream_regress/data/results/sysviews.out	2024-05-06 10:52:22
@@ -157,7 +157,8 @@
  enable_seqscan                 | on
  enable_sort                    | on
  enable_tidscan                 | on
-(23 rows)
+ enable_toast_cache             | off
+(24 rows)
 
 -- There are always wait event descriptions for various types.
 select type, count(*) > 0 as ok FROM pg_wait_events

diff -U3 /Users/admin/pgsql/src/test/regress/expected/sysviews.out /Users/admin/pgsql/build/testrun/regress/regress/resu...
--- /Users/admin/pgsql/src/test/regress/expected/sysviews.out	2024-05-06 10:48:09
+++ /Users/admin/pgsql/build/testrun/regress/regress/results/sysviews.out	2024-05-06 10:51:40
@@ -157,7 +157,8 @@
  enable_seqscan                 | on
  enable_sort                    | on
  enable_tidscan                 | on
-(23 rows)
+ enable_toast_cache             | off
+(24 rows)
 
 -- There are always wait event descriptions for various types.
 select type, count(*) > 0 as ok FROM pg_wait_events

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/create_index.out /tmp/cirrus-ci-build/build/testrun/pg_upgrade/0...
--- /tmp/cirrus-ci-build/src/test/regress/expected/create_index.out	2024-05-06 06:09:59.451325000 +0000
+++ /tmp/cirrus-ci-build/build/testrun/pg_upgrade/002_pg_upgrade/data/results/create_index.out	2024-05-06 06:11:05.72891...
@@ -2135,11 +2135,19 @@
 --
 explain (costs off)
 SELECT unique1 FROM tenk1 WHERE unique1 IN (1, 42, 7) and unique1 = ANY('{7, 8, 9}');
-                                             QUERY PLAN                                             
-----------------------------------------------------------------------------------------------------
- Index Only Scan using tenk1_unique1 on tenk1
-   Index Cond: ((unique1 = ANY ('{1,42,7}'::integer[])) AND (unique1 = ANY ('{7,8,9}'::integer[])))
-(2 rows)
+                            QUERY PLAN                             
+-------------------------------------------------------------------
+ Bitmap Heap Scan on tenk1
+   Recheck Cond: ((unique1 = 7) OR (unique1 = 8) OR (unique1 = 9))
+   Filter: (unique1 = ANY ('{1,42,7}'::integer[]))
+   ->  BitmapOr
+         ->  Bitmap Index Scan on tenk1_unique1
+               Index Cond: (unique1 = 7)
...

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/create_index.out /tmp/cirrus-ci-build/build/testrun/recovery/027...
--- /tmp/cirrus-ci-build/src/test/regress/expected/create_index.out	2024-05-06 06:09:59.451325000 +0000
+++ /tmp/cirrus-ci-build/build/testrun/recovery/027_stream_regress/data/results/create_index.out	2024-05-06 06:11:31.513...
@@ -2135,11 +2135,19 @@
 --
 explain (costs off)
 SELECT unique1 FROM tenk1 WHERE unique1 IN (1, 42, 7) and unique1 = ANY('{7, 8, 9}');
-                                             QUERY PLAN                                             
-----------------------------------------------------------------------------------------------------
- Index Only Scan using tenk1_unique1 on tenk1
-   Index Cond: ((unique1 = ANY ('{1,42,7}'::integer[])) AND (unique1 = ANY ('{7,8,9}'::integer[])))
-(2 rows)
+                            QUERY PLAN                             
+-------------------------------------------------------------------
+ Bitmap Heap Scan on tenk1
+   Recheck Cond: ((unique1 = 7) OR (unique1 = 8) OR (unique1 = 9))
+   Filter: (unique1 = ANY ('{1,42,7}'::integer[]))
+   ->  BitmapOr
+         ->  Bitmap Index Scan on tenk1_unique1
+               Index Cond: (unique1 = 7)
...

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/create_index.out /tmp/cirrus-ci-build/build/testrun/regress/regr...
--- /tmp/cirrus-ci-build/src/test/regress/expected/create_index.out	2024-05-06 06:09:59.451325000 +0000
+++ /tmp/cirrus-ci-build/build/testrun/regress/regress/results/create_index.out	2024-05-06 06:11:02.525969000 +0000
@@ -2135,11 +2135,19 @@
 --
 explain (costs off)
 SELECT unique1 FROM tenk1 WHERE unique1 IN (1, 42, 7) and unique1 = ANY('{7, 8, 9}');
-                                             QUERY PLAN                                             
-----------------------------------------------------------------------------------------------------
- Index Only Scan using tenk1_unique1 on tenk1
-   Index Cond: ((unique1 = ANY ('{1,42,7}'::integer[])) AND (unique1 = ANY ('{7,8,9}'::integer[])))
-(2 rows)
+                            QUERY PLAN                             
+-------------------------------------------------------------------
+ Bitmap Heap Scan on tenk1
+   Recheck Cond: ((unique1 = 7) OR (unique1 = 8) OR (unique1 = 9))
+   Filter: (unique1 = ANY ('{1,42,7}'::integer[]))
+   ->  BitmapOr
+         ->  Bitmap Index Scan on tenk1_unique1
+               Index Cond: (unique1 = 7)
...

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/create_index.out /tmp/cirrus-ci-build/src/bin/pg_upgrade/tmp_che...
--- /tmp/cirrus-ci-build/src/test/regress/expected/create_index.out	2024-05-06 06:09:54.156575551 +0000
+++ /tmp/cirrus-ci-build/src/bin/pg_upgrade/tmp_check/results/create_index.out	2024-05-06 06:13:45.828185038 +0000
@@ -2135,11 +2135,19 @@
 --
 explain (costs off)
 SELECT unique1 FROM tenk1 WHERE unique1 IN (1, 42, 7) and unique1 = ANY('{7, 8, 9}');
-                                             QUERY PLAN                                             
-----------------------------------------------------------------------------------------------------
- Index Only Scan using tenk1_unique1 on tenk1
-   Index Cond: ((unique1 = ANY ('{1,42,7}'::integer[])) AND (unique1 = ANY ('{7,8,9}'::integer[])))
-(2 rows)
+                            QUERY PLAN                             
+-------------------------------------------------------------------
+ Bitmap Heap Scan on tenk1
+   Recheck Cond: ((unique1 = 7) OR (unique1 = 8) OR (unique1 = 9))
+   Filter: (unique1 = ANY ('{1,42,7}'::integer[]))
+   ->  BitmapOr
+         ->  Bitmap Index Scan on tenk1_unique1
+               Index Cond: (unique1 = 7)
...

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/create_index.out /tmp/cirrus-ci-build/src/test/recovery/tmp_chec...
--- /tmp/cirrus-ci-build/src/test/regress/expected/create_index.out	2024-05-06 06:09:54.156575551 +0000
+++ /tmp/cirrus-ci-build/src/test/recovery/tmp_check/results/create_index.out	2024-05-06 06:15:02.692063144 +0000
@@ -2135,11 +2135,19 @@
 --
 explain (costs off)
 SELECT unique1 FROM tenk1 WHERE unique1 IN (1, 42, 7) and unique1 = ANY('{7, 8, 9}');
-                                             QUERY PLAN                                             
-----------------------------------------------------------------------------------------------------
- Index Only Scan using tenk1_unique1 on tenk1
-   Index Cond: ((unique1 = ANY ('{1,42,7}'::integer[])) AND (unique1 = ANY ('{7,8,9}'::integer[])))
-(2 rows)
+                            QUERY PLAN                             
+-------------------------------------------------------------------
+ Bitmap Heap Scan on tenk1
+   Recheck Cond: ((unique1 = 7) OR (unique1 = 8) OR (unique1 = 9))
+   Filter: (unique1 = ANY ('{1,42,7}'::integer[]))
+   ->  BitmapOr
+         ->  Bitmap Index Scan on tenk1_unique1
+               Index Cond: (unique1 = 7)
...

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/create_index.out /tmp/cirrus-ci-build/src/test/regress/results/c...
--- /tmp/cirrus-ci-build/src/test/regress/expected/create_index.out	2024-05-06 06:09:54.156575551 +0000
+++ /tmp/cirrus-ci-build/src/test/regress/results/create_index.out	2024-05-06 06:11:47.488591614 +0000
@@ -2135,11 +2135,19 @@
 --
 explain (costs off)
 SELECT unique1 FROM tenk1 WHERE unique1 IN (1, 42, 7) and unique1 = ANY('{7, 8, 9}');
-                                             QUERY PLAN                                             
-----------------------------------------------------------------------------------------------------
- Index Only Scan using tenk1_unique1 on tenk1
-   Index Cond: ((unique1 = ANY ('{1,42,7}'::integer[])) AND (unique1 = ANY ('{7,8,9}'::integer[])))
-(2 rows)
+                            QUERY PLAN                             
+-------------------------------------------------------------------
+ Bitmap Heap Scan on tenk1
+   Recheck Cond: ((unique1 = 7) OR (unique1 = 8) OR (unique1 = 9))
+   Filter: (unique1 = ANY ('{1,42,7}'::integer[]))
+   ->  BitmapOr
+         ->  Bitmap Index Scan on tenk1_unique1
+               Index Cond: (unique1 = 7)
...

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/create_index.out /tmp/cirrus-ci-build/build/testrun/pg_upgrade/0...
--- /tmp/cirrus-ci-build/src/test/regress/expected/create_index.out	2024-05-06 06:09:57.851052307 +0000
+++ /tmp/cirrus-ci-build/build/testrun/pg_upgrade/002_pg_upgrade/data/results/create_index.out	2024-05-06 06:11:57.92702...
@@ -2135,11 +2135,19 @@
 --
 explain (costs off)
 SELECT unique1 FROM tenk1 WHERE unique1 IN (1, 42, 7) and unique1 = ANY('{7, 8, 9}');
-                                             QUERY PLAN                                             
-----------------------------------------------------------------------------------------------------
- Index Only Scan using tenk1_unique1 on tenk1
-   Index Cond: ((unique1 = ANY ('{1,42,7}'::integer[])) AND (unique1 = ANY ('{7,8,9}'::integer[])))
-(2 rows)
+                            QUERY PLAN                             
+-------------------------------------------------------------------
+ Bitmap Heap Scan on tenk1
+   Recheck Cond: ((unique1 = 7) OR (unique1 = 8) OR (unique1 = 9))
+   Filter: (unique1 = ANY ('{1,42,7}'::integer[]))
+   ->  BitmapOr
+         ->  Bitmap Index Scan on tenk1_unique1
+               Index Cond: (unique1 = 7)
...

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/create_index.out /tmp/cirrus-ci-build/build/testrun/recovery/027...
--- /tmp/cirrus-ci-build/src/test/regress/expected/create_index.out	2024-05-06 06:09:57.851052307 +0000
+++ /tmp/cirrus-ci-build/build/testrun/recovery/027_stream_regress/data/results/create_index.out	2024-05-06 06:12:26.095...
@@ -2135,11 +2135,19 @@
 --
 explain (costs off)
 SELECT unique1 FROM tenk1 WHERE unique1 IN (1, 42, 7) and unique1 = ANY('{7, 8, 9}');
-                                             QUERY PLAN                                             
-----------------------------------------------------------------------------------------------------
- Index Only Scan using tenk1_unique1 on tenk1
-   Index Cond: ((unique1 = ANY ('{1,42,7}'::integer[])) AND (unique1 = ANY ('{7,8,9}'::integer[])))
-(2 rows)
+                            QUERY PLAN                             
+-------------------------------------------------------------------
+ Bitmap Heap Scan on tenk1
+   Recheck Cond: ((unique1 = 7) OR (unique1 = 8) OR (unique1 = 9))
+   Filter: (unique1 = ANY ('{1,42,7}'::integer[]))
+   ->  BitmapOr
+         ->  Bitmap Index Scan on tenk1_unique1
+               Index Cond: (unique1 = 7)
...

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/create_index.out /tmp/cirrus-ci-build/build/testrun/regress/regr...
--- /tmp/cirrus-ci-build/src/test/regress/expected/create_index.out	2024-05-06 06:09:57.851052307 +0000
+++ /tmp/cirrus-ci-build/build/testrun/regress/regress/results/create_index.out	2024-05-06 06:11:56.155020686 +0000
@@ -2135,11 +2135,19 @@
 --
 explain (costs off)
 SELECT unique1 FROM tenk1 WHERE unique1 IN (1, 42, 7) and unique1 = ANY('{7, 8, 9}');
-                                             QUERY PLAN                                             
-----------------------------------------------------------------------------------------------------
- Index Only Scan using tenk1_unique1 on tenk1
-   Index Cond: ((unique1 = ANY ('{1,42,7}'::integer[])) AND (unique1 = ANY ('{7,8,9}'::integer[])))
-(2 rows)
+                            QUERY PLAN                             
+-------------------------------------------------------------------
+ Bitmap Heap Scan on tenk1
+   Recheck Cond: ((unique1 = 7) OR (unique1 = 8) OR (unique1 = 9))
+   Filter: (unique1 = ANY ('{1,42,7}'::integer[]))
+   ->  BitmapOr
+         ->  Bitmap Index Scan on tenk1_unique1
+               Index Cond: (unique1 = 7)
...

diff -w -U3 C:/cirrus/src/test/regress/expected/create_index.out C:/cirrus/build/testrun/pg_upgrade/002_pg_upgrade/data/...
--- C:/cirrus/src/test/regress/expected/create_index.out	2024-05-06 06:10:11.706352000 +0000
+++ C:/cirrus/build/testrun/pg_upgrade/002_pg_upgrade/data/results/create_index.out	2024-05-06 06:12:37.893206900 +0000
@@ -2136,10 +2136,18 @@
 explain (costs off)
 SELECT unique1 FROM tenk1 WHERE unique1 IN (1, 42, 7) and unique1 = ANY('{7, 8, 9}');
                                              QUERY PLAN                                             
-----------------------------------------------------------------------------------------------------
- Index Only Scan using tenk1_unique1 on tenk1
-   Index Cond: ((unique1 = ANY ('{1,42,7}'::integer[])) AND (unique1 = ANY ('{7,8,9}'::integer[])))
-(2 rows)
+-------------------------------------------------------------------
+ Bitmap Heap Scan on tenk1
+   Recheck Cond: ((unique1 = 7) OR (unique1 = 8) OR (unique1 = 9))
+   Filter: (unique1 = ANY ('{1,42,7}'::integer[]))
+   ->  BitmapOr
+         ->  Bitmap Index Scan on tenk1_unique1
+               Index Cond: (unique1 = 7)
+         ->  Bitmap Index Scan on tenk1_unique1
+               Index Cond: (unique1 = 8)
...

diff -w -U3 C:/cirrus/src/test/regress/expected/create_index.out C:/cirrus/build/testrun/recovery/027_stream_regress/dat...
--- C:/cirrus/src/test/regress/expected/create_index.out	2024-05-06 06:10:11.706352000 +0000
+++ C:/cirrus/build/testrun/recovery/027_stream_regress/data/results/create_index.out	2024-05-06 06:14:43.033573200 +000...
@@ -2136,10 +2136,18 @@
 explain (costs off)
 SELECT unique1 FROM tenk1 WHERE unique1 IN (1, 42, 7) and unique1 = ANY('{7, 8, 9}');
                                              QUERY PLAN                                             
-----------------------------------------------------------------------------------------------------
- Index Only Scan using tenk1_unique1 on tenk1
-   Index Cond: ((unique1 = ANY ('{1,42,7}'::integer[])) AND (unique1 = ANY ('{7,8,9}'::integer[])))
-(2 rows)
+-------------------------------------------------------------------
+ Bitmap Heap Scan on tenk1
+   Recheck Cond: ((unique1 = 7) OR (unique1 = 8) OR (unique1 = 9))
+   Filter: (unique1 = ANY ('{1,42,7}'::integer[]))
+   ->  BitmapOr
+         ->  Bitmap Index Scan on tenk1_unique1
+               Index Cond: (unique1 = 7)
+         ->  Bitmap Index Scan on tenk1_unique1
+               Index Cond: (unique1 = 8)
...

diff -w -U3 C:/cirrus/src/test/regress/expected/create_index.out C:/cirrus/build/testrun/regress/regress/results/create_...
--- C:/cirrus/src/test/regress/expected/create_index.out	2024-05-06 06:10:11.706352000 +0000
+++ C:/cirrus/build/testrun/regress/regress/results/create_index.out	2024-05-06 06:12:25.149389300 +0000
@@ -2136,10 +2136,18 @@
 explain (costs off)
 SELECT unique1 FROM tenk1 WHERE unique1 IN (1, 42, 7) and unique1 = ANY('{7, 8, 9}');
                                              QUERY PLAN                                             
-----------------------------------------------------------------------------------------------------
- Index Only Scan using tenk1_unique1 on tenk1
-   Index Cond: ((unique1 = ANY ('{1,42,7}'::integer[])) AND (unique1 = ANY ('{7,8,9}'::integer[])))
-(2 rows)
+-------------------------------------------------------------------
+ Bitmap Heap Scan on tenk1
+   Recheck Cond: ((unique1 = 7) OR (unique1 = 8) OR (unique1 = 9))
+   Filter: (unique1 = ANY ('{1,42,7}'::integer[]))
+   ->  BitmapOr
+         ->  Bitmap Index Scan on tenk1_unique1
+               Index Cond: (unique1 = 7)
+         ->  Bitmap Index Scan on tenk1_unique1
+               Index Cond: (unique1 = 8)
...

diff -U3 /Users/admin/pgsql/src/test/regress/expected/create_index.out /Users/admin/pgsql/build/testrun/pg_upgrade/002_p...
--- /Users/admin/pgsql/src/test/regress/expected/create_index.out	2024-05-06 06:09:49
+++ /Users/admin/pgsql/build/testrun/pg_upgrade/002_pg_upgrade/data/results/create_index.out	2024-05-06 06:10:56
@@ -2135,11 +2135,19 @@
 --
 explain (costs off)
 SELECT unique1 FROM tenk1 WHERE unique1 IN (1, 42, 7) and unique1 = ANY('{7, 8, 9}');
-                                             QUERY PLAN                                             
-----------------------------------------------------------------------------------------------------
- Index Only Scan using tenk1_unique1 on tenk1
-   Index Cond: ((unique1 = ANY ('{1,42,7}'::integer[])) AND (unique1 = ANY ('{7,8,9}'::integer[])))
-(2 rows)
+                            QUERY PLAN                             
+-------------------------------------------------------------------
+ Bitmap Heap Scan on tenk1
+   Recheck Cond: ((unique1 = 7) OR (unique1 = 8) OR (unique1 = 9))
+   Filter: (unique1 = ANY ('{1,42,7}'::integer[]))
+   ->  BitmapOr
+         ->  Bitmap Index Scan on tenk1_unique1
+               Index Cond: (unique1 = 7)
...

diff -U3 /Users/admin/pgsql/src/test/regress/expected/create_index.out /Users/admin/pgsql/build/testrun/recovery/027_str...
--- /Users/admin/pgsql/src/test/regress/expected/create_index.out	2024-05-06 06:09:49
+++ /Users/admin/pgsql/build/testrun/recovery/027_stream_regress/data/results/create_index.out	2024-05-06 06:12:02
@@ -2135,11 +2135,19 @@
 --
 explain (costs off)
 SELECT unique1 FROM tenk1 WHERE unique1 IN (1, 42, 7) and unique1 = ANY('{7, 8, 9}');
-                                             QUERY PLAN                                             
-----------------------------------------------------------------------------------------------------
- Index Only Scan using tenk1_unique1 on tenk1
-   Index Cond: ((unique1 = ANY ('{1,42,7}'::integer[])) AND (unique1 = ANY ('{7,8,9}'::integer[])))
-(2 rows)
+                            QUERY PLAN                             
+-------------------------------------------------------------------
+ Bitmap Heap Scan on tenk1
+   Recheck Cond: ((unique1 = 7) OR (unique1 = 8) OR (unique1 = 9))
+   Filter: (unique1 = ANY ('{1,42,7}'::integer[]))
+   ->  BitmapOr
+         ->  Bitmap Index Scan on tenk1_unique1
+               Index Cond: (unique1 = 7)
...

diff -U3 /Users/admin/pgsql/src/test/regress/expected/create_index.out /Users/admin/pgsql/build/testrun/regress/regress/...
--- /Users/admin/pgsql/src/test/regress/expected/create_index.out	2024-05-06 06:09:49
+++ /Users/admin/pgsql/build/testrun/regress/regress/results/create_index.out	2024-05-06 06:10:52
@@ -2135,11 +2135,19 @@
 --
 explain (costs off)
 SELECT unique1 FROM tenk1 WHERE unique1 IN (1, 42, 7) and unique1 = ANY('{7, 8, 9}');
-                                             QUERY PLAN                                             
-----------------------------------------------------------------------------------------------------
- Index Only Scan using tenk1_unique1 on tenk1
-   Index Cond: ((unique1 = ANY ('{1,42,7}'::integer[])) AND (unique1 = ANY ('{7,8,9}'::integer[])))
-(2 rows)
+                            QUERY PLAN                             
+-------------------------------------------------------------------
+ Bitmap Heap Scan on tenk1
+   Recheck Cond: ((unique1 = 7) OR (unique1 = 8) OR (unique1 = 9))
+   Filter: (unique1 = ANY ('{1,42,7}'::integer[]))
+   ->  BitmapOr
+         ->  Bitmap Index Scan on tenk1_unique1
+               Index Cond: (unique1 = 7)
...

diff -U3 /tmp/cirrus-ci-build/contrib/pg_freespacemap/expected/pg_freespacemap.out /tmp/cirrus-ci-build/build/testrun/pg...
--- /tmp/cirrus-ci-build/contrib/pg_freespacemap/expected/pg_freespacemap.out	2024-05-06 05:48:57.772260000 +0000
+++ /tmp/cirrus-ci-build/build/testrun/pg_freespacemap/regress/results/pg_freespacemap.out	2024-05-06 05:50:55.263235000...
@@ -1,4 +1,5 @@
 CREATE EXTENSION pg_freespacemap;
+ERROR:  extension "pg_freespacemap" has no installation script nor update path for version "1.3"
 CREATE TABLE freespace_tab (c1 int) WITH (autovacuum_enabled = off);
 CREATE INDEX freespace_brin ON freespace_tab USING brin (c1);
 CREATE INDEX freespace_btree ON freespace_tab USING btree (c1);
@@ -8,78 +9,39 @@
   SELECT rel.id, fsm.blkno, (fsm.avail > 0) AS is_avail
     FROM rel, LATERAL pg_freespace(rel.id) AS fsm
     ORDER BY 1, 2;
-       id        | blkno | is_avail 
------------------+-------+----------
- freespace_brin  |     0 | f
- freespace_brin  |     1 | f
- freespace_brin  |     2 | t
- freespace_btree |     0 | f
- freespace_hash  |     0 | f
...

diff -U3 /tmp/cirrus-ci-build/contrib/pg_freespacemap/expected/pg_freespacemap.out /tmp/cirrus-ci-build/build/testrun/pg...
--- /tmp/cirrus-ci-build/contrib/pg_freespacemap/expected/pg_freespacemap.out	2024-05-06 05:48:49.445646537 +0000
+++ /tmp/cirrus-ci-build/build/testrun/pg_freespacemap/regress/results/pg_freespacemap.out	2024-05-06 05:52:02.509175778...
@@ -1,4 +1,5 @@
 CREATE EXTENSION pg_freespacemap;
+ERROR:  extension "pg_freespacemap" has no installation script nor update path for version "1.3"
 CREATE TABLE freespace_tab (c1 int) WITH (autovacuum_enabled = off);
 CREATE INDEX freespace_brin ON freespace_tab USING brin (c1);
 CREATE INDEX freespace_btree ON freespace_tab USING btree (c1);
@@ -8,78 +9,39 @@
   SELECT rel.id, fsm.blkno, (fsm.avail > 0) AS is_avail
     FROM rel, LATERAL pg_freespace(rel.id) AS fsm
     ORDER BY 1, 2;
-       id        | blkno | is_avail 
------------------+-------+----------
- freespace_brin  |     0 | f
- freespace_brin  |     1 | f
- freespace_brin  |     2 | t
- freespace_btree |     0 | f
- freespace_hash  |     0 | f
...

diff -w -U3 C:/cirrus/contrib/pg_freespacemap/expected/pg_freespacemap.out C:/cirrus/build/testrun/pg_freespacemap/regre...
--- C:/cirrus/contrib/pg_freespacemap/expected/pg_freespacemap.out	2024-05-06 05:49:00.738271900 +0000
+++ C:/cirrus/build/testrun/pg_freespacemap/regress/results/pg_freespacemap.out	2024-05-06 05:55:02.112650300 +0000
@@ -1,4 +1,5 @@
 CREATE EXTENSION pg_freespacemap;
+ERROR:  extension "pg_freespacemap" has no installation script nor update path for version "1.3"
 CREATE TABLE freespace_tab (c1 int) WITH (autovacuum_enabled = off);
 CREATE INDEX freespace_brin ON freespace_tab USING brin (c1);
 CREATE INDEX freespace_btree ON freespace_tab USING btree (c1);
@@ -8,78 +9,39 @@
   SELECT rel.id, fsm.blkno, (fsm.avail > 0) AS is_avail
     FROM rel, LATERAL pg_freespace(rel.id) AS fsm
     ORDER BY 1, 2;
-       id        | blkno | is_avail 
------------------+-------+----------
- freespace_brin  |     0 | f
- freespace_brin  |     1 | f
- freespace_brin  |     2 | t
- freespace_btree |     0 | f
- freespace_hash  |     0 | f
...

diff -U3 /Users/admin/pgsql/contrib/pg_freespacemap/expected/pg_freespacemap.out /Users/admin/pgsql/build/testrun/pg_fre...
--- /Users/admin/pgsql/contrib/pg_freespacemap/expected/pg_freespacemap.out	2024-05-06 05:48:38
+++ /Users/admin/pgsql/build/testrun/pg_freespacemap/regress/results/pg_freespacemap.out	2024-05-06 05:51:46
@@ -1,4 +1,5 @@
 CREATE EXTENSION pg_freespacemap;
+ERROR:  extension "pg_freespacemap" has no installation script nor update path for version "1.3"
 CREATE TABLE freespace_tab (c1 int) WITH (autovacuum_enabled = off);
 CREATE INDEX freespace_brin ON freespace_tab USING brin (c1);
 CREATE INDEX freespace_btree ON freespace_tab USING btree (c1);
@@ -8,78 +9,39 @@
   SELECT rel.id, fsm.blkno, (fsm.avail > 0) AS is_avail
     FROM rel, LATERAL pg_freespace(rel.id) AS fsm
     ORDER BY 1, 2;
-       id        | blkno | is_avail 
------------------+-------+----------
- freespace_brin  |     0 | f
- freespace_brin  |     1 | f
- freespace_brin  |     2 | t
- freespace_btree |     0 | f
- freespace_hash  |     0 | f
...

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/triggers.out /tmp/cirrus-ci-build/build/testrun/pg_upgrade/002_p...
--- /tmp/cirrus-ci-build/src/test/regress/expected/triggers.out	2024-05-06 03:39:47.868329000 +0000
+++ /tmp/cirrus-ci-build/build/testrun/pg_upgrade/002_pg_upgrade/data/results/triggers.out	2024-05-06 03:40:46.469883000...
@@ -3720,7 +3720,9 @@
 -- test who runs deferred trigger functions
 -- setup
 create role groot;
+WARNING:  roles created by regression test cases should have names starting with "regress_"
 create role outis;
+WARNING:  roles created by regression test cases should have names starting with "regress_"
 create function whoami() returns trigger language plpgsql
 as $$
 begin

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/triggers.out /tmp/cirrus-ci-build/build/testrun/recovery/027_str...
--- /tmp/cirrus-ci-build/src/test/regress/expected/triggers.out	2024-05-06 03:39:47.868329000 +0000
+++ /tmp/cirrus-ci-build/build/testrun/recovery/027_stream_regress/data/results/triggers.out	2024-05-06 03:41:15.4852130...
@@ -3720,7 +3720,9 @@
 -- test who runs deferred trigger functions
 -- setup
 create role groot;
+WARNING:  roles created by regression test cases should have names starting with "regress_"
 create role outis;
+WARNING:  roles created by regression test cases should have names starting with "regress_"
 create function whoami() returns trigger language plpgsql
 as $$
 begin

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/triggers.out /tmp/cirrus-ci-build/build/testrun/regress/regress/...
--- /tmp/cirrus-ci-build/src/test/regress/expected/triggers.out	2024-05-06 03:39:47.868329000 +0000
+++ /tmp/cirrus-ci-build/build/testrun/regress/regress/results/triggers.out	2024-05-06 03:40:42.289799000 +0000
@@ -3720,7 +3720,9 @@
 -- test who runs deferred trigger functions
 -- setup
 create role groot;
+WARNING:  roles created by regression test cases should have names starting with "regress_"
 create role outis;
+WARNING:  roles created by regression test cases should have names starting with "regress_"
 create function whoami() returns trigger language plpgsql
 as $$
 begin

diff -U3 /tmp/cirrus-ci-build/contrib/btree_gist/expected/without_overlaps.out /tmp/cirrus-ci-build/build/testrun/btree_...
--- /tmp/cirrus-ci-build/contrib/btree_gist/expected/without_overlaps.out	2024-05-06 03:34:12.492053000 +0000
+++ /tmp/cirrus-ci-build/build/testrun/btree_gist/regress/results/without_overlaps.out	2024-05-06 03:36:18.619836000 +00...
@@ -16,6 +16,8 @@
  valid_at | daterange |           | not null | 
 Indexes:
     "temporal_rng_pk" PRIMARY KEY (id, valid_at WITHOUT OVERLAPS)
+Check constraints:
+    "valid_at_not_empty" CHECK (NOT isempty(valid_at))
 
 SELECT pg_get_constraintdef(oid) FROM pg_constraint WHERE conname = 'temporal_rng_pk';
             pg_get_constraintdef             
@@ -60,6 +62,8 @@
  parent_id | integer   |           |          | 
 Indexes:
     "temporal_fk_rng2rng_pk" PRIMARY KEY (id, valid_at WITHOUT OVERLAPS)
+Check constraints:
+    "valid_at_not_empty" CHECK (NOT isempty(valid_at))
 Foreign-key constraints:
     "temporal_fk_rng2rng_fk" FOREIGN KEY (parent_id, PERIOD valid_at) REFERENCES temporal_rng(id, PERIOD valid_at)
...

diff -U3 /tmp/cirrus-ci-build/contrib/btree_gist/expected/without_overlaps.out /tmp/cirrus-ci-build/contrib/btree_gist/r...
--- /tmp/cirrus-ci-build/contrib/btree_gist/expected/without_overlaps.out	2024-05-06 03:34:11.720158384 +0000
+++ /tmp/cirrus-ci-build/contrib/btree_gist/results/without_overlaps.out	2024-05-06 03:37:24.495894141 +0000
@@ -16,6 +16,8 @@
  valid_at | daterange |           | not null | 
 Indexes:
     "temporal_rng_pk" PRIMARY KEY (id, valid_at WITHOUT OVERLAPS)
+Check constraints:
+    "valid_at_not_empty" CHECK (NOT isempty(valid_at))
 
 SELECT pg_get_constraintdef(oid) FROM pg_constraint WHERE conname = 'temporal_rng_pk';
             pg_get_constraintdef             
@@ -60,6 +62,8 @@
  parent_id | integer   |           |          | 
 Indexes:
     "temporal_fk_rng2rng_pk" PRIMARY KEY (id, valid_at WITHOUT OVERLAPS)
+Check constraints:
+    "valid_at_not_empty" CHECK (NOT isempty(valid_at))
 Foreign-key constraints:
     "temporal_fk_rng2rng_fk" FOREIGN KEY (parent_id, PERIOD valid_at) REFERENCES temporal_rng(id, PERIOD valid_at)
...

diff -U3 /tmp/cirrus-ci-build/contrib/btree_gist/expected/without_overlaps.out /tmp/cirrus-ci-build/build/testrun/btree_...
--- /tmp/cirrus-ci-build/contrib/btree_gist/expected/without_overlaps.out	2024-05-06 03:34:11.728918847 +0000
+++ /tmp/cirrus-ci-build/build/testrun/btree_gist/regress/results/without_overlaps.out	2024-05-06 03:37:37.144916694 +00...
@@ -16,6 +16,8 @@
  valid_at | daterange |           | not null | 
 Indexes:
     "temporal_rng_pk" PRIMARY KEY (id, valid_at WITHOUT OVERLAPS)
+Check constraints:
+    "valid_at_not_empty" CHECK (NOT isempty(valid_at))
 
 SELECT pg_get_constraintdef(oid) FROM pg_constraint WHERE conname = 'temporal_rng_pk';
             pg_get_constraintdef             
@@ -60,6 +62,8 @@
  parent_id | integer   |           |          | 
 Indexes:
     "temporal_fk_rng2rng_pk" PRIMARY KEY (id, valid_at WITHOUT OVERLAPS)
+Check constraints:
+    "valid_at_not_empty" CHECK (NOT isempty(valid_at))
 Foreign-key constraints:
     "temporal_fk_rng2rng_fk" FOREIGN KEY (parent_id, PERIOD valid_at) REFERENCES temporal_rng(id, PERIOD valid_at)
...

diff -w -U3 C:/cirrus/contrib/btree_gist/expected/without_overlaps.out C:/cirrus/build/testrun/btree_gist/regress/result...
--- C:/cirrus/contrib/btree_gist/expected/without_overlaps.out	2024-05-06 03:34:20.688881300 +0000
+++ C:/cirrus/build/testrun/btree_gist/regress/results/without_overlaps.out	2024-05-06 03:40:08.847472000 +0000
@@ -16,6 +16,8 @@
  valid_at | daterange |           | not null | 
 Indexes:
     "temporal_rng_pk" PRIMARY KEY (id, valid_at WITHOUT OVERLAPS)
+Check constraints:
+    "valid_at_not_empty" CHECK (NOT isempty(valid_at))
 
 SELECT pg_get_constraintdef(oid) FROM pg_constraint WHERE conname = 'temporal_rng_pk';
             pg_get_constraintdef             
@@ -60,6 +62,8 @@
  parent_id | integer   |           |          | 
 Indexes:
     "temporal_fk_rng2rng_pk" PRIMARY KEY (id, valid_at WITHOUT OVERLAPS)
+Check constraints:
+    "valid_at_not_empty" CHECK (NOT isempty(valid_at))
 Foreign-key constraints:
     "temporal_fk_rng2rng_fk" FOREIGN KEY (parent_id, PERIOD valid_at) REFERENCES temporal_rng(id, PERIOD valid_at)
...

diff -U3 /Users/admin/pgsql/contrib/btree_gist/expected/without_overlaps.out /Users/admin/pgsql/build/testrun/btree_gist...
--- /Users/admin/pgsql/contrib/btree_gist/expected/without_overlaps.out	2024-05-06 03:34:09
+++ /Users/admin/pgsql/build/testrun/btree_gist/regress/results/without_overlaps.out	2024-05-06 03:37:13
@@ -16,6 +16,8 @@
  valid_at | daterange |           | not null | 
 Indexes:
     "temporal_rng_pk" PRIMARY KEY (id, valid_at WITHOUT OVERLAPS)
+Check constraints:
+    "valid_at_not_empty" CHECK (NOT isempty(valid_at))
 
 SELECT pg_get_constraintdef(oid) FROM pg_constraint WHERE conname = 'temporal_rng_pk';
             pg_get_constraintdef             
@@ -60,6 +62,8 @@
  parent_id | integer   |           |          | 
 Indexes:
     "temporal_fk_rng2rng_pk" PRIMARY KEY (id, valid_at WITHOUT OVERLAPS)
+Check constraints:
+    "valid_at_not_empty" CHECK (NOT isempty(valid_at))
 Foreign-key constraints:
     "temporal_fk_rng2rng_fk" FOREIGN KEY (parent_id, PERIOD valid_at) REFERENCES temporal_rng(id, PERIOD valid_at)
...

diff -U3 /tmp/cirrus-ci-build/contrib/unaccent/expected/unaccent.out /tmp/cirrus-ci-build/build/testrun/unaccent/regress...
--- /tmp/cirrus-ci-build/contrib/unaccent/expected/unaccent.out	2024-05-06 01:08:45.881398000 +0000
+++ /tmp/cirrus-ci-build/build/testrun/unaccent/regress/results/unaccent.out	2024-05-06 01:10:36.169222000 +0000
@@ -8,8 +8,10 @@
 \quit
 \endif
 CREATE EXTENSION unaccent;
+WARNING:  duplicate source strings, first one will be used
 SET client_encoding TO 'UTF8';
 SELECT unaccent('foobar');
+WARNING:  duplicate source strings, first one will be used
  unaccent 
 ----------
  foobar

diff -U3 /tmp/cirrus-ci-build/contrib/unaccent/expected/unaccent.out /tmp/cirrus-ci-build/contrib/unaccent/results/unacc...
--- /tmp/cirrus-ci-build/contrib/unaccent/expected/unaccent.out	2024-05-06 01:08:40.932485202 +0000
+++ /tmp/cirrus-ci-build/contrib/unaccent/results/unaccent.out	2024-05-06 01:12:14.260357890 +0000
@@ -8,8 +8,10 @@
 \quit
 \endif
 CREATE EXTENSION unaccent;
+WARNING:  duplicate source strings, first one will be used
 SET client_encoding TO 'UTF8';
 SELECT unaccent('foobar');
+WARNING:  duplicate source strings, first one will be used
  unaccent 
 ----------
  foobar

diff -U3 /tmp/cirrus-ci-build/contrib/unaccent/expected/unaccent.out /tmp/cirrus-ci-build/build/testrun/unaccent/regress...
--- /tmp/cirrus-ci-build/contrib/unaccent/expected/unaccent.out	2024-05-06 01:08:42.112445747 +0000
+++ /tmp/cirrus-ci-build/build/testrun/unaccent/regress/results/unaccent.out	2024-05-06 01:11:06.204369431 +0000
@@ -8,8 +8,10 @@
 \quit
 \endif
 CREATE EXTENSION unaccent;
+WARNING:  duplicate source strings, first one will be used
 SET client_encoding TO 'UTF8';
 SELECT unaccent('foobar');
+WARNING:  duplicate source strings, first one will be used
  unaccent 
 ----------
  foobar

diff -U3 /Users/admin/pgsql/contrib/unaccent/expected/unaccent.out /Users/admin/pgsql/build/testrun/unaccent/regress/res...
--- /Users/admin/pgsql/contrib/unaccent/expected/unaccent.out	2024-05-06 01:08:36
+++ /Users/admin/pgsql/build/testrun/unaccent/regress/results/unaccent.out	2024-05-06 01:13:25
@@ -8,8 +8,10 @@
 \quit
 \endif
 CREATE EXTENSION unaccent;
+WARNING:  duplicate source strings, first one will be used
 SET client_encoding TO 'UTF8';
 SELECT unaccent('foobar');
+WARNING:  duplicate source strings, first one will be used
  unaccent 
 ----------
  foobar

diff -U3 /tmp/cirrus-ci-build/src/test/modules/injection_points/expected/injection_points.out /tmp/cirrus-ci-build/build...
--- /tmp/cirrus-ci-build/src/test/modules/injection_points/expected/injection_points.out	2024-05-05 19:45:13.608494000 +...
+++ /tmp/cirrus-ci-build/build/testrun/injection_points/regress/results/injection_points.out	2024-05-05 19:48:06.0315220...
@@ -169,44 +169,10 @@
 -- Wait for the previous backend process to exit, ensuring that its local
 -- injection points are cleaned up.
 SELECT wait_pid(:'oldpid');
- wait_pid 
-----------
- 
-(1 row)
-
-SELECT injection_points_run('TestConditionLocal1'); -- nothing
- injection_points_run 
-----------------------
- 
-(1 row)
-
-SELECT injection_points_run('TestConditionLocal2'); -- nothing
- injection_points_run 
...

diff -U3 /tmp/cirrus-ci-build/src/test/modules/injection_points/expected/injection_points.out /tmp/cirrus-ci-build/src/t...
--- /tmp/cirrus-ci-build/src/test/modules/injection_points/expected/injection_points.out	2024-05-05 19:45:14.878166223 +...
+++ /tmp/cirrus-ci-build/src/test/modules/injection_points/results/injection_points.out	2024-05-05 19:50:49.905892661 +0...
@@ -169,44 +169,10 @@
 -- Wait for the previous backend process to exit, ensuring that its local
 -- injection points are cleaned up.
 SELECT wait_pid(:'oldpid');
- wait_pid 
-----------
- 
-(1 row)
-
-SELECT injection_points_run('TestConditionLocal1'); -- nothing
- injection_points_run 
-----------------------
- 
-(1 row)
-
-SELECT injection_points_run('TestConditionLocal2'); -- nothing
- injection_points_run 
...

diff -U3 /tmp/cirrus-ci-build/src/test/modules/injection_points/expected/injection_points.out /tmp/cirrus-ci-build/build...
--- /tmp/cirrus-ci-build/src/test/modules/injection_points/expected/injection_points.out	2024-05-05 19:45:12.319660696 +...
+++ /tmp/cirrus-ci-build/build/testrun/injection_points/regress/results/injection_points.out	2024-05-05 19:50:25.5674461...
@@ -169,44 +169,10 @@
 -- Wait for the previous backend process to exit, ensuring that its local
 -- injection points are cleaned up.
 SELECT wait_pid(:'oldpid');
- wait_pid 
-----------
- 
-(1 row)
-
-SELECT injection_points_run('TestConditionLocal1'); -- nothing
- injection_points_run 
-----------------------
- 
-(1 row)
-
-SELECT injection_points_run('TestConditionLocal2'); -- nothing
- injection_points_run 
...

diff -w -U3 C:/cirrus/src/test/modules/injection_points/expected/injection_points.out C:/cirrus/build/testrun/injection_...
--- C:/cirrus/src/test/modules/injection_points/expected/injection_points.out	2024-05-05 19:45:36.777627300 +0000
+++ C:/cirrus/build/testrun/injection_points/regress/results/injection_points.out	2024-05-05 19:52:47.572982800 +0000
@@ -169,44 +169,10 @@
 -- Wait for the previous backend process to exit, ensuring that its local
 -- injection points are cleaned up.
 SELECT wait_pid(:'oldpid');
- wait_pid 
-----------
- 
-(1 row)
-
-SELECT injection_points_run('TestConditionLocal1'); -- nothing
- injection_points_run 
-----------------------
- 
-(1 row)
-
-SELECT injection_points_run('TestConditionLocal2'); -- nothing
- injection_points_run 
...

diff -U3 /Users/admin/pgsql/src/test/modules/injection_points/expected/injection_points.out /Users/admin/pgsql/build/tes...
--- /Users/admin/pgsql/src/test/modules/injection_points/expected/injection_points.out	2024-05-05 19:45:16
+++ /Users/admin/pgsql/build/testrun/injection_points/regress/results/injection_points.out	2024-05-05 19:49:38
@@ -169,44 +169,10 @@
 -- Wait for the previous backend process to exit, ensuring that its local
 -- injection points are cleaned up.
 SELECT wait_pid(:'oldpid');
- wait_pid 
-----------
- 
-(1 row)
-
-SELECT injection_points_run('TestConditionLocal1'); -- nothing
- injection_points_run 
-----------------------
- 
-(1 row)
-
-SELECT injection_points_run('TestConditionLocal2'); -- nothing
- injection_points_run 
...

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/select_parallel.out /tmp/cirrus-ci-build/build/testrun/pg_upgrad...
--- /tmp/cirrus-ci-build/src/test/regress/expected/select_parallel.out	2024-05-05 16:36:54.834710000 +0000
+++ /tmp/cirrus-ci-build/build/testrun/pg_upgrade/002_pg_upgrade/data/results/select_parallel.out	2024-05-05 16:38:24.51...
@@ -451,26 +451,36 @@
   join tenk1 t3 on t3.stringu1 = tenk1.stringu1
   where tenk1.four = t.four
 );
-                                                                                                                       ...
------------------------------------------------------------------------------------------------------------------------...
- Seq Scan on public.tenk1 t
+                                                                                                                       ...
+-----------------------------------------------------------------------------------------------------------------------...
+ Hash Join
    Output: t.unique1, t.unique2, t.two, t.four, t.ten, t.twenty, t.hundred, t.thousand, t.twothousand, t.fivethous, t.t...
-   Filter: (SubPlan 1)
-   SubPlan 1
-     ->  Hash Join
-           Output: t.two
-           Hash Cond: (tenk1.stringu1 = t3.stringu1)
-           ->  Seq Scan on public.tenk1
...

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/select_parallel.out /tmp/cirrus-ci-build/build/testrun/recovery/...
--- /tmp/cirrus-ci-build/src/test/regress/expected/select_parallel.out	2024-05-05 16:36:54.834710000 +0000
+++ /tmp/cirrus-ci-build/build/testrun/recovery/027_stream_regress/data/results/select_parallel.out	2024-05-05 16:38:59....
@@ -451,26 +451,36 @@
   join tenk1 t3 on t3.stringu1 = tenk1.stringu1
   where tenk1.four = t.four
 );
-                                                                                                                       ...
------------------------------------------------------------------------------------------------------------------------...
- Seq Scan on public.tenk1 t
+                                                                                                                       ...
+-----------------------------------------------------------------------------------------------------------------------...
+ Hash Join
    Output: t.unique1, t.unique2, t.two, t.four, t.ten, t.twenty, t.hundred, t.thousand, t.twothousand, t.fivethous, t.t...
-   Filter: (SubPlan 1)
-   SubPlan 1
-     ->  Hash Join
-           Output: t.two
-           Hash Cond: (tenk1.stringu1 = t3.stringu1)
-           ->  Seq Scan on public.tenk1
...

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/select_parallel.out /tmp/cirrus-ci-build/build/testrun/regress/r...
--- /tmp/cirrus-ci-build/src/test/regress/expected/select_parallel.out	2024-05-05 16:36:54.834710000 +0000
+++ /tmp/cirrus-ci-build/build/testrun/regress/regress/results/select_parallel.out	2024-05-05 16:38:23.508010000 +0000
@@ -451,26 +451,36 @@
   join tenk1 t3 on t3.stringu1 = tenk1.stringu1
   where tenk1.four = t.four
 );
-                                                                                                                       ...
------------------------------------------------------------------------------------------------------------------------...
- Seq Scan on public.tenk1 t
+                                                                                                                       ...
+-----------------------------------------------------------------------------------------------------------------------...
+ Hash Join
    Output: t.unique1, t.unique2, t.two, t.four, t.ten, t.twenty, t.hundred, t.thousand, t.twothousand, t.fivethous, t.t...
-   Filter: (SubPlan 1)
-   SubPlan 1
-     ->  Hash Join
-           Output: t.two
-           Hash Cond: (tenk1.stringu1 = t3.stringu1)
-           ->  Seq Scan on public.tenk1
...

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/select_parallel.out /tmp/cirrus-ci-build/src/bin/pg_upgrade/tmp_...
--- /tmp/cirrus-ci-build/src/test/regress/expected/select_parallel.out	2024-05-05 16:36:54.955489216 +0000
+++ /tmp/cirrus-ci-build/src/bin/pg_upgrade/tmp_check/results/select_parallel.out	2024-05-05 16:40:49.671491705 +0000
@@ -451,26 +451,36 @@
   join tenk1 t3 on t3.stringu1 = tenk1.stringu1
   where tenk1.four = t.four
 );
-                                                                                                                       ...
------------------------------------------------------------------------------------------------------------------------...
- Seq Scan on public.tenk1 t
+                                                                                                                       ...
+-----------------------------------------------------------------------------------------------------------------------...
+ Hash Join
    Output: t.unique1, t.unique2, t.two, t.four, t.ten, t.twenty, t.hundred, t.thousand, t.twothousand, t.fivethous, t.t...
-   Filter: (SubPlan 1)
-   SubPlan 1
-     ->  Hash Join
-           Output: t.two
-           Hash Cond: (tenk1.stringu1 = t3.stringu1)
-           ->  Seq Scan on public.tenk1
...

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/select_parallel.out /tmp/cirrus-ci-build/src/test/regress/result...
--- /tmp/cirrus-ci-build/src/test/regress/expected/select_parallel.out	2024-05-05 16:36:54.955489216 +0000
+++ /tmp/cirrus-ci-build/src/test/regress/results/select_parallel.out	2024-05-05 16:39:37.747485984 +0000
@@ -451,26 +451,36 @@
   join tenk1 t3 on t3.stringu1 = tenk1.stringu1
   where tenk1.four = t.four
 );
-                                                                                                                       ...
------------------------------------------------------------------------------------------------------------------------...
- Seq Scan on public.tenk1 t
+                                                                                                                       ...
+-----------------------------------------------------------------------------------------------------------------------...
+ Hash Join
    Output: t.unique1, t.unique2, t.two, t.four, t.ten, t.twenty, t.hundred, t.thousand, t.twothousand, t.fivethous, t.t...
-   Filter: (SubPlan 1)
-   SubPlan 1
-     ->  Hash Join
-           Output: t.two
-           Hash Cond: (tenk1.stringu1 = t3.stringu1)
-           ->  Seq Scan on public.tenk1
...

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/select_parallel.out /tmp/cirrus-ci-build/build/testrun/pg_upgrad...
--- /tmp/cirrus-ci-build/src/test/regress/expected/select_parallel.out	2024-05-05 16:36:53.741322497 +0000
+++ /tmp/cirrus-ci-build/build/testrun/pg_upgrade/002_pg_upgrade/data/results/select_parallel.out	2024-05-05 16:39:39.15...
@@ -451,26 +451,36 @@
   join tenk1 t3 on t3.stringu1 = tenk1.stringu1
   where tenk1.four = t.four
 );
-                                                                                                                       ...
------------------------------------------------------------------------------------------------------------------------...
- Seq Scan on public.tenk1 t
+                                                                                                                       ...
+-----------------------------------------------------------------------------------------------------------------------...
+ Hash Join
    Output: t.unique1, t.unique2, t.two, t.four, t.ten, t.twenty, t.hundred, t.thousand, t.twothousand, t.fivethous, t.t...
-   Filter: (SubPlan 1)
-   SubPlan 1
-     ->  Hash Join
-           Output: t.two
-           Hash Cond: (tenk1.stringu1 = t3.stringu1)
-           ->  Seq Scan on public.tenk1
...

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/select_parallel.out /tmp/cirrus-ci-build/build/testrun/recovery/...
--- /tmp/cirrus-ci-build/src/test/regress/expected/select_parallel.out	2024-05-05 16:36:53.741322497 +0000
+++ /tmp/cirrus-ci-build/build/testrun/recovery/027_stream_regress/data/results/select_parallel.out	2024-05-05 16:40:11....
@@ -451,26 +451,36 @@
   join tenk1 t3 on t3.stringu1 = tenk1.stringu1
   where tenk1.four = t.four
 );
-                                                                                                                       ...
------------------------------------------------------------------------------------------------------------------------...
- Seq Scan on public.tenk1 t
+                                                                                                                       ...
+-----------------------------------------------------------------------------------------------------------------------...
+ Hash Join
    Output: t.unique1, t.unique2, t.two, t.four, t.ten, t.twenty, t.hundred, t.thousand, t.twothousand, t.fivethous, t.t...
-   Filter: (SubPlan 1)
-   SubPlan 1
-     ->  Hash Join
-           Output: t.two
-           Hash Cond: (tenk1.stringu1 = t3.stringu1)
-           ->  Seq Scan on public.tenk1
...

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/select_parallel.out /tmp/cirrus-ci-build/build/testrun/regress/r...
--- /tmp/cirrus-ci-build/src/test/regress/expected/select_parallel.out	2024-05-05 16:36:53.741322497 +0000
+++ /tmp/cirrus-ci-build/build/testrun/regress/regress/results/select_parallel.out	2024-05-05 16:39:34.185298915 +0000
@@ -451,26 +451,36 @@
   join tenk1 t3 on t3.stringu1 = tenk1.stringu1
   where tenk1.four = t.four
 );
-                                                                                                                       ...
------------------------------------------------------------------------------------------------------------------------...
- Seq Scan on public.tenk1 t
+                                                                                                                       ...
+-----------------------------------------------------------------------------------------------------------------------...
+ Hash Join
    Output: t.unique1, t.unique2, t.two, t.four, t.ten, t.twenty, t.hundred, t.thousand, t.twothousand, t.fivethous, t.t...
-   Filter: (SubPlan 1)
-   SubPlan 1
-     ->  Hash Join
-           Output: t.two
-           Hash Cond: (tenk1.stringu1 = t3.stringu1)
-           ->  Seq Scan on public.tenk1
...

diff -w -U3 C:/cirrus/src/test/regress/expected/select_parallel.out C:/cirrus/build/testrun/pg_upgrade/002_pg_upgrade/da...
--- C:/cirrus/src/test/regress/expected/select_parallel.out	2024-05-05 16:37:09.656678100 +0000
+++ C:/cirrus/build/testrun/pg_upgrade/002_pg_upgrade/data/results/select_parallel.out	2024-05-05 16:40:29.058871000 +00...
@@ -452,25 +452,35 @@
   where tenk1.four = t.four
 );
                                                                                                                        ...
------------------------------------------------------------------------------------------------------------------------...
- Seq Scan on public.tenk1 t
+-----------------------------------------------------------------------------------------------------------------------...
+ Hash Join
    Output: t.unique1, t.unique2, t.two, t.four, t.ten, t.twenty, t.hundred, t.thousand, t.twothousand, t.fivethous, t.t...
-   Filter: (SubPlan 1)
-   SubPlan 1
-     ->  Hash Join
-           Output: t.two
-           Hash Cond: (tenk1.stringu1 = t3.stringu1)
-           ->  Seq Scan on public.tenk1
-                 Output: tenk1.unique1, tenk1.unique2, tenk1.two, tenk1.four, tenk1.ten, tenk1.twenty, tenk1.hundred, t...
-                 Filter: (tenk1.four = t.four)
...

diff -w -U3 C:/cirrus/src/test/regress/expected/select_parallel.out C:/cirrus/build/testrun/recovery/027_stream_regress/...
--- C:/cirrus/src/test/regress/expected/select_parallel.out	2024-05-05 16:37:09.656678100 +0000
+++ C:/cirrus/build/testrun/recovery/027_stream_regress/data/results/select_parallel.out	2024-05-05 16:42:54.833702700 +...
@@ -452,25 +452,35 @@
   where tenk1.four = t.four
 );
                                                                                                                        ...
------------------------------------------------------------------------------------------------------------------------...
- Seq Scan on public.tenk1 t
+-----------------------------------------------------------------------------------------------------------------------...
+ Hash Join
    Output: t.unique1, t.unique2, t.two, t.four, t.ten, t.twenty, t.hundred, t.thousand, t.twothousand, t.fivethous, t.t...
-   Filter: (SubPlan 1)
-   SubPlan 1
-     ->  Hash Join
-           Output: t.two
-           Hash Cond: (tenk1.stringu1 = t3.stringu1)
-           ->  Seq Scan on public.tenk1
-                 Output: tenk1.unique1, tenk1.unique2, tenk1.two, tenk1.four, tenk1.ten, tenk1.twenty, tenk1.hundred, t...
-                 Filter: (tenk1.four = t.four)
...

diff -w -U3 C:/cirrus/src/test/regress/expected/select_parallel.out C:/cirrus/build/testrun/regress/regress/results/sele...
--- C:/cirrus/src/test/regress/expected/select_parallel.out	2024-05-05 16:37:09.656678100 +0000
+++ C:/cirrus/build/testrun/regress/regress/results/select_parallel.out	2024-05-05 16:40:25.675557900 +0000
@@ -452,25 +452,35 @@
   where tenk1.four = t.four
 );
                                                                                                                        ...
------------------------------------------------------------------------------------------------------------------------...
- Seq Scan on public.tenk1 t
+-----------------------------------------------------------------------------------------------------------------------...
+ Hash Join
    Output: t.unique1, t.unique2, t.two, t.four, t.ten, t.twenty, t.hundred, t.thousand, t.twothousand, t.fivethous, t.t...
-   Filter: (SubPlan 1)
-   SubPlan 1
-     ->  Hash Join
-           Output: t.two
-           Hash Cond: (tenk1.stringu1 = t3.stringu1)
-           ->  Seq Scan on public.tenk1
-                 Output: tenk1.unique1, tenk1.unique2, tenk1.two, tenk1.four, tenk1.ten, tenk1.twenty, tenk1.hundred, t...
-                 Filter: (tenk1.four = t.four)
...

diff -U3 /Users/admin/pgsql/src/test/regress/expected/select_parallel.out /Users/admin/pgsql/build/testrun/pg_upgrade/00...
--- /Users/admin/pgsql/src/test/regress/expected/select_parallel.out	2024-05-05 16:36:53
+++ /Users/admin/pgsql/build/testrun/pg_upgrade/002_pg_upgrade/data/results/select_parallel.out	2024-05-05 16:39:32
@@ -451,26 +451,36 @@
   join tenk1 t3 on t3.stringu1 = tenk1.stringu1
   where tenk1.four = t.four
 );
-                                                                                                                       ...
------------------------------------------------------------------------------------------------------------------------...
- Seq Scan on public.tenk1 t
+                                                                                                                       ...
+-----------------------------------------------------------------------------------------------------------------------...
+ Hash Join
    Output: t.unique1, t.unique2, t.two, t.four, t.ten, t.twenty, t.hundred, t.thousand, t.twothousand, t.fivethous, t.t...
-   Filter: (SubPlan 1)
-   SubPlan 1
-     ->  Hash Join
-           Output: t.two
-           Hash Cond: (tenk1.stringu1 = t3.stringu1)
-           ->  Seq Scan on public.tenk1
...

diff -U3 /Users/admin/pgsql/src/test/regress/expected/select_parallel.out /Users/admin/pgsql/build/testrun/recovery/027_...
--- /Users/admin/pgsql/src/test/regress/expected/select_parallel.out	2024-05-05 16:36:53
+++ /Users/admin/pgsql/build/testrun/recovery/027_stream_regress/data/results/select_parallel.out	2024-05-05 16:40:20
@@ -451,26 +451,36 @@
   join tenk1 t3 on t3.stringu1 = tenk1.stringu1
   where tenk1.four = t.four
 );
-                                                                                                                       ...
------------------------------------------------------------------------------------------------------------------------...
- Seq Scan on public.tenk1 t
+                                                                                                                       ...
+-----------------------------------------------------------------------------------------------------------------------...
+ Hash Join
    Output: t.unique1, t.unique2, t.two, t.four, t.ten, t.twenty, t.hundred, t.thousand, t.twothousand, t.fivethous, t.t...
-   Filter: (SubPlan 1)
-   SubPlan 1
-     ->  Hash Join
-           Output: t.two
-           Hash Cond: (tenk1.stringu1 = t3.stringu1)
-           ->  Seq Scan on public.tenk1
...

diff -U3 /Users/admin/pgsql/src/test/regress/expected/select_parallel.out /Users/admin/pgsql/build/testrun/regress/regre...
--- /Users/admin/pgsql/src/test/regress/expected/select_parallel.out	2024-05-05 16:36:53
+++ /Users/admin/pgsql/build/testrun/regress/regress/results/select_parallel.out	2024-05-05 16:39:34
@@ -451,26 +451,36 @@
   join tenk1 t3 on t3.stringu1 = tenk1.stringu1
   where tenk1.four = t.four
 );
-                                                                                                                       ...
------------------------------------------------------------------------------------------------------------------------...
- Seq Scan on public.tenk1 t
+                                                                                                                       ...
+-----------------------------------------------------------------------------------------------------------------------...
+ Hash Join
    Output: t.unique1, t.unique2, t.two, t.four, t.ten, t.twenty, t.hundred, t.thousand, t.twothousand, t.fivethous, t.t...
-   Filter: (SubPlan 1)
-   SubPlan 1
-     ->  Hash Join
-           Output: t.two
-           Hash Cond: (tenk1.stringu1 = t3.stringu1)
-           ->  Seq Scan on public.tenk1
...

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/partition_join.out /tmp/cirrus-ci-build/build/testrun/pg_upgrade...
--- /tmp/cirrus-ci-build/src/test/regress/expected/partition_join.out	2024-05-05 12:28:51.905906000 +0000
+++ /tmp/cirrus-ci-build/build/testrun/pg_upgrade/002_pg_upgrade/data/results/partition_join.out	2024-05-05 12:30:28.809...
@@ -5133,17 +5133,15 @@
                               QUERY PLAN                               
 -----------------------------------------------------------------------
  Limit
-   ->  Merge Append
-         Sort Key: x.id
-         ->  Merge Left Join
-               Merge Cond: (x_1.id = y_1.id)
+   ->  Merge Left Join
+         Merge Cond: (x.id = y.id)
+         ->  Append
                ->  Index Only Scan using fract_t0_pkey on fract_t0 x_1
-               ->  Index Only Scan using fract_t0_pkey on fract_t0 y_1
-         ->  Merge Left Join
-               Merge Cond: (x_2.id = y_2.id)
                ->  Index Only Scan using fract_t1_pkey on fract_t1 x_2
+         ->  Append
...

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/partition_join.out /tmp/cirrus-ci-build/build/testrun/recovery/0...
--- /tmp/cirrus-ci-build/src/test/regress/expected/partition_join.out	2024-05-05 12:28:51.905906000 +0000
+++ /tmp/cirrus-ci-build/build/testrun/recovery/027_stream_regress/data/results/partition_join.out	2024-05-05 12:30:55.5...
@@ -5133,17 +5133,15 @@
                               QUERY PLAN                               
 -----------------------------------------------------------------------
  Limit
-   ->  Merge Append
-         Sort Key: x.id
-         ->  Merge Left Join
-               Merge Cond: (x_1.id = y_1.id)
+   ->  Merge Left Join
+         Merge Cond: (x.id = y.id)
+         ->  Append
                ->  Index Only Scan using fract_t0_pkey on fract_t0 x_1
-               ->  Index Only Scan using fract_t0_pkey on fract_t0 y_1
-         ->  Merge Left Join
-               Merge Cond: (x_2.id = y_2.id)
                ->  Index Only Scan using fract_t1_pkey on fract_t1 x_2
+         ->  Append
...

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/partition_join.out /tmp/cirrus-ci-build/build/testrun/regress/re...
--- /tmp/cirrus-ci-build/src/test/regress/expected/partition_join.out	2024-05-05 12:28:51.905906000 +0000
+++ /tmp/cirrus-ci-build/build/testrun/regress/regress/results/partition_join.out	2024-05-05 12:30:24.686373000 +0000
@@ -5133,17 +5133,15 @@
                               QUERY PLAN                               
 -----------------------------------------------------------------------
  Limit
-   ->  Merge Append
-         Sort Key: x.id
-         ->  Merge Left Join
-               Merge Cond: (x_1.id = y_1.id)
+   ->  Merge Left Join
+         Merge Cond: (x.id = y.id)
+         ->  Append
                ->  Index Only Scan using fract_t0_pkey on fract_t0 x_1
-               ->  Index Only Scan using fract_t0_pkey on fract_t0 y_1
-         ->  Merge Left Join
-               Merge Cond: (x_2.id = y_2.id)
                ->  Index Only Scan using fract_t1_pkey on fract_t1 x_2
+         ->  Append
...

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/partition_join.out /tmp/cirrus-ci-build/src/bin/pg_upgrade/tmp_c...
--- /tmp/cirrus-ci-build/src/test/regress/expected/partition_join.out	2024-05-05 12:28:46.126373533 +0000
+++ /tmp/cirrus-ci-build/src/bin/pg_upgrade/tmp_check/results/partition_join.out	2024-05-05 12:32:15.598394407 +0000
@@ -5133,17 +5133,15 @@
                               QUERY PLAN                               
 -----------------------------------------------------------------------
  Limit
-   ->  Merge Append
-         Sort Key: x.id
-         ->  Merge Left Join
-               Merge Cond: (x_1.id = y_1.id)
+   ->  Merge Left Join
+         Merge Cond: (x.id = y.id)
+         ->  Append
                ->  Index Only Scan using fract_t0_pkey on fract_t0 x_1
-               ->  Index Only Scan using fract_t0_pkey on fract_t0 y_1
-         ->  Merge Left Join
-               Merge Cond: (x_2.id = y_2.id)
                ->  Index Only Scan using fract_t1_pkey on fract_t1 x_2
+         ->  Append
...

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/partition_join.out /tmp/cirrus-ci-build/src/test/recovery/tmp_ch...
--- /tmp/cirrus-ci-build/src/test/regress/expected/partition_join.out	2024-05-05 12:28:46.126373533 +0000
+++ /tmp/cirrus-ci-build/src/test/recovery/tmp_check/results/partition_join.out	2024-05-05 12:33:49.086361126 +0000
@@ -5133,17 +5133,15 @@
                               QUERY PLAN                               
 -----------------------------------------------------------------------
  Limit
-   ->  Merge Append
-         Sort Key: x.id
-         ->  Merge Left Join
-               Merge Cond: (x_1.id = y_1.id)
+   ->  Merge Left Join
+         Merge Cond: (x.id = y.id)
+         ->  Append
                ->  Index Only Scan using fract_t0_pkey on fract_t0 x_1
-               ->  Index Only Scan using fract_t0_pkey on fract_t0 y_1
-         ->  Merge Left Join
-               Merge Cond: (x_2.id = y_2.id)
                ->  Index Only Scan using fract_t1_pkey on fract_t1 x_2
+         ->  Append
...

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/partition_join.out /tmp/cirrus-ci-build/src/test/regress/results...
--- /tmp/cirrus-ci-build/src/test/regress/expected/partition_join.out	2024-05-05 12:28:46.126373533 +0000
+++ /tmp/cirrus-ci-build/src/test/regress/results/partition_join.out	2024-05-05 12:31:21.622391819 +0000
@@ -5133,17 +5133,15 @@
                               QUERY PLAN                               
 -----------------------------------------------------------------------
  Limit
-   ->  Merge Append
-         Sort Key: x.id
-         ->  Merge Left Join
-               Merge Cond: (x_1.id = y_1.id)
+   ->  Merge Left Join
+         Merge Cond: (x.id = y.id)
+         ->  Append
                ->  Index Only Scan using fract_t0_pkey on fract_t0 x_1
-               ->  Index Only Scan using fract_t0_pkey on fract_t0 y_1
-         ->  Merge Left Join
-               Merge Cond: (x_2.id = y_2.id)
                ->  Index Only Scan using fract_t1_pkey on fract_t1 x_2
+         ->  Append
...

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/partition_join.out /tmp/cirrus-ci-build/build/testrun/pg_upgrade...
--- /tmp/cirrus-ci-build/src/test/regress/expected/partition_join.out	2024-05-05 12:28:49.616932797 +0000
+++ /tmp/cirrus-ci-build/build/testrun/pg_upgrade/002_pg_upgrade/data/results/partition_join.out	2024-05-05 12:31:02.308...
@@ -5133,17 +5133,15 @@
                               QUERY PLAN                               
 -----------------------------------------------------------------------
  Limit
-   ->  Merge Append
-         Sort Key: x.id
-         ->  Merge Left Join
-               Merge Cond: (x_1.id = y_1.id)
+   ->  Merge Left Join
+         Merge Cond: (x.id = y.id)
+         ->  Append
                ->  Index Only Scan using fract_t0_pkey on fract_t0 x_1
-               ->  Index Only Scan using fract_t0_pkey on fract_t0 y_1
-         ->  Merge Left Join
-               Merge Cond: (x_2.id = y_2.id)
                ->  Index Only Scan using fract_t1_pkey on fract_t1 x_2
+         ->  Append
...

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/partition_join.out /tmp/cirrus-ci-build/build/testrun/recovery/0...
--- /tmp/cirrus-ci-build/src/test/regress/expected/partition_join.out	2024-05-05 12:28:49.616932797 +0000
+++ /tmp/cirrus-ci-build/build/testrun/recovery/027_stream_regress/data/results/partition_join.out	2024-05-05 12:31:25.2...
@@ -5133,17 +5133,15 @@
                               QUERY PLAN                               
 -----------------------------------------------------------------------
  Limit
-   ->  Merge Append
-         Sort Key: x.id
-         ->  Merge Left Join
-               Merge Cond: (x_1.id = y_1.id)
+   ->  Merge Left Join
+         Merge Cond: (x.id = y.id)
+         ->  Append
                ->  Index Only Scan using fract_t0_pkey on fract_t0 x_1
-               ->  Index Only Scan using fract_t0_pkey on fract_t0 y_1
-         ->  Merge Left Join
-               Merge Cond: (x_2.id = y_2.id)
                ->  Index Only Scan using fract_t1_pkey on fract_t1 x_2
+         ->  Append
...

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/partition_join.out /tmp/cirrus-ci-build/build/testrun/regress/re...
--- /tmp/cirrus-ci-build/src/test/regress/expected/partition_join.out	2024-05-05 12:28:49.616932797 +0000
+++ /tmp/cirrus-ci-build/build/testrun/regress/regress/results/partition_join.out	2024-05-05 12:30:54.732912675 +0000
@@ -5133,17 +5133,15 @@
                               QUERY PLAN                               
 -----------------------------------------------------------------------
  Limit
-   ->  Merge Append
-         Sort Key: x.id
-         ->  Merge Left Join
-               Merge Cond: (x_1.id = y_1.id)
+   ->  Merge Left Join
+         Merge Cond: (x.id = y.id)
+         ->  Append
                ->  Index Only Scan using fract_t0_pkey on fract_t0 x_1
-               ->  Index Only Scan using fract_t0_pkey on fract_t0 y_1
-         ->  Merge Left Join
-               Merge Cond: (x_2.id = y_2.id)
                ->  Index Only Scan using fract_t1_pkey on fract_t1 x_2
+         ->  Append
...

diff -w -U3 C:/cirrus/src/test/regress/expected/partition_join.out C:/cirrus/build/testrun/pg_upgrade/002_pg_upgrade/dat...
--- C:/cirrus/src/test/regress/expected/partition_join.out	2024-05-05 12:28:58.581406000 +0000
+++ C:/cirrus/build/testrun/pg_upgrade/002_pg_upgrade/data/results/partition_join.out	2024-05-05 12:32:43.305722600 +000...
@@ -5133,17 +5133,15 @@
                               QUERY PLAN                               
 -----------------------------------------------------------------------
  Limit
-   ->  Merge Append
-         Sort Key: x.id
          ->  Merge Left Join
-               Merge Cond: (x_1.id = y_1.id)
+         Merge Cond: (x.id = y.id)
+         ->  Append
                ->  Index Only Scan using fract_t0_pkey on fract_t0 x_1
-               ->  Index Only Scan using fract_t0_pkey on fract_t0 y_1
-         ->  Merge Left Join
-               Merge Cond: (x_2.id = y_2.id)
                ->  Index Only Scan using fract_t1_pkey on fract_t1 x_2
+         ->  Append
+               ->  Index Only Scan using fract_t0_pkey on fract_t0 y_1
...

diff -w -U3 C:/cirrus/src/test/regress/expected/partition_join.out C:/cirrus/build/testrun/recovery/027_stream_regress/d...
--- C:/cirrus/src/test/regress/expected/partition_join.out	2024-05-05 12:28:58.581406000 +0000
+++ C:/cirrus/build/testrun/recovery/027_stream_regress/data/results/partition_join.out	2024-05-05 12:34:50.113780900 +0...
@@ -5133,17 +5133,15 @@
                               QUERY PLAN                               
 -----------------------------------------------------------------------
  Limit
-   ->  Merge Append
-         Sort Key: x.id
          ->  Merge Left Join
-               Merge Cond: (x_1.id = y_1.id)
+         Merge Cond: (x.id = y.id)
+         ->  Append
                ->  Index Only Scan using fract_t0_pkey on fract_t0 x_1
-               ->  Index Only Scan using fract_t0_pkey on fract_t0 y_1
-         ->  Merge Left Join
-               Merge Cond: (x_2.id = y_2.id)
                ->  Index Only Scan using fract_t1_pkey on fract_t1 x_2
+         ->  Append
+               ->  Index Only Scan using fract_t0_pkey on fract_t0 y_1
...

diff -w -U3 C:/cirrus/src/test/regress/expected/partition_join.out C:/cirrus/build/testrun/regress/regress/results/parti...
--- C:/cirrus/src/test/regress/expected/partition_join.out	2024-05-05 12:28:58.581406000 +0000
+++ C:/cirrus/build/testrun/regress/regress/results/partition_join.out	2024-05-05 12:32:37.547908300 +0000
@@ -5133,17 +5133,15 @@
                               QUERY PLAN                               
 -----------------------------------------------------------------------
  Limit
-   ->  Merge Append
-         Sort Key: x.id
          ->  Merge Left Join
-               Merge Cond: (x_1.id = y_1.id)
+         Merge Cond: (x.id = y.id)
+         ->  Append
                ->  Index Only Scan using fract_t0_pkey on fract_t0 x_1
-               ->  Index Only Scan using fract_t0_pkey on fract_t0 y_1
-         ->  Merge Left Join
-               Merge Cond: (x_2.id = y_2.id)
                ->  Index Only Scan using fract_t1_pkey on fract_t1 x_2
+         ->  Append
+               ->  Index Only Scan using fract_t0_pkey on fract_t0 y_1
...

diff -U3 /Users/admin/pgsql/src/test/regress/expected/partition_join.out /Users/admin/pgsql/build/testrun/pg_upgrade/002...
--- /Users/admin/pgsql/src/test/regress/expected/partition_join.out	2024-05-05 12:28:48
+++ /Users/admin/pgsql/build/testrun/pg_upgrade/002_pg_upgrade/data/results/partition_join.out	2024-05-05 12:31:10
@@ -5133,17 +5133,15 @@
                               QUERY PLAN                               
 -----------------------------------------------------------------------
  Limit
-   ->  Merge Append
-         Sort Key: x.id
-         ->  Merge Left Join
-               Merge Cond: (x_1.id = y_1.id)
+   ->  Merge Left Join
+         Merge Cond: (x.id = y.id)
+         ->  Append
                ->  Index Only Scan using fract_t0_pkey on fract_t0 x_1
-               ->  Index Only Scan using fract_t0_pkey on fract_t0 y_1
-         ->  Merge Left Join
-               Merge Cond: (x_2.id = y_2.id)
                ->  Index Only Scan using fract_t1_pkey on fract_t1 x_2
+         ->  Append
...

diff -U3 /Users/admin/pgsql/src/test/regress/expected/partition_join.out /Users/admin/pgsql/build/testrun/recovery/027_s...
--- /Users/admin/pgsql/src/test/regress/expected/partition_join.out	2024-05-05 12:28:48
+++ /Users/admin/pgsql/build/testrun/recovery/027_stream_regress/data/results/partition_join.out	2024-05-05 12:32:08
@@ -5133,17 +5133,15 @@
                               QUERY PLAN                               
 -----------------------------------------------------------------------
  Limit
-   ->  Merge Append
-         Sort Key: x.id
-         ->  Merge Left Join
-               Merge Cond: (x_1.id = y_1.id)
+   ->  Merge Left Join
+         Merge Cond: (x.id = y.id)
+         ->  Append
                ->  Index Only Scan using fract_t0_pkey on fract_t0 x_1
-               ->  Index Only Scan using fract_t0_pkey on fract_t0 y_1
-         ->  Merge Left Join
-               Merge Cond: (x_2.id = y_2.id)
                ->  Index Only Scan using fract_t1_pkey on fract_t1 x_2
+         ->  Append
...

diff -U3 /Users/admin/pgsql/src/test/regress/expected/partition_join.out /Users/admin/pgsql/build/testrun/regress/regres...
--- /Users/admin/pgsql/src/test/regress/expected/partition_join.out	2024-05-05 12:28:48
+++ /Users/admin/pgsql/build/testrun/regress/regress/results/partition_join.out	2024-05-05 12:31:07
@@ -5133,17 +5133,15 @@
                               QUERY PLAN                               
 -----------------------------------------------------------------------
  Limit
-   ->  Merge Append
-         Sort Key: x.id
-         ->  Merge Left Join
-               Merge Cond: (x_1.id = y_1.id)
+   ->  Merge Left Join
+         Merge Cond: (x.id = y.id)
+         ->  Append
                ->  Index Only Scan using fract_t0_pkey on fract_t0 x_1
-               ->  Index Only Scan using fract_t0_pkey on fract_t0 y_1
-         ->  Merge Left Join
-               Merge Cond: (x_2.id = y_2.id)
                ->  Index Only Scan using fract_t1_pkey on fract_t1 x_2
+         ->  Append
...

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/alter_table.out /tmp/cirrus-ci-build/build/testrun/pg_upgrade/00...
--- /tmp/cirrus-ci-build/src/test/regress/expected/alter_table.out	2024-05-05 05:17:51.890946000 +0000
+++ /tmp/cirrus-ci-build/build/testrun/pg_upgrade/002_pg_upgrade/data/results/alter_table.out	2024-05-05 05:19:20.059350...
@@ -3476,9 +3476,20 @@
 WHERE relkind IN ('r', 'i', 'S', 't', 'm') AND mapped_oid IS DISTINCT FROM oid;
 SELECT m.* FROM filenode_mapping m LEFT JOIN pg_class c ON c.oid = m.oid
 WHERE c.oid IS NOT NULL OR m.mapped_oid IS NOT NULL;
- oid | mapped_oid | reltablespace | relfilenode | relname 
------+------------+---------------+-------------+---------
-(0 rows)
+  oid  | mapped_oid | reltablespace | relfilenode |       relname        
+-------+------------+---------------+-------------+----------------------
+ 37773 |            |             0 |       37773 | pktable_pkey
+ 37770 |            |             0 |       37770 | pktable
+ 37775 |            |             0 |       37775 | fktable
+ 38400 |            |             0 |       38405 | foo
+ 38409 |            |             0 |       38409 | pg_toast_38400_index
+ 38408 |            |             0 |       38408 | pg_toast_38400
+ 38671 |            |             0 |       38671 | old_oids
+ 38699 |            |             0 |       38699 | pg_toast_38696
...

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/alter_table.out /tmp/cirrus-ci-build/build/testrun/recovery/027_...
--- /tmp/cirrus-ci-build/src/test/regress/expected/alter_table.out	2024-05-05 05:17:51.890946000 +0000
+++ /tmp/cirrus-ci-build/build/testrun/recovery/027_stream_regress/data/results/alter_table.out	2024-05-05 05:19:52.6656...
@@ -3476,9 +3476,20 @@
 WHERE relkind IN ('r', 'i', 'S', 't', 'm') AND mapped_oid IS DISTINCT FROM oid;
 SELECT m.* FROM filenode_mapping m LEFT JOIN pg_class c ON c.oid = m.oid
 WHERE c.oid IS NOT NULL OR m.mapped_oid IS NOT NULL;
- oid | mapped_oid | reltablespace | relfilenode | relname 
------+------------+---------------+-------------+---------
-(0 rows)
+  oid  | mapped_oid | reltablespace | relfilenode |       relname        
+-------+------------+---------------+-------------+----------------------
+ 37700 |            |             0 |       37700 | pktable_pkey
+ 37697 |            |             0 |       37697 | pktable
+ 37702 |            |             0 |       37702 | fktable
+ 38294 |            |             0 |       38303 | foo
+ 38307 |            |             0 |       38307 | pg_toast_38294_index
+ 38306 |            |             0 |       38306 | pg_toast_38294
+ 38519 |            |             0 |       38519 | old_oids
+ 38543 |            |             0 |       38543 | pg_toast_38540
...

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/alter_table.out /tmp/cirrus-ci-build/build/testrun/regress/regre...
--- /tmp/cirrus-ci-build/src/test/regress/expected/alter_table.out	2024-05-05 05:17:51.890946000 +0000
+++ /tmp/cirrus-ci-build/build/testrun/regress/regress/results/alter_table.out	2024-05-05 05:19:19.036660000 +0000
@@ -3476,9 +3476,20 @@
 WHERE relkind IN ('r', 'i', 'S', 't', 'm') AND mapped_oid IS DISTINCT FROM oid;
 SELECT m.* FROM filenode_mapping m LEFT JOIN pg_class c ON c.oid = m.oid
 WHERE c.oid IS NOT NULL OR m.mapped_oid IS NOT NULL;
- oid | mapped_oid | reltablespace | relfilenode | relname 
------+------------+---------------+-------------+---------
-(0 rows)
+  oid  | mapped_oid | reltablespace | relfilenode |       relname        
+-------+------------+---------------+-------------+----------------------
+ 37887 |            |             0 |       37887 | pktable_pkey
+ 37884 |            |             0 |       37884 | pktable
+ 37889 |            |             0 |       37889 | fktable
+ 38403 |            |             0 |       38408 | foo
+ 38412 |            |             0 |       38412 | pg_toast_38403_index
+ 38411 |            |             0 |       38411 | pg_toast_38403
+ 38673 |            |             0 |       38673 | old_oids
+ 38692 |            |             0 |       38692 | pg_toast_38689
...

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/alter_table.out /tmp/cirrus-ci-build/src/bin/pg_upgrade/tmp_chec...
--- /tmp/cirrus-ci-build/src/test/regress/expected/alter_table.out	2024-05-05 05:17:44.831470955 +0000
+++ /tmp/cirrus-ci-build/src/bin/pg_upgrade/tmp_check/results/alter_table.out	2024-05-05 05:21:30.771289568 +0000
@@ -3476,9 +3476,20 @@
 WHERE relkind IN ('r', 'i', 'S', 't', 'm') AND mapped_oid IS DISTINCT FROM oid;
 SELECT m.* FROM filenode_mapping m LEFT JOIN pg_class c ON c.oid = m.oid
 WHERE c.oid IS NOT NULL OR m.mapped_oid IS NOT NULL;
- oid | mapped_oid | reltablespace | relfilenode | relname 
------+------------+---------------+-------------+---------
-(0 rows)
+  oid  | mapped_oid | reltablespace | relfilenode |       relname        
+-------+------------+---------------+-------------+----------------------
+ 37785 |            |             0 |       37785 | pktable_pkey
+ 37781 |            |             0 |       37781 | pktable
+ 37788 |            |             0 |       37788 | fktable
+ 38485 |            |             0 |       38490 | foo
+ 38494 |            |             0 |       38494 | pg_toast_38485_index
+ 38493 |            |             0 |       38493 | pg_toast_38485
+ 38717 |            |             0 |       38717 | old_oids
+ 38735 |            |             0 |       38735 | pg_toast_38732
...

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/alter_table.out /tmp/cirrus-ci-build/src/test/recovery/tmp_check...
--- /tmp/cirrus-ci-build/src/test/regress/expected/alter_table.out	2024-05-05 05:17:44.831470955 +0000
+++ /tmp/cirrus-ci-build/src/test/recovery/tmp_check/results/alter_table.out	2024-05-05 05:22:36.999230752 +0000
@@ -3476,9 +3476,29 @@
 WHERE relkind IN ('r', 'i', 'S', 't', 'm') AND mapped_oid IS DISTINCT FROM oid;
 SELECT m.* FROM filenode_mapping m LEFT JOIN pg_class c ON c.oid = m.oid
 WHERE c.oid IS NOT NULL OR m.mapped_oid IS NOT NULL;
- oid | mapped_oid | reltablespace | relfilenode | relname 
------+------------+---------------+-------------+---------
-(0 rows)
+  oid  | mapped_oid | reltablespace | relfilenode |       relname        
+-------+------------+---------------+-------------+----------------------
+ 38885 |            |             0 |       38885 | pg_toast_38882
+ 38012 |            |             0 |       38012 | users_id_seq
+ 38026 |            |             0 |       38026 | pg_toast_38021
+ 38028 |            |             0 |       38028 | pg_toast_38021_index
+ 38021 |            |             0 |       38021 | users
+ 38271 |            |             0 |       38271 | foo
+ 38495 |            |             0 |       38495 | forc_test
+ 38886 |            |             0 |       38886 | pg_toast_38882_index
...

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/alter_table.out /tmp/cirrus-ci-build/src/test/regress/results/al...
--- /tmp/cirrus-ci-build/src/test/regress/expected/alter_table.out	2024-05-05 05:17:44.831470955 +0000
+++ /tmp/cirrus-ci-build/src/test/regress/results/alter_table.out	2024-05-05 05:20:01.811373715 +0000
@@ -3476,9 +3476,20 @@
 WHERE relkind IN ('r', 'i', 'S', 't', 'm') AND mapped_oid IS DISTINCT FROM oid;
 SELECT m.* FROM filenode_mapping m LEFT JOIN pg_class c ON c.oid = m.oid
 WHERE c.oid IS NOT NULL OR m.mapped_oid IS NOT NULL;
- oid | mapped_oid | reltablespace | relfilenode | relname 
------+------------+---------------+-------------+---------
-(0 rows)
+  oid  | mapped_oid | reltablespace | relfilenode |       relname        
+-------+------------+---------------+-------------+----------------------
+ 37965 |            |             0 |       37965 | pktable_pkey
+ 37962 |            |             0 |       37962 | pktable
+ 37967 |            |             0 |       37967 | fktable
+ 38478 |            |             0 |       38484 | foo
+ 38488 |            |             0 |       38488 | pg_toast_38478_index
+ 38487 |            |             0 |       38487 | pg_toast_38478
+ 38705 |            |             0 |       38705 | old_oids
+ 38723 |            |             0 |       38723 | pg_toast_38720
...

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/alter_table.out /tmp/cirrus-ci-build/build/testrun/pg_upgrade/00...
--- /tmp/cirrus-ci-build/src/test/regress/expected/alter_table.out	2024-05-05 05:17:42.933087773 +0000
+++ /tmp/cirrus-ci-build/build/testrun/pg_upgrade/002_pg_upgrade/data/results/alter_table.out	2024-05-05 05:19:43.649016...
@@ -3476,9 +3476,26 @@
 WHERE relkind IN ('r', 'i', 'S', 't', 'm') AND mapped_oid IS DISTINCT FROM oid;
 SELECT m.* FROM filenode_mapping m LEFT JOIN pg_class c ON c.oid = m.oid
 WHERE c.oid IS NOT NULL OR m.mapped_oid IS NOT NULL;
- oid | mapped_oid | reltablespace | relfilenode | relname 
------+------------+---------------+-------------+---------
-(0 rows)
+  oid  | mapped_oid | reltablespace | relfilenode |       relname        
+-------+------------+---------------+-------------+----------------------
+ 38226 |            |             0 |       38226 | users_id_seq
+ 38240 |            |             0 |       38240 | pg_toast_38231
+ 38241 |            |             0 |       38241 | pg_toast_38231_index
+ 38231 |            |             0 |       38231 | users
+ 38499 |            |             0 |       38499 | foo
+ 38688 |            |             0 |       38688 | forc_test
+ 37783 |            |             0 |       37783 | pktable_pkey
+ 37780 |            |             0 |       37780 | pktable
...

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/alter_table.out /tmp/cirrus-ci-build/build/testrun/recovery/027_...
--- /tmp/cirrus-ci-build/src/test/regress/expected/alter_table.out	2024-05-05 05:17:42.933087773 +0000
+++ /tmp/cirrus-ci-build/build/testrun/recovery/027_stream_regress/data/results/alter_table.out	2024-05-05 05:20:10.3209...
@@ -3476,9 +3476,20 @@
 WHERE relkind IN ('r', 'i', 'S', 't', 'm') AND mapped_oid IS DISTINCT FROM oid;
 SELECT m.* FROM filenode_mapping m LEFT JOIN pg_class c ON c.oid = m.oid
 WHERE c.oid IS NOT NULL OR m.mapped_oid IS NOT NULL;
- oid | mapped_oid | reltablespace | relfilenode | relname 
------+------------+---------------+-------------+---------
-(0 rows)
+  oid  | mapped_oid | reltablespace | relfilenode |       relname        
+-------+------------+---------------+-------------+----------------------
+ 37792 |            |             0 |       37792 | pktable_pkey
+ 37789 |            |             0 |       37789 | pktable
+ 37794 |            |             0 |       37794 | fktable
+ 38279 |            |             0 |       38287 | foo
+ 38291 |            |             0 |       38291 | pg_toast_38279_index
+ 38290 |            |             0 |       38290 | pg_toast_38279
+ 38507 |            |             0 |       38507 | old_oids
+ 38525 |            |             0 |       38525 | pg_toast_38522
...

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/alter_table.out /tmp/cirrus-ci-build/build/testrun/regress/regre...
--- /tmp/cirrus-ci-build/src/test/regress/expected/alter_table.out	2024-05-05 05:17:42.933087773 +0000
+++ /tmp/cirrus-ci-build/build/testrun/regress/regress/results/alter_table.out	2024-05-05 05:19:37.805019505 +0000
@@ -3476,9 +3476,29 @@
 WHERE relkind IN ('r', 'i', 'S', 't', 'm') AND mapped_oid IS DISTINCT FROM oid;
 SELECT m.* FROM filenode_mapping m LEFT JOIN pg_class c ON c.oid = m.oid
 WHERE c.oid IS NOT NULL OR m.mapped_oid IS NOT NULL;
- oid | mapped_oid | reltablespace | relfilenode | relname 
------+------------+---------------+-------------+---------
-(0 rows)
+  oid  | mapped_oid | reltablespace | relfilenode |       relname        
+-------+------------+---------------+-------------+----------------------
+ 38103 |            |             0 |       38103 | users_id_seq
+ 38110 |            |             0 |       38110 | pg_toast_38104
+ 38111 |            |             0 |       38111 | pg_toast_38104_index
+ 38104 |            |             0 |       38104 | users
+ 38430 |            |             0 |       38430 | foo
+ 38609 |            |             0 |       38609 | forc_test
+ 39022 |            |             0 |       39022 | pg_toast_39019
+ 39023 |            |             0 |       39023 | pg_toast_39019_index
...

diff -w -U3 C:/cirrus/src/test/regress/expected/alter_table.out C:/cirrus/build/testrun/pg_upgrade/002_pg_upgrade/data/r...
--- C:/cirrus/src/test/regress/expected/alter_table.out	2024-05-05 05:18:00.887957600 +0000
+++ C:/cirrus/build/testrun/pg_upgrade/002_pg_upgrade/data/results/alter_table.out	2024-05-05 05:21:26.073271600 +0000
@@ -3477,8 +3477,19 @@
 SELECT m.* FROM filenode_mapping m LEFT JOIN pg_class c ON c.oid = m.oid
 WHERE c.oid IS NOT NULL OR m.mapped_oid IS NOT NULL;
  oid | mapped_oid | reltablespace | relfilenode | relname 
------+------------+---------------+-------------+---------
-(0 rows)
+-------+------------+---------------+-------------+----------------------
+ 37641 |            |             0 |       37641 | pktable_pkey
+ 37638 |            |             0 |       37638 | pktable
+ 37643 |            |             0 |       37643 | fktable
+ 38132 |            |             0 |       38137 | foo
+ 38141 |            |             0 |       38141 | pg_toast_38132_index
+ 38140 |            |             0 |       38140 | pg_toast_38132
+ 38328 |            |             0 |       38328 | old_oids
+ 38345 |            |             0 |       38345 | pg_toast_38342
+ 38346 |            |             0 |       38346 | pg_toast_38342_index
+ 38342 |            |             0 |       38342 | recur2
...

diff -w -U3 C:/cirrus/src/test/regress/expected/alter_table.out C:/cirrus/build/testrun/recovery/027_stream_regress/data...
--- C:/cirrus/src/test/regress/expected/alter_table.out	2024-05-05 05:18:00.887957600 +0000
+++ C:/cirrus/build/testrun/recovery/027_stream_regress/data/results/alter_table.out	2024-05-05 05:23:40.474570500 +0000
@@ -3477,8 +3477,19 @@
 SELECT m.* FROM filenode_mapping m LEFT JOIN pg_class c ON c.oid = m.oid
 WHERE c.oid IS NOT NULL OR m.mapped_oid IS NOT NULL;
  oid | mapped_oid | reltablespace | relfilenode | relname 
------+------------+---------------+-------------+---------
-(0 rows)
+-------+------------+---------------+-------------+----------------------
+ 37358 |            |             0 |       37358 | pktable_pkey
+ 37350 |            |             0 |       37350 | pktable
+ 37363 |            |             0 |       37363 | fktable
+ 38069 |            |             0 |       38075 | foo
+ 38080 |            |             0 |       38080 | pg_toast_38069_index
+ 38078 |            |             0 |       38078 | pg_toast_38069
+ 38327 |            |             0 |       38327 | old_oids
+ 38360 |            |             0 |       38360 | pg_toast_38348
+ 38361 |            |             0 |       38361 | pg_toast_38348_index
+ 38348 |            |             0 |       38348 | recur2
...

diff -w -U3 C:/cirrus/src/test/regress/expected/alter_table.out C:/cirrus/build/testrun/regress/regress/results/alter_ta...
--- C:/cirrus/src/test/regress/expected/alter_table.out	2024-05-05 05:18:00.887957600 +0000
+++ C:/cirrus/build/testrun/regress/regress/results/alter_table.out	2024-05-05 05:21:12.053745700 +0000
@@ -3477,8 +3477,19 @@
 SELECT m.* FROM filenode_mapping m LEFT JOIN pg_class c ON c.oid = m.oid
 WHERE c.oid IS NOT NULL OR m.mapped_oid IS NOT NULL;
  oid | mapped_oid | reltablespace | relfilenode | relname 
------+------------+---------------+-------------+---------
-(0 rows)
+-------+------------+---------------+-------------+----------------------
+ 36615 |            |             0 |       36615 | pktable_pkey
+ 36610 |            |             0 |       36610 | pktable
+ 36617 |            |             0 |       36617 | fktable
+ 37983 |            |             0 |       37991 | foo
+ 37995 |            |             0 |       37995 | pg_toast_37983_index
+ 37994 |            |             0 |       37994 | pg_toast_37983
+ 38388 |            |             0 |       38388 | old_oids
+ 38405 |            |             0 |       38405 | pg_toast_38402
+ 38406 |            |             0 |       38406 | pg_toast_38402_index
+ 38402 |            |             0 |       38402 | recur2
...

diff -U3 /Users/admin/pgsql/src/test/regress/expected/alter_table.out /Users/admin/pgsql/build/testrun/pg_upgrade/002_pg...
--- /Users/admin/pgsql/src/test/regress/expected/alter_table.out	2024-05-05 05:17:41
+++ /Users/admin/pgsql/build/testrun/pg_upgrade/002_pg_upgrade/data/results/alter_table.out	2024-05-05 05:20:04
@@ -3476,9 +3476,20 @@
 WHERE relkind IN ('r', 'i', 'S', 't', 'm') AND mapped_oid IS DISTINCT FROM oid;
 SELECT m.* FROM filenode_mapping m LEFT JOIN pg_class c ON c.oid = m.oid
 WHERE c.oid IS NOT NULL OR m.mapped_oid IS NOT NULL;
- oid | mapped_oid | reltablespace | relfilenode | relname 
------+------------+---------------+-------------+---------
-(0 rows)
+  oid  | mapped_oid | reltablespace | relfilenode |       relname        
+-------+------------+---------------+-------------+----------------------
+ 37765 |            |             0 |       37765 | pktable_pkey
+ 37759 |            |             0 |       37759 | pktable
+ 37767 |            |             0 |       37767 | fktable
+ 38477 |            |             0 |       38482 | foo
+ 38486 |            |             0 |       38486 | pg_toast_38477_index
+ 38485 |            |             0 |       38485 | pg_toast_38477
+ 38726 |            |             0 |       38726 | pg_toast_38723
+ 38727 |            |             0 |       38727 | pg_toast_38723_index
...

diff -U3 /Users/admin/pgsql/src/test/regress/expected/alter_table.out /Users/admin/pgsql/build/testrun/recovery/027_stre...
--- /Users/admin/pgsql/src/test/regress/expected/alter_table.out	2024-05-05 05:17:41
+++ /Users/admin/pgsql/build/testrun/recovery/027_stream_regress/data/results/alter_table.out	2024-05-05 05:22:35
@@ -3476,9 +3476,20 @@
 WHERE relkind IN ('r', 'i', 'S', 't', 'm') AND mapped_oid IS DISTINCT FROM oid;
 SELECT m.* FROM filenode_mapping m LEFT JOIN pg_class c ON c.oid = m.oid
 WHERE c.oid IS NOT NULL OR m.mapped_oid IS NOT NULL;
- oid | mapped_oid | reltablespace | relfilenode | relname 
------+------------+---------------+-------------+---------
-(0 rows)
+  oid  | mapped_oid | reltablespace | relfilenode |       relname        
+-------+------------+---------------+-------------+----------------------
+ 37622 |            |             0 |       37622 | pktable_pkey
+ 37619 |            |             0 |       37619 | pktable
+ 37624 |            |             0 |       37624 | fktable
+ 38312 |            |             0 |       38317 | foo
+ 38321 |            |             0 |       38321 | pg_toast_38312_index
+ 38320 |            |             0 |       38320 | pg_toast_38312
+ 38533 |            |             0 |       38533 | old_oids
+ 38550 |            |             0 |       38550 | pg_toast_38547
...

diff -U3 /Users/admin/pgsql/src/test/regress/expected/alter_table.out /Users/admin/pgsql/build/testrun/regress/regress/r...
--- /Users/admin/pgsql/src/test/regress/expected/alter_table.out	2024-05-05 05:17:41
+++ /Users/admin/pgsql/build/testrun/regress/regress/results/alter_table.out	2024-05-05 05:20:01
@@ -3476,9 +3476,20 @@
 WHERE relkind IN ('r', 'i', 'S', 't', 'm') AND mapped_oid IS DISTINCT FROM oid;
 SELECT m.* FROM filenode_mapping m LEFT JOIN pg_class c ON c.oid = m.oid
 WHERE c.oid IS NOT NULL OR m.mapped_oid IS NOT NULL;
- oid | mapped_oid | reltablespace | relfilenode | relname 
------+------------+---------------+-------------+---------
-(0 rows)
+  oid  | mapped_oid | reltablespace | relfilenode |       relname        
+-------+------------+---------------+-------------+----------------------
+ 37700 |            |             0 |       37700 | pktable_pkey
+ 37697 |            |             0 |       37697 | pktable
+ 37702 |            |             0 |       37702 | fktable
+ 38498 |            |             0 |       38503 | foo
+ 38507 |            |             0 |       38507 | pg_toast_38498_index
+ 38506 |            |             0 |       38506 | pg_toast_38498
+ 38694 |            |             0 |       38694 | old_oids
+ 38711 |            |             0 |       38711 | pg_toast_38708
...

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/constraints.out /tmp/cirrus-ci-build/build/testrun/pg_upgrade/00...
--- /tmp/cirrus-ci-build/src/test/regress/expected/constraints.out	2024-05-05 02:16:56.579293000 +0000
+++ /tmp/cirrus-ci-build/build/testrun/pg_upgrade/002_pg_upgrade/data/results/constraints.out	2024-05-05 02:18:15.843139...
@@ -1190,118 +1190,10 @@
 CREATE TABLE notnull_tbl4_cld2 (PRIMARY KEY (a) DEFERRABLE) INHERITS (notnull_tbl4);
 CREATE TABLE notnull_tbl4_cld3 (PRIMARY KEY (a) DEFERRABLE, CONSTRAINT a_nn NOT NULL a) INHERITS (notnull_tbl4);
 \d+ notnull_tbl4
-                               Table "public.notnull_tbl4"
- Column |  Type   | Collation | Nullable | Default | Storage | Stats target | Description 
---------+---------+-----------+----------+---------+---------+--------------+-------------
- a      | integer |           | not null |         | plain   |              | 
-Indexes:
-    "notnull_tbl4_pkey" PRIMARY KEY, btree (a) DEFERRABLE INITIALLY DEFERRED
-Child tables: notnull_tbl4_cld,
-              notnull_tbl4_cld2,
-              notnull_tbl4_cld3
-
-\d+ notnull_tbl4_lk
-                              Table "public.notnull_tbl4_lk"
- Column |  Type   | Collation | Nullable | Default | Storage | Stats target | Description 
...

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/constraints.out /tmp/cirrus-ci-build/build/testrun/recovery/027_...
--- /tmp/cirrus-ci-build/src/test/regress/expected/constraints.out	2024-05-05 02:16:56.579293000 +0000
+++ /tmp/cirrus-ci-build/build/testrun/recovery/027_stream_regress/data/results/constraints.out	2024-05-05 02:18:37.1266...
@@ -1201,107 +1201,10 @@
               notnull_tbl4_cld3
 
 \d+ notnull_tbl4_lk
-                              Table "public.notnull_tbl4_lk"
- Column |  Type   | Collation | Nullable | Default | Storage | Stats target | Description 
---------+---------+-----------+----------+---------+---------+--------------+-------------
- a      | integer |           | not null |         | plain   |              | 
-Not-null constraints:
-    "notnull_tbl4_lk_a_not_null" NOT NULL "a"
-
-\d+ notnull_tbl4_lk2
-                             Table "public.notnull_tbl4_lk2"
- Column |  Type   | Collation | Nullable | Default | Storage | Stats target | Description 
---------+---------+-----------+----------+---------+---------+--------------+-------------
- a      | integer |           | not null |         | plain   |              | 
-Indexes:
...

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/constraints.out /tmp/cirrus-ci-build/build/testrun/regress/regre...
--- /tmp/cirrus-ci-build/src/test/regress/expected/constraints.out	2024-05-05 02:16:56.579293000 +0000
+++ /tmp/cirrus-ci-build/build/testrun/regress/regress/results/constraints.out	2024-05-05 02:18:12.931529000 +0000
@@ -1236,72 +1236,7 @@
 Inherits: notnull_tbl4
 
 \d+ notnull_tbl4_cld2
-                             Table "public.notnull_tbl4_cld2"
- Column |  Type   | Collation | Nullable | Default | Storage | Stats target | Description 
---------+---------+-----------+----------+---------+---------+--------------+-------------
- a      | integer |           | not null |         | plain   |              | 
-Indexes:
-    "notnull_tbl4_cld2_pkey" PRIMARY KEY, btree (a) DEFERRABLE
-Not-null constraints:
-    "notnull_tbl4_cld2_a_not_null" NOT NULL "a" (inherited)
-Inherits: notnull_tbl4
-
-\d+ notnull_tbl4_cld3
-                             Table "public.notnull_tbl4_cld3"
- Column |  Type   | Collation | Nullable | Default | Storage | Stats target | Description 
...

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/triggers.out /tmp/cirrus-ci-build/src/bin/pg_upgrade/tmp_check/r...
--- /tmp/cirrus-ci-build/src/test/regress/expected/triggers.out	2024-05-05 02:16:56.241718603 +0000
+++ /tmp/cirrus-ci-build/src/bin/pg_upgrade/tmp_check/results/triggers.out	2024-05-05 02:20:16.621772209 +0000
@@ -2582,1165 +2582,10 @@
   partition by range (b);
 alter table parted_constr_ancestor attach partition parted_constr
   for values from ('aaaa') to ('zzzz');
-create table parted1_constr (a int, b text);
-alter table parted_constr attach partition parted1_constr
-  for values from ('aaaa') to ('bbbb');
-create constraint trigger parted_trig after insert on parted_constr_ancestor
-  deferrable
-  for each row execute procedure trigger_notice_ab();
-create constraint trigger parted_trig_two after insert on parted_constr
-  deferrable initially deferred
-  for each row when (bark(new.b) AND new.a % 2 = 1)
-  execute procedure trigger_notice_ab();
--- The immediate constraint is fired immediately; the WHEN clause of the
--- deferred constraint is also called immediately.  The deferred constraint
--- is fired at commit time.
...

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/triggers.out /tmp/cirrus-ci-build/src/test/regress/results/trigg...
--- /tmp/cirrus-ci-build/src/test/regress/expected/triggers.out	2024-05-05 02:16:56.241718603 +0000
+++ /tmp/cirrus-ci-build/src/test/regress/results/triggers.out	2024-05-05 02:19:14.205747341 +0000
@@ -2432,1315 +2432,10 @@
   partition by range (b);
 alter table parted_irreg_ancestor drop column fd,
   drop column fd2, drop column fd3;
-create table parted_irreg (fd int, a int, fd2 int, b text)
-  partition by range (b);
-alter table parted_irreg drop column fd, drop column fd2;
-alter table parted_irreg_ancestor attach partition parted_irreg
-  for values from ('aaaa') to ('zzzz');
-create table parted1_irreg (b text, fd int, a int);
-alter table parted1_irreg drop column fd;
-alter table parted_irreg attach partition parted1_irreg
-  for values from ('aaaa') to ('bbbb');
-create trigger parted_trig after insert on parted_irreg
-  for each row execute procedure trigger_notice_ab();
-create trigger parted_trig_odd after insert on parted_irreg for each row
-  when (bark(new.b) AND new.a % 2 = 1) execute procedure trigger_notice_ab();
...

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/constraints.out /tmp/cirrus-ci-build/build/testrun/pg_upgrade/00...
--- /tmp/cirrus-ci-build/src/test/regress/expected/constraints.out	2024-05-05 02:16:56.541797668 +0000
+++ /tmp/cirrus-ci-build/build/testrun/pg_upgrade/002_pg_upgrade/data/results/constraints.out	2024-05-05 02:20:01.281697...
@@ -1001,307 +1001,7 @@
 ALTER TABLE notnull_tbl2 REPLICA IDENTITY FULL, ALTER c2 DROP IDENTITY;
 ALTER TABLE notnull_tbl2 ALTER c1 DROP NOT NULL, ALTER c2 DROP NOT NULL;
 \d+ notnull_tbl2
-                               Table "public.notnull_tbl2"
- Column |  Type   | Collation | Nullable | Default | Storage | Stats target | Description 
---------+---------+-----------+----------+---------+---------+--------------+-------------
- c1     | integer |           |          |         | plain   |              | 
- c2     | integer |           |          |         | plain   |              | 
-Indexes:
-    "notnull_tbl2_c1_key" UNIQUE CONSTRAINT, btree (c1)
-Replica Identity: FULL
-
-ROLLBACK;
--- Leave this table around for pg_upgrade testing
-CREATE TABLE notnull_tbl3 (a INTEGER NOT NULL, CHECK (a IS NOT NULL));
-ALTER TABLE notnull_tbl3 ALTER A DROP NOT NULL;
...

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/constraints.out /tmp/cirrus-ci-build/build/testrun/recovery/027_...
--- /tmp/cirrus-ci-build/src/test/regress/expected/constraints.out	2024-05-05 02:16:56.541797668 +0000
+++ /tmp/cirrus-ci-build/build/testrun/recovery/027_stream_regress/data/results/constraints.out	2024-05-05 02:20:20.3936...
@@ -886,422 +886,10 @@
  a      | integer |           |          | 
 
 select conname, contype, conkey from pg_constraint where conrelid = 'notnull_tbl1'::regclass;
- conname | contype | conkey 
----------+---------+--------
-(0 rows)
-
--- SET NOT NULL puts both back
-ALTER TABLE notnull_tbl1 ALTER a SET NOT NULL;
-\d notnull_tbl1
-            Table "public.notnull_tbl1"
- Column |  Type   | Collation | Nullable | Default 
---------+---------+-----------+----------+---------
- a      | integer |           | not null | 
-
-select conname, contype, conkey from pg_constraint where conrelid = 'notnull_tbl1'::regclass;
...

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/triggers.out /tmp/cirrus-ci-build/build/testrun/regress/regress/...
--- /tmp/cirrus-ci-build/src/test/regress/expected/triggers.out	2024-05-05 02:16:56.617797614 +0000
+++ /tmp/cirrus-ci-build/build/testrun/regress/regress/results/triggers.out	2024-05-05 02:19:57.385699773 +0000
@@ -2465,1282 +2465,10 @@
 create table parted (a int, b int, c text) partition by list (a);
 create table parted_1 partition of parted for values in (1)
   partition by list (b);
-create table parted_1_1 partition of parted_1 for values in (1);
-create function parted_trigfunc() returns trigger language plpgsql as $$
-begin
-  new.a = new.a + 1;
-  return new;
-end;
-$$;
-insert into parted values (1, 1, 'uno uno v1');    -- works
-create trigger t before insert or update or delete on parted
-  for each row execute function parted_trigfunc();
-insert into parted values (1, 1, 'uno uno v2');    -- fail
-ERROR:  moving row to another partition during a BEFORE FOR EACH ROW trigger is not supported
-DETAIL:  Before executing trigger "t", the row was to be in partition "public.parted_1_1".
...

diff -w -U3 C:/cirrus/src/test/regress/expected/updatable_views.out C:/cirrus/build/testrun/pg_upgrade/002_pg_upgrade/da...
--- C:/cirrus/src/test/regress/expected/updatable_views.out	2024-05-05 02:17:14.638739300 +0000
+++ C:/cirrus/build/testrun/pg_upgrade/002_pg_upgrade/data/results/updatable_views.out	2024-05-05 02:19:49.214734600 +00...
@@ -1155,2847 +1155,7 @@
   WHEN MATCHED THEN UPDATE SET b = s.b
   WHEN NOT MATCHED AND s.a > 0 THEN INSERT VALUES (s.a, s.b)
   RETURNING merge_action(), s.*, t.*;
- merge_action | a | b  | a |   b   
---------------+---+----+---+-------
- DELETE       | 1 | R1 | 1 | Row 1
- UPDATE       | 2 | R2 | 2 | R2
- INSERT       | 3 | R3 | 3 | R3
-(3 rows)
-
-SELECT * FROM base_tbl ORDER BY a;
- a  |   b    
-----+--------
- -2 | Row -2
- -1 | Row -1
-  0 | Row 0
...

diff -w -U3 C:/cirrus/src/test/regress/expected/triggers.out C:/cirrus/build/testrun/recovery/027_stream_regress/data/re...
--- C:/cirrus/src/test/regress/expected/triggers.out	2024-05-05 02:17:14.628020000 +0000
+++ C:/cirrus/build/testrun/recovery/027_stream_regress/data/results/triggers.out	2024-05-05 02:21:42.832636600 +0000
@@ -3046,701 +3046,7 @@
 drop trigger child1_delete_trig on child1;
 drop trigger child2_insert_trig on child2;
 drop trigger child2_update_trig on child2;
-drop trigger child2_delete_trig on child2;
-drop trigger child3_insert_trig on child3;
-drop trigger child3_update_trig on child3;
-drop trigger child3_delete_trig on child3;
-delete from parent;
-NOTICE:  trigger = parent_delete_trig, old table = (AAA,42), (BBB,42), (CCC,42)
--- copy into parent sees tuples collected from children even if there
--- is no transition-table trigger on the children
-copy parent (a, b) from stdin;
-NOTICE:  trigger = parent_insert_trig, new table = (AAA,42), (BBB,42), (CCC,42)
--- insert into parent with a before trigger on a child tuple before
--- insertion, and we capture the newly modified row in parent format
-create or replace function intercept_insert() returns trigger language plpgsql as
...

diff -w -U3 C:/cirrus/src/test/regress/expected/updatable_views.out C:/cirrus/build/testrun/regress/regress/results/upda...
--- C:/cirrus/src/test/regress/expected/updatable_views.out	2024-05-05 02:17:14.638739300 +0000
+++ C:/cirrus/build/testrun/regress/regress/results/updatable_views.out	2024-05-05 02:19:48.402233300 +0000
@@ -1155,2847 +1155,7 @@
   WHEN MATCHED THEN UPDATE SET b = s.b
   WHEN NOT MATCHED AND s.a > 0 THEN INSERT VALUES (s.a, s.b)
   RETURNING merge_action(), s.*, t.*;
- merge_action | a | b  | a |   b   
---------------+---+----+---+-------
- DELETE       | 1 | R1 | 1 | Row 1
- UPDATE       | 2 | R2 | 2 | R2
- INSERT       | 3 | R3 | 3 | R3
-(3 rows)
-
-SELECT * FROM base_tbl ORDER BY a;
- a  |   b    
-----+--------
- -2 | Row -2
- -1 | Row -1
-  0 | Row 0
...

diff -U3 /Users/admin/pgsql/src/test/regress/expected/updatable_views.out /Users/admin/pgsql/build/testrun/pg_upgrade/00...
--- /Users/admin/pgsql/src/test/regress/expected/updatable_views.out	2024-05-05 02:16:54
+++ /Users/admin/pgsql/build/testrun/pg_upgrade/002_pg_upgrade/data/results/updatable_views.out	2024-05-05 02:21:14
@@ -1152,2850 +1152,10 @@
 MERGE INTO rw_view2 t
   USING (SELECT x, 'R'||x FROM generate_series(0,3) x) AS s(a,b) ON t.a = s.a
   WHEN MATCHED AND t.a <= 1 THEN DELETE
-  WHEN MATCHED THEN UPDATE SET b = s.b
-  WHEN NOT MATCHED AND s.a > 0 THEN INSERT VALUES (s.a, s.b)
-  RETURNING merge_action(), s.*, t.*;
- merge_action | a | b  | a |   b   
---------------+---+----+---+-------
- DELETE       | 1 | R1 | 1 | Row 1
- UPDATE       | 2 | R2 | 2 | R2
- INSERT       | 3 | R3 | 3 | R3
-(3 rows)
-
-SELECT * FROM base_tbl ORDER BY a;
- a  |   b    
-----+--------
...

diff -U3 /Users/admin/pgsql/src/test/regress/expected/updatable_views.out /Users/admin/pgsql/build/testrun/recovery/027_...
--- /Users/admin/pgsql/src/test/regress/expected/updatable_views.out	2024-05-05 02:16:54
+++ /Users/admin/pgsql/build/testrun/recovery/027_stream_regress/data/results/updatable_views.out	2024-05-05 02:21:14
@@ -1152,2850 +1152,10 @@
 MERGE INTO rw_view2 t
   USING (SELECT x, 'R'||x FROM generate_series(0,3) x) AS s(a,b) ON t.a = s.a
   WHEN MATCHED AND t.a <= 1 THEN DELETE
-  WHEN MATCHED THEN UPDATE SET b = s.b
-  WHEN NOT MATCHED AND s.a > 0 THEN INSERT VALUES (s.a, s.b)
-  RETURNING merge_action(), s.*, t.*;
- merge_action | a | b  | a |   b   
---------------+---+----+---+-------
- DELETE       | 1 | R1 | 1 | Row 1
- UPDATE       | 2 | R2 | 2 | R2
- INSERT       | 3 | R3 | 3 | R3
-(3 rows)
-
-SELECT * FROM base_tbl ORDER BY a;
- a  |   b    
-----+--------
...

diff -U3 /Users/admin/pgsql/src/test/regress/expected/updatable_views.out /Users/admin/pgsql/build/testrun/regress/regre...
--- /Users/admin/pgsql/src/test/regress/expected/updatable_views.out	2024-05-05 02:16:54
+++ /Users/admin/pgsql/build/testrun/regress/regress/results/updatable_views.out	2024-05-05 02:21:13
@@ -1152,2850 +1152,10 @@
 MERGE INTO rw_view2 t
   USING (SELECT x, 'R'||x FROM generate_series(0,3) x) AS s(a,b) ON t.a = s.a
   WHEN MATCHED AND t.a <= 1 THEN DELETE
-  WHEN MATCHED THEN UPDATE SET b = s.b
-  WHEN NOT MATCHED AND s.a > 0 THEN INSERT VALUES (s.a, s.b)
-  RETURNING merge_action(), s.*, t.*;
- merge_action | a | b  | a |   b   
---------------+---+----+---+-------
- DELETE       | 1 | R1 | 1 | Row 1
- UPDATE       | 2 | R2 | 2 | R2
- INSERT       | 3 | R3 | 3 | R3
-(3 rows)
-
-SELECT * FROM base_tbl ORDER BY a;
- a  |   b    
-----+--------
...

diff -U3 /tmp/cirrus-ci-build/contrib/btree_gist/expected/without_overlaps.out /tmp/cirrus-ci-build/build/testrun/btree_...
--- /tmp/cirrus-ci-build/contrib/btree_gist/expected/without_overlaps.out	2024-05-04 13:19:05.399648000 +0000
+++ /tmp/cirrus-ci-build/build/testrun/btree_gist/regress/results/without_overlaps.out	2024-05-04 13:21:30.331287000 +00...
@@ -16,6 +16,8 @@
  valid_at | daterange |           | not null | 
 Indexes:
     "temporal_rng_pk" PRIMARY KEY (id, valid_at WITHOUT OVERLAPS)
+Check constraints:
+    "valid_at_not_empty" CHECK (NOT isempty(valid_at))
 
 SELECT pg_get_constraintdef(oid) FROM pg_constraint WHERE conname = 'temporal_rng_pk';
             pg_get_constraintdef             
@@ -60,6 +62,8 @@
  parent_id | integer   |           |          | 
 Indexes:
     "temporal_fk_rng2rng_pk" PRIMARY KEY (id, valid_at WITHOUT OVERLAPS)
+Check constraints:
+    "valid_at_not_empty" CHECK (NOT isempty(valid_at))
 Foreign-key constraints:
     "temporal_fk_rng2rng_fk" FOREIGN KEY (parent_id, PERIOD valid_at) REFERENCES temporal_rng(id, PERIOD valid_at)
...

diff -U3 /tmp/cirrus-ci-build/contrib/btree_gist/expected/without_overlaps.out /tmp/cirrus-ci-build/contrib/btree_gist/r...
--- /tmp/cirrus-ci-build/contrib/btree_gist/expected/without_overlaps.out	2024-05-04 13:18:57.577121020 +0000
+++ /tmp/cirrus-ci-build/contrib/btree_gist/results/without_overlaps.out	2024-05-04 13:22:23.692957441 +0000
@@ -16,6 +16,8 @@
  valid_at | daterange |           | not null | 
 Indexes:
     "temporal_rng_pk" PRIMARY KEY (id, valid_at WITHOUT OVERLAPS)
+Check constraints:
+    "valid_at_not_empty" CHECK (NOT isempty(valid_at))
 
 SELECT pg_get_constraintdef(oid) FROM pg_constraint WHERE conname = 'temporal_rng_pk';
             pg_get_constraintdef             
@@ -60,6 +62,8 @@
  parent_id | integer   |           |          | 
 Indexes:
     "temporal_fk_rng2rng_pk" PRIMARY KEY (id, valid_at WITHOUT OVERLAPS)
+Check constraints:
+    "valid_at_not_empty" CHECK (NOT isempty(valid_at))
 Foreign-key constraints:
     "temporal_fk_rng2rng_fk" FOREIGN KEY (parent_id, PERIOD valid_at) REFERENCES temporal_rng(id, PERIOD valid_at)
...

diff -U3 /tmp/cirrus-ci-build/contrib/btree_gist/expected/without_overlaps.out /tmp/cirrus-ci-build/build/testrun/btree_...
--- /tmp/cirrus-ci-build/contrib/btree_gist/expected/without_overlaps.out	2024-05-04 13:18:47.462899221 +0000
+++ /tmp/cirrus-ci-build/build/testrun/btree_gist/regress/results/without_overlaps.out	2024-05-04 13:22:54.226708994 +00...
@@ -16,6 +16,8 @@
  valid_at | daterange |           | not null | 
 Indexes:
     "temporal_rng_pk" PRIMARY KEY (id, valid_at WITHOUT OVERLAPS)
+Check constraints:
+    "valid_at_not_empty" CHECK (NOT isempty(valid_at))
 
 SELECT pg_get_constraintdef(oid) FROM pg_constraint WHERE conname = 'temporal_rng_pk';
             pg_get_constraintdef             
@@ -60,6 +62,8 @@
  parent_id | integer   |           |          | 
 Indexes:
     "temporal_fk_rng2rng_pk" PRIMARY KEY (id, valid_at WITHOUT OVERLAPS)
+Check constraints:
+    "valid_at_not_empty" CHECK (NOT isempty(valid_at))
 Foreign-key constraints:
     "temporal_fk_rng2rng_fk" FOREIGN KEY (parent_id, PERIOD valid_at) REFERENCES temporal_rng(id, PERIOD valid_at)
...

diff -w -U3 C:/cirrus/contrib/btree_gist/expected/without_overlaps.out C:/cirrus/build/testrun/btree_gist/regress/result...
--- C:/cirrus/contrib/btree_gist/expected/without_overlaps.out	2024-05-04 13:19:11.948279300 +0000
+++ C:/cirrus/build/testrun/btree_gist/regress/results/without_overlaps.out	2024-05-04 13:24:54.012511700 +0000
@@ -16,6 +16,8 @@
  valid_at | daterange |           | not null | 
 Indexes:
     "temporal_rng_pk" PRIMARY KEY (id, valid_at WITHOUT OVERLAPS)
+Check constraints:
+    "valid_at_not_empty" CHECK (NOT isempty(valid_at))
 
 SELECT pg_get_constraintdef(oid) FROM pg_constraint WHERE conname = 'temporal_rng_pk';
             pg_get_constraintdef             
@@ -60,6 +62,8 @@
  parent_id | integer   |           |          | 
 Indexes:
     "temporal_fk_rng2rng_pk" PRIMARY KEY (id, valid_at WITHOUT OVERLAPS)
+Check constraints:
+    "valid_at_not_empty" CHECK (NOT isempty(valid_at))
 Foreign-key constraints:
     "temporal_fk_rng2rng_fk" FOREIGN KEY (parent_id, PERIOD valid_at) REFERENCES temporal_rng(id, PERIOD valid_at)
...

diff -U3 /Users/admin/pgsql/contrib/btree_gist/expected/without_overlaps.out /Users/admin/pgsql/build/testrun/btree_gist...
--- /Users/admin/pgsql/contrib/btree_gist/expected/without_overlaps.out	2024-05-04 13:18:11
+++ /Users/admin/pgsql/build/testrun/btree_gist/regress/results/without_overlaps.out	2024-05-04 13:22:53
@@ -16,6 +16,8 @@
  valid_at | daterange |           | not null | 
 Indexes:
     "temporal_rng_pk" PRIMARY KEY (id, valid_at WITHOUT OVERLAPS)
+Check constraints:
+    "valid_at_not_empty" CHECK (NOT isempty(valid_at))
 
 SELECT pg_get_constraintdef(oid) FROM pg_constraint WHERE conname = 'temporal_rng_pk';
             pg_get_constraintdef             
@@ -60,6 +62,8 @@
  parent_id | integer   |           |          | 
 Indexes:
     "temporal_fk_rng2rng_pk" PRIMARY KEY (id, valid_at WITHOUT OVERLAPS)
+Check constraints:
+    "valid_at_not_empty" CHECK (NOT isempty(valid_at))
 Foreign-key constraints:
     "temporal_fk_rng2rng_fk" FOREIGN KEY (parent_id, PERIOD valid_at) REFERENCES temporal_rng(id, PERIOD valid_at)
...

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/sysviews.out /tmp/cirrus-ci-build/build/testrun/pg_upgrade/002_p...
--- /tmp/cirrus-ci-build/src/test/regress/expected/sysviews.out	2024-05-04 11:21:07.723259000 +0000
+++ /tmp/cirrus-ci-build/build/testrun/pg_upgrade/002_pg_upgrade/data/results/sysviews.out	2024-05-04 11:22:40.590877000...
@@ -157,7 +157,8 @@
  enable_seqscan                 | on
  enable_sort                    | on
  enable_tidscan                 | on
-(23 rows)
+ enable_toast_cache             | off
+(24 rows)
 
 -- There are always wait event descriptions for various types.
 select type, count(*) > 0 as ok FROM pg_wait_events

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/sysviews.out /tmp/cirrus-ci-build/build/testrun/recovery/027_str...
--- /tmp/cirrus-ci-build/src/test/regress/expected/sysviews.out	2024-05-04 11:21:07.723259000 +0000
+++ /tmp/cirrus-ci-build/build/testrun/recovery/027_stream_regress/data/results/sysviews.out	2024-05-04 11:23:16.6003220...
@@ -157,7 +157,8 @@
  enable_seqscan                 | on
  enable_sort                    | on
  enable_tidscan                 | on
-(23 rows)
+ enable_toast_cache             | off
+(24 rows)
 
 -- There are always wait event descriptions for various types.
 select type, count(*) > 0 as ok FROM pg_wait_events

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/sysviews.out /tmp/cirrus-ci-build/build/testrun/regress/regress/...
--- /tmp/cirrus-ci-build/src/test/regress/expected/sysviews.out	2024-05-04 11:21:07.723259000 +0000
+++ /tmp/cirrus-ci-build/build/testrun/regress/regress/results/sysviews.out	2024-05-04 11:22:39.626190000 +0000
@@ -157,7 +157,8 @@
  enable_seqscan                 | on
  enable_sort                    | on
  enable_tidscan                 | on
-(23 rows)
+ enable_toast_cache             | off
+(24 rows)
 
 -- There are always wait event descriptions for various types.
 select type, count(*) > 0 as ok FROM pg_wait_events

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/sysviews.out /tmp/cirrus-ci-build/src/bin/pg_upgrade/tmp_check/r...
--- /tmp/cirrus-ci-build/src/test/regress/expected/sysviews.out	2024-05-04 11:21:00.557873336 +0000
+++ /tmp/cirrus-ci-build/src/bin/pg_upgrade/tmp_check/results/sysviews.out	2024-05-04 11:25:23.101855807 +0000
@@ -157,7 +157,8 @@
  enable_seqscan                 | on
  enable_sort                    | on
  enable_tidscan                 | on
-(23 rows)
+ enable_toast_cache             | off
+(24 rows)
 
 -- There are always wait event descriptions for various types.
 select type, count(*) > 0 as ok FROM pg_wait_events

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/sysviews.out /tmp/cirrus-ci-build/src/test/regress/results/sysvi...
--- /tmp/cirrus-ci-build/src/test/regress/expected/sysviews.out	2024-05-04 11:21:00.557873336 +0000
+++ /tmp/cirrus-ci-build/src/test/regress/results/sysviews.out	2024-05-04 11:24:19.441871376 +0000
@@ -157,7 +157,8 @@
  enable_seqscan                 | on
  enable_sort                    | on
  enable_tidscan                 | on
-(23 rows)
+ enable_toast_cache             | off
+(24 rows)
 
 -- There are always wait event descriptions for various types.
 select type, count(*) > 0 as ok FROM pg_wait_events

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/sysviews.out /tmp/cirrus-ci-build/build/testrun/pg_upgrade/002_p...
--- /tmp/cirrus-ci-build/src/test/regress/expected/sysviews.out	2024-05-04 11:21:00.564859486 +0000
+++ /tmp/cirrus-ci-build/build/testrun/pg_upgrade/002_pg_upgrade/data/results/sysviews.out	2024-05-04 11:24:43.832729225...
@@ -157,7 +157,8 @@
  enable_seqscan                 | on
  enable_sort                    | on
  enable_tidscan                 | on
-(23 rows)
+ enable_toast_cache             | off
+(24 rows)
 
 -- There are always wait event descriptions for various types.
 select type, count(*) > 0 as ok FROM pg_wait_events

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/sysviews.out /tmp/cirrus-ci-build/build/testrun/recovery/027_str...
--- /tmp/cirrus-ci-build/src/test/regress/expected/sysviews.out	2024-05-04 11:21:00.564859486 +0000
+++ /tmp/cirrus-ci-build/build/testrun/recovery/027_stream_regress/data/results/sysviews.out	2024-05-04 11:25:21.5326308...
@@ -157,7 +157,8 @@
  enable_seqscan                 | on
  enable_sort                    | on
  enable_tidscan                 | on
-(23 rows)
+ enable_toast_cache             | off
+(24 rows)
 
 -- There are always wait event descriptions for various types.
 select type, count(*) > 0 as ok FROM pg_wait_events

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/sysviews.out /tmp/cirrus-ci-build/build/testrun/regress/regress/...
--- /tmp/cirrus-ci-build/src/test/regress/expected/sysviews.out	2024-05-04 11:21:00.564859486 +0000
+++ /tmp/cirrus-ci-build/build/testrun/regress/regress/results/sysviews.out	2024-05-04 11:24:40.176732151 +0000
@@ -157,7 +157,8 @@
  enable_seqscan                 | on
  enable_sort                    | on
  enable_tidscan                 | on
-(23 rows)
+ enable_toast_cache             | off
+(24 rows)
 
 -- There are always wait event descriptions for various types.
 select type, count(*) > 0 as ok FROM pg_wait_events

diff -w -U3 C:/cirrus/src/test/regress/expected/sysviews.out C:/cirrus/build/testrun/pg_upgrade/002_pg_upgrade/data/resu...
--- C:/cirrus/src/test/regress/expected/sysviews.out	2024-05-04 11:21:13.202795700 +0000
+++ C:/cirrus/build/testrun/pg_upgrade/002_pg_upgrade/data/results/sysviews.out	2024-05-04 11:23:56.829237100 +0000
@@ -157,7 +157,8 @@
  enable_seqscan                 | on
  enable_sort                    | on
  enable_tidscan                 | on
-(23 rows)
+ enable_toast_cache             | off
+(24 rows)
 
 -- There are always wait event descriptions for various types.
 select type, count(*) > 0 as ok FROM pg_wait_events

diff -w -U3 C:/cirrus/src/test/regress/expected/sysviews.out C:/cirrus/build/testrun/recovery/027_stream_regress/data/re...
--- C:/cirrus/src/test/regress/expected/sysviews.out	2024-05-04 11:21:13.202795700 +0000
+++ C:/cirrus/build/testrun/recovery/027_stream_regress/data/results/sysviews.out	2024-05-04 11:25:58.835102100 +0000
@@ -157,7 +157,8 @@
  enable_seqscan                 | on
  enable_sort                    | on
  enable_tidscan                 | on
-(23 rows)
+ enable_toast_cache             | off
+(24 rows)
 
 -- There are always wait event descriptions for various types.
 select type, count(*) > 0 as ok FROM pg_wait_events

diff -w -U3 C:/cirrus/src/test/regress/expected/sysviews.out C:/cirrus/build/testrun/regress/regress/results/sysviews.ou...
--- C:/cirrus/src/test/regress/expected/sysviews.out	2024-05-04 11:21:13.202795700 +0000
+++ C:/cirrus/build/testrun/regress/regress/results/sysviews.out	2024-05-04 11:23:50.214435700 +0000
@@ -157,7 +157,8 @@
  enable_seqscan                 | on
  enable_sort                    | on
  enable_tidscan                 | on
-(23 rows)
+ enable_toast_cache             | off
+(24 rows)
 
 -- There are always wait event descriptions for various types.
 select type, count(*) > 0 as ok FROM pg_wait_events

diff -U3 /Users/admin/pgsql/src/test/regress/expected/sysviews.out /Users/admin/pgsql/build/testrun/pg_upgrade/002_pg_up...
--- /Users/admin/pgsql/src/test/regress/expected/sysviews.out	2024-05-04 11:21:23
+++ /Users/admin/pgsql/build/testrun/pg_upgrade/002_pg_upgrade/data/results/sysviews.out	2024-05-04 11:23:48
@@ -157,7 +157,8 @@
  enable_seqscan                 | on
  enable_sort                    | on
  enable_tidscan                 | on
-(23 rows)
+ enable_toast_cache             | off
+(24 rows)
 
 -- There are always wait event descriptions for various types.
 select type, count(*) > 0 as ok FROM pg_wait_events

diff -U3 /Users/admin/pgsql/src/test/regress/expected/sysviews.out /Users/admin/pgsql/build/testrun/recovery/027_stream_...
--- /Users/admin/pgsql/src/test/regress/expected/sysviews.out	2024-05-04 11:21:23
+++ /Users/admin/pgsql/build/testrun/recovery/027_stream_regress/data/results/sysviews.out	2024-05-04 11:24:34
@@ -157,7 +157,8 @@
  enable_seqscan                 | on
  enable_sort                    | on
  enable_tidscan                 | on
-(23 rows)
+ enable_toast_cache             | off
+(24 rows)
 
 -- There are always wait event descriptions for various types.
 select type, count(*) > 0 as ok FROM pg_wait_events

diff -U3 /Users/admin/pgsql/src/test/regress/expected/sysviews.out /Users/admin/pgsql/build/testrun/regress/regress/resu...
--- /Users/admin/pgsql/src/test/regress/expected/sysviews.out	2024-05-04 11:21:23
+++ /Users/admin/pgsql/build/testrun/regress/regress/results/sysviews.out	2024-05-04 11:23:48
@@ -157,7 +157,8 @@
  enable_seqscan                 | on
  enable_sort                    | on
  enable_tidscan                 | on
-(23 rows)
+ enable_toast_cache             | off
+(24 rows)
 
 -- There are always wait event descriptions for various types.
 select type, count(*) > 0 as ok FROM pg_wait_events

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/create_index.out /tmp/cirrus-ci-build/build/testrun/pg_upgrade/0...
--- /tmp/cirrus-ci-build/src/test/regress/expected/create_index.out	2024-05-04 07:13:59.563638000 +0000
+++ /tmp/cirrus-ci-build/build/testrun/pg_upgrade/002_pg_upgrade/data/results/create_index.out	2024-05-04 07:15:05.63792...
@@ -2135,11 +2135,19 @@
 --
 explain (costs off)
 SELECT unique1 FROM tenk1 WHERE unique1 IN (1, 42, 7) and unique1 = ANY('{7, 8, 9}');
-                                             QUERY PLAN                                             
-----------------------------------------------------------------------------------------------------
- Index Only Scan using tenk1_unique1 on tenk1
-   Index Cond: ((unique1 = ANY ('{1,42,7}'::integer[])) AND (unique1 = ANY ('{7,8,9}'::integer[])))
-(2 rows)
+                            QUERY PLAN                             
+-------------------------------------------------------------------
+ Bitmap Heap Scan on tenk1
+   Recheck Cond: ((unique1 = 7) OR (unique1 = 8) OR (unique1 = 9))
+   Filter: (unique1 = ANY ('{1,42,7}'::integer[]))
+   ->  BitmapOr
+         ->  Bitmap Index Scan on tenk1_unique1
+               Index Cond: (unique1 = 7)
...

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/create_index.out /tmp/cirrus-ci-build/build/testrun/recovery/027...
--- /tmp/cirrus-ci-build/src/test/regress/expected/create_index.out	2024-05-04 07:13:59.563638000 +0000
+++ /tmp/cirrus-ci-build/build/testrun/recovery/027_stream_regress/data/results/create_index.out	2024-05-04 07:15:33.437...
@@ -2135,11 +2135,19 @@
 --
 explain (costs off)
 SELECT unique1 FROM tenk1 WHERE unique1 IN (1, 42, 7) and unique1 = ANY('{7, 8, 9}');
-                                             QUERY PLAN                                             
-----------------------------------------------------------------------------------------------------
- Index Only Scan using tenk1_unique1 on tenk1
-   Index Cond: ((unique1 = ANY ('{1,42,7}'::integer[])) AND (unique1 = ANY ('{7,8,9}'::integer[])))
-(2 rows)
+                            QUERY PLAN                             
+-------------------------------------------------------------------
+ Bitmap Heap Scan on tenk1
+   Recheck Cond: ((unique1 = 7) OR (unique1 = 8) OR (unique1 = 9))
+   Filter: (unique1 = ANY ('{1,42,7}'::integer[]))
+   ->  BitmapOr
+         ->  Bitmap Index Scan on tenk1_unique1
+               Index Cond: (unique1 = 7)
...

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/create_index.out /tmp/cirrus-ci-build/build/testrun/regress/regr...
--- /tmp/cirrus-ci-build/src/test/regress/expected/create_index.out	2024-05-04 07:13:59.563638000 +0000
+++ /tmp/cirrus-ci-build/build/testrun/regress/regress/results/create_index.out	2024-05-04 07:15:03.552512000 +0000
@@ -2135,11 +2135,19 @@
 --
 explain (costs off)
 SELECT unique1 FROM tenk1 WHERE unique1 IN (1, 42, 7) and unique1 = ANY('{7, 8, 9}');
-                                             QUERY PLAN                                             
-----------------------------------------------------------------------------------------------------
- Index Only Scan using tenk1_unique1 on tenk1
-   Index Cond: ((unique1 = ANY ('{1,42,7}'::integer[])) AND (unique1 = ANY ('{7,8,9}'::integer[])))
-(2 rows)
+                            QUERY PLAN                             
+-------------------------------------------------------------------
+ Bitmap Heap Scan on tenk1
+   Recheck Cond: ((unique1 = 7) OR (unique1 = 8) OR (unique1 = 9))
+   Filter: (unique1 = ANY ('{1,42,7}'::integer[]))
+   ->  BitmapOr
+         ->  Bitmap Index Scan on tenk1_unique1
+               Index Cond: (unique1 = 7)
...

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/create_index.out /tmp/cirrus-ci-build/src/bin/pg_upgrade/tmp_che...
--- /tmp/cirrus-ci-build/src/test/regress/expected/create_index.out	2024-05-04 07:13:58.825475638 +0000
+++ /tmp/cirrus-ci-build/src/bin/pg_upgrade/tmp_check/results/create_index.out	2024-05-04 07:17:33.665532850 +0000
@@ -2135,11 +2135,19 @@
 --
 explain (costs off)
 SELECT unique1 FROM tenk1 WHERE unique1 IN (1, 42, 7) and unique1 = ANY('{7, 8, 9}');
-                                             QUERY PLAN                                             
-----------------------------------------------------------------------------------------------------
- Index Only Scan using tenk1_unique1 on tenk1
-   Index Cond: ((unique1 = ANY ('{1,42,7}'::integer[])) AND (unique1 = ANY ('{7,8,9}'::integer[])))
-(2 rows)
+                            QUERY PLAN                             
+-------------------------------------------------------------------
+ Bitmap Heap Scan on tenk1
+   Recheck Cond: ((unique1 = 7) OR (unique1 = 8) OR (unique1 = 9))
+   Filter: (unique1 = ANY ('{1,42,7}'::integer[]))
+   ->  BitmapOr
+         ->  Bitmap Index Scan on tenk1_unique1
+               Index Cond: (unique1 = 7)
...

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/create_index.out /tmp/cirrus-ci-build/src/test/recovery/tmp_chec...
--- /tmp/cirrus-ci-build/src/test/regress/expected/create_index.out	2024-05-04 07:13:58.825475638 +0000
+++ /tmp/cirrus-ci-build/src/test/recovery/tmp_check/results/create_index.out	2024-05-04 07:19:30.913518649 +0000
@@ -2135,11 +2135,19 @@
 --
 explain (costs off)
 SELECT unique1 FROM tenk1 WHERE unique1 IN (1, 42, 7) and unique1 = ANY('{7, 8, 9}');
-                                             QUERY PLAN                                             
-----------------------------------------------------------------------------------------------------
- Index Only Scan using tenk1_unique1 on tenk1
-   Index Cond: ((unique1 = ANY ('{1,42,7}'::integer[])) AND (unique1 = ANY ('{7,8,9}'::integer[])))
-(2 rows)
+                            QUERY PLAN                             
+-------------------------------------------------------------------
+ Bitmap Heap Scan on tenk1
+   Recheck Cond: ((unique1 = 7) OR (unique1 = 8) OR (unique1 = 9))
+   Filter: (unique1 = ANY ('{1,42,7}'::integer[]))
+   ->  BitmapOr
+         ->  Bitmap Index Scan on tenk1_unique1
+               Index Cond: (unique1 = 7)
...

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/create_index.out /tmp/cirrus-ci-build/src/test/regress/results/c...
--- /tmp/cirrus-ci-build/src/test/regress/expected/create_index.out	2024-05-04 07:13:58.825475638 +0000
+++ /tmp/cirrus-ci-build/src/test/regress/results/create_index.out	2024-05-04 07:16:03.893472416 +0000
@@ -2135,11 +2135,19 @@
 --
 explain (costs off)
 SELECT unique1 FROM tenk1 WHERE unique1 IN (1, 42, 7) and unique1 = ANY('{7, 8, 9}');
-                                             QUERY PLAN                                             
-----------------------------------------------------------------------------------------------------
- Index Only Scan using tenk1_unique1 on tenk1
-   Index Cond: ((unique1 = ANY ('{1,42,7}'::integer[])) AND (unique1 = ANY ('{7,8,9}'::integer[])))
-(2 rows)
+                            QUERY PLAN                             
+-------------------------------------------------------------------
+ Bitmap Heap Scan on tenk1
+   Recheck Cond: ((unique1 = 7) OR (unique1 = 8) OR (unique1 = 9))
+   Filter: (unique1 = ANY ('{1,42,7}'::integer[]))
+   ->  BitmapOr
+         ->  Bitmap Index Scan on tenk1_unique1
+               Index Cond: (unique1 = 7)
...

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/create_index.out /tmp/cirrus-ci-build/build/testrun/pg_upgrade/0...
--- /tmp/cirrus-ci-build/src/test/regress/expected/create_index.out	2024-05-04 07:13:54.850822409 +0000
+++ /tmp/cirrus-ci-build/build/testrun/pg_upgrade/002_pg_upgrade/data/results/create_index.out	2024-05-04 07:15:51.89081...
@@ -2135,11 +2135,19 @@
 --
 explain (costs off)
 SELECT unique1 FROM tenk1 WHERE unique1 IN (1, 42, 7) and unique1 = ANY('{7, 8, 9}');
-                                             QUERY PLAN                                             
-----------------------------------------------------------------------------------------------------
- Index Only Scan using tenk1_unique1 on tenk1
-   Index Cond: ((unique1 = ANY ('{1,42,7}'::integer[])) AND (unique1 = ANY ('{7,8,9}'::integer[])))
-(2 rows)
+                            QUERY PLAN                             
+-------------------------------------------------------------------
+ Bitmap Heap Scan on tenk1
+   Recheck Cond: ((unique1 = 7) OR (unique1 = 8) OR (unique1 = 9))
+   Filter: (unique1 = ANY ('{1,42,7}'::integer[]))
+   ->  BitmapOr
+         ->  Bitmap Index Scan on tenk1_unique1
+               Index Cond: (unique1 = 7)
...

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/create_index.out /tmp/cirrus-ci-build/build/testrun/recovery/027...
--- /tmp/cirrus-ci-build/src/test/regress/expected/create_index.out	2024-05-04 07:13:54.850822409 +0000
+++ /tmp/cirrus-ci-build/build/testrun/recovery/027_stream_regress/data/results/create_index.out	2024-05-04 07:16:20.610...
@@ -2135,11 +2135,19 @@
 --
 explain (costs off)
 SELECT unique1 FROM tenk1 WHERE unique1 IN (1, 42, 7) and unique1 = ANY('{7, 8, 9}');
-                                             QUERY PLAN                                             
-----------------------------------------------------------------------------------------------------
- Index Only Scan using tenk1_unique1 on tenk1
-   Index Cond: ((unique1 = ANY ('{1,42,7}'::integer[])) AND (unique1 = ANY ('{7,8,9}'::integer[])))
-(2 rows)
+                            QUERY PLAN                             
+-------------------------------------------------------------------
+ Bitmap Heap Scan on tenk1
+   Recheck Cond: ((unique1 = 7) OR (unique1 = 8) OR (unique1 = 9))
+   Filter: (unique1 = ANY ('{1,42,7}'::integer[]))
+   ->  BitmapOr
+         ->  Bitmap Index Scan on tenk1_unique1
+               Index Cond: (unique1 = 7)
...

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/create_index.out /tmp/cirrus-ci-build/build/testrun/regress/regr...
--- /tmp/cirrus-ci-build/src/test/regress/expected/create_index.out	2024-05-04 07:13:54.850822409 +0000
+++ /tmp/cirrus-ci-build/build/testrun/regress/regress/results/create_index.out	2024-05-04 07:15:49.918815704 +0000
@@ -2135,11 +2135,19 @@
 --
 explain (costs off)
 SELECT unique1 FROM tenk1 WHERE unique1 IN (1, 42, 7) and unique1 = ANY('{7, 8, 9}');
-                                             QUERY PLAN                                             
-----------------------------------------------------------------------------------------------------
- Index Only Scan using tenk1_unique1 on tenk1
-   Index Cond: ((unique1 = ANY ('{1,42,7}'::integer[])) AND (unique1 = ANY ('{7,8,9}'::integer[])))
-(2 rows)
+                            QUERY PLAN                             
+-------------------------------------------------------------------
+ Bitmap Heap Scan on tenk1
+   Recheck Cond: ((unique1 = 7) OR (unique1 = 8) OR (unique1 = 9))
+   Filter: (unique1 = ANY ('{1,42,7}'::integer[]))
+   ->  BitmapOr
+         ->  Bitmap Index Scan on tenk1_unique1
+               Index Cond: (unique1 = 7)
...

diff -w -U3 C:/cirrus/src/test/regress/expected/create_index.out C:/cirrus/build/testrun/pg_upgrade/002_pg_upgrade/data/...
--- C:/cirrus/src/test/regress/expected/create_index.out	2024-05-04 07:14:13.703027100 +0000
+++ C:/cirrus/build/testrun/pg_upgrade/002_pg_upgrade/data/results/create_index.out	2024-05-04 07:16:30.954280000 +0000
@@ -2136,10 +2136,18 @@
 explain (costs off)
 SELECT unique1 FROM tenk1 WHERE unique1 IN (1, 42, 7) and unique1 = ANY('{7, 8, 9}');
                                              QUERY PLAN                                             
-----------------------------------------------------------------------------------------------------
- Index Only Scan using tenk1_unique1 on tenk1
-   Index Cond: ((unique1 = ANY ('{1,42,7}'::integer[])) AND (unique1 = ANY ('{7,8,9}'::integer[])))
-(2 rows)
+-------------------------------------------------------------------
+ Bitmap Heap Scan on tenk1
+   Recheck Cond: ((unique1 = 7) OR (unique1 = 8) OR (unique1 = 9))
+   Filter: (unique1 = ANY ('{1,42,7}'::integer[]))
+   ->  BitmapOr
+         ->  Bitmap Index Scan on tenk1_unique1
+               Index Cond: (unique1 = 7)
+         ->  Bitmap Index Scan on tenk1_unique1
+               Index Cond: (unique1 = 8)
...

diff -w -U3 C:/cirrus/src/test/regress/expected/create_index.out C:/cirrus/build/testrun/recovery/027_stream_regress/dat...
--- C:/cirrus/src/test/regress/expected/create_index.out	2024-05-04 07:14:13.703027100 +0000
+++ C:/cirrus/build/testrun/recovery/027_stream_regress/data/results/create_index.out	2024-05-04 07:18:31.753321000 +000...
@@ -2136,10 +2136,18 @@
 explain (costs off)
 SELECT unique1 FROM tenk1 WHERE unique1 IN (1, 42, 7) and unique1 = ANY('{7, 8, 9}');
                                              QUERY PLAN                                             
-----------------------------------------------------------------------------------------------------
- Index Only Scan using tenk1_unique1 on tenk1
-   Index Cond: ((unique1 = ANY ('{1,42,7}'::integer[])) AND (unique1 = ANY ('{7,8,9}'::integer[])))
-(2 rows)
+-------------------------------------------------------------------
+ Bitmap Heap Scan on tenk1
+   Recheck Cond: ((unique1 = 7) OR (unique1 = 8) OR (unique1 = 9))
+   Filter: (unique1 = ANY ('{1,42,7}'::integer[]))
+   ->  BitmapOr
+         ->  Bitmap Index Scan on tenk1_unique1
+               Index Cond: (unique1 = 7)
+         ->  Bitmap Index Scan on tenk1_unique1
+               Index Cond: (unique1 = 8)
...

diff -w -U3 C:/cirrus/src/test/regress/expected/create_index.out C:/cirrus/build/testrun/regress/regress/results/create_...
--- C:/cirrus/src/test/regress/expected/create_index.out	2024-05-04 07:14:13.703027100 +0000
+++ C:/cirrus/build/testrun/regress/regress/results/create_index.out	2024-05-04 07:16:18.512206800 +0000
@@ -2136,10 +2136,18 @@
 explain (costs off)
 SELECT unique1 FROM tenk1 WHERE unique1 IN (1, 42, 7) and unique1 = ANY('{7, 8, 9}');
                                              QUERY PLAN                                             
-----------------------------------------------------------------------------------------------------
- Index Only Scan using tenk1_unique1 on tenk1
-   Index Cond: ((unique1 = ANY ('{1,42,7}'::integer[])) AND (unique1 = ANY ('{7,8,9}'::integer[])))
-(2 rows)
+-------------------------------------------------------------------
+ Bitmap Heap Scan on tenk1
+   Recheck Cond: ((unique1 = 7) OR (unique1 = 8) OR (unique1 = 9))
+   Filter: (unique1 = ANY ('{1,42,7}'::integer[]))
+   ->  BitmapOr
+         ->  Bitmap Index Scan on tenk1_unique1
+               Index Cond: (unique1 = 7)
+         ->  Bitmap Index Scan on tenk1_unique1
+               Index Cond: (unique1 = 8)
...

diff -U3 /Users/admin/pgsql/src/test/regress/expected/create_index.out /Users/admin/pgsql/build/testrun/pg_upgrade/002_p...
--- /Users/admin/pgsql/src/test/regress/expected/create_index.out	2024-05-04 07:13:52
+++ /Users/admin/pgsql/build/testrun/pg_upgrade/002_pg_upgrade/data/results/create_index.out	2024-05-04 07:16:33
@@ -2135,11 +2135,19 @@
 --
 explain (costs off)
 SELECT unique1 FROM tenk1 WHERE unique1 IN (1, 42, 7) and unique1 = ANY('{7, 8, 9}');
-                                             QUERY PLAN                                             
-----------------------------------------------------------------------------------------------------
- Index Only Scan using tenk1_unique1 on tenk1
-   Index Cond: ((unique1 = ANY ('{1,42,7}'::integer[])) AND (unique1 = ANY ('{7,8,9}'::integer[])))
-(2 rows)
+                            QUERY PLAN                             
+-------------------------------------------------------------------
+ Bitmap Heap Scan on tenk1
+   Recheck Cond: ((unique1 = 7) OR (unique1 = 8) OR (unique1 = 9))
+   Filter: (unique1 = ANY ('{1,42,7}'::integer[]))
+   ->  BitmapOr
+         ->  Bitmap Index Scan on tenk1_unique1
+               Index Cond: (unique1 = 7)
...

diff -U3 /Users/admin/pgsql/src/test/regress/expected/create_index.out /Users/admin/pgsql/build/testrun/recovery/027_str...
--- /Users/admin/pgsql/src/test/regress/expected/create_index.out	2024-05-04 07:13:52
+++ /Users/admin/pgsql/build/testrun/recovery/027_stream_regress/data/results/create_index.out	2024-05-04 07:17:14
@@ -2135,11 +2135,19 @@
 --
 explain (costs off)
 SELECT unique1 FROM tenk1 WHERE unique1 IN (1, 42, 7) and unique1 = ANY('{7, 8, 9}');
-                                             QUERY PLAN                                             
-----------------------------------------------------------------------------------------------------
- Index Only Scan using tenk1_unique1 on tenk1
-   Index Cond: ((unique1 = ANY ('{1,42,7}'::integer[])) AND (unique1 = ANY ('{7,8,9}'::integer[])))
-(2 rows)
+                            QUERY PLAN                             
+-------------------------------------------------------------------
+ Bitmap Heap Scan on tenk1
+   Recheck Cond: ((unique1 = 7) OR (unique1 = 8) OR (unique1 = 9))
+   Filter: (unique1 = ANY ('{1,42,7}'::integer[]))
+   ->  BitmapOr
+         ->  Bitmap Index Scan on tenk1_unique1
+               Index Cond: (unique1 = 7)
...

diff -U3 /Users/admin/pgsql/src/test/regress/expected/create_index.out /Users/admin/pgsql/build/testrun/regress/regress/...
--- /Users/admin/pgsql/src/test/regress/expected/create_index.out	2024-05-04 07:13:52
+++ /Users/admin/pgsql/build/testrun/regress/regress/results/create_index.out	2024-05-04 07:16:32
@@ -2135,11 +2135,19 @@
 --
 explain (costs off)
 SELECT unique1 FROM tenk1 WHERE unique1 IN (1, 42, 7) and unique1 = ANY('{7, 8, 9}');
-                                             QUERY PLAN                                             
-----------------------------------------------------------------------------------------------------
- Index Only Scan using tenk1_unique1 on tenk1
-   Index Cond: ((unique1 = ANY ('{1,42,7}'::integer[])) AND (unique1 = ANY ('{7,8,9}'::integer[])))
-(2 rows)
+                            QUERY PLAN                             
+-------------------------------------------------------------------
+ Bitmap Heap Scan on tenk1
+   Recheck Cond: ((unique1 = 7) OR (unique1 = 8) OR (unique1 = 9))
+   Filter: (unique1 = ANY ('{1,42,7}'::integer[]))
+   ->  BitmapOr
+         ->  Bitmap Index Scan on tenk1_unique1
+               Index Cond: (unique1 = 7)
...

diff -U3 /tmp/cirrus-ci-build/contrib/pg_freespacemap/expected/pg_freespacemap.out /tmp/cirrus-ci-build/build/testrun/pg...
--- /tmp/cirrus-ci-build/contrib/pg_freespacemap/expected/pg_freespacemap.out	2024-05-04 07:04:24.043735000 +0000
+++ /tmp/cirrus-ci-build/build/testrun/pg_freespacemap/regress/results/pg_freespacemap.out	2024-05-04 07:06:19.284828000...
@@ -1,4 +1,5 @@
 CREATE EXTENSION pg_freespacemap;
+ERROR:  extension "pg_freespacemap" has no installation script nor update path for version "1.3"
 CREATE TABLE freespace_tab (c1 int) WITH (autovacuum_enabled = off);
 CREATE INDEX freespace_brin ON freespace_tab USING brin (c1);
 CREATE INDEX freespace_btree ON freespace_tab USING btree (c1);
@@ -8,78 +9,39 @@
   SELECT rel.id, fsm.blkno, (fsm.avail > 0) AS is_avail
     FROM rel, LATERAL pg_freespace(rel.id) AS fsm
     ORDER BY 1, 2;
-       id        | blkno | is_avail 
------------------+-------+----------
- freespace_brin  |     0 | f
- freespace_brin  |     1 | f
- freespace_brin  |     2 | t
- freespace_btree |     0 | f
- freespace_hash  |     0 | f
...

diff -U3 /tmp/cirrus-ci-build/contrib/pg_freespacemap/expected/pg_freespacemap.out /tmp/cirrus-ci-build/build/testrun/pg...
--- /tmp/cirrus-ci-build/contrib/pg_freespacemap/expected/pg_freespacemap.out	2024-05-04 07:04:24.069091841 +0000
+++ /tmp/cirrus-ci-build/build/testrun/pg_freespacemap/regress/results/pg_freespacemap.out	2024-05-04 07:07:33.328967490...
@@ -1,4 +1,5 @@
 CREATE EXTENSION pg_freespacemap;
+ERROR:  extension "pg_freespacemap" has no installation script nor update path for version "1.3"
 CREATE TABLE freespace_tab (c1 int) WITH (autovacuum_enabled = off);
 CREATE INDEX freespace_brin ON freespace_tab USING brin (c1);
 CREATE INDEX freespace_btree ON freespace_tab USING btree (c1);
@@ -8,78 +9,39 @@
   SELECT rel.id, fsm.blkno, (fsm.avail > 0) AS is_avail
     FROM rel, LATERAL pg_freespace(rel.id) AS fsm
     ORDER BY 1, 2;
-       id        | blkno | is_avail 
------------------+-------+----------
- freespace_brin  |     0 | f
- freespace_brin  |     1 | f
- freespace_brin  |     2 | t
- freespace_btree |     0 | f
- freespace_hash  |     0 | f
...

diff -w -U3 C:/cirrus/contrib/pg_freespacemap/expected/pg_freespacemap.out C:/cirrus/build/testrun/pg_freespacemap/regre...
--- C:/cirrus/contrib/pg_freespacemap/expected/pg_freespacemap.out	2024-05-04 07:04:40.675900700 +0000
+++ C:/cirrus/build/testrun/pg_freespacemap/regress/results/pg_freespacemap.out	2024-05-04 07:11:19.500483600 +0000
@@ -1,4 +1,5 @@
 CREATE EXTENSION pg_freespacemap;
+ERROR:  extension "pg_freespacemap" has no installation script nor update path for version "1.3"
 CREATE TABLE freespace_tab (c1 int) WITH (autovacuum_enabled = off);
 CREATE INDEX freespace_brin ON freespace_tab USING brin (c1);
 CREATE INDEX freespace_btree ON freespace_tab USING btree (c1);
@@ -8,78 +9,39 @@
   SELECT rel.id, fsm.blkno, (fsm.avail > 0) AS is_avail
     FROM rel, LATERAL pg_freespace(rel.id) AS fsm
     ORDER BY 1, 2;
-       id        | blkno | is_avail 
------------------+-------+----------
- freespace_brin  |     0 | f
- freespace_brin  |     1 | f
- freespace_brin  |     2 | t
- freespace_btree |     0 | f
- freespace_hash  |     0 | f
...

diff -U3 /Users/admin/pgsql/contrib/pg_freespacemap/expected/pg_freespacemap.out /Users/admin/pgsql/build/testrun/pg_fre...
--- /Users/admin/pgsql/contrib/pg_freespacemap/expected/pg_freespacemap.out	2024-05-04 07:04:21
+++ /Users/admin/pgsql/build/testrun/pg_freespacemap/regress/results/pg_freespacemap.out	2024-05-04 07:07:11
@@ -1,4 +1,5 @@
 CREATE EXTENSION pg_freespacemap;
+ERROR:  extension "pg_freespacemap" has no installation script nor update path for version "1.3"
 CREATE TABLE freespace_tab (c1 int) WITH (autovacuum_enabled = off);
 CREATE INDEX freespace_brin ON freespace_tab USING brin (c1);
 CREATE INDEX freespace_btree ON freespace_tab USING btree (c1);
@@ -8,78 +9,39 @@
   SELECT rel.id, fsm.blkno, (fsm.avail > 0) AS is_avail
     FROM rel, LATERAL pg_freespace(rel.id) AS fsm
     ORDER BY 1, 2;
-       id        | blkno | is_avail 
------------------+-------+----------
- freespace_brin  |     0 | f
- freespace_brin  |     1 | f
- freespace_brin  |     2 | t
- freespace_btree |     0 | f
- freespace_hash  |     0 | f
...

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/triggers.out /tmp/cirrus-ci-build/build/testrun/pg_upgrade/002_p...
--- /tmp/cirrus-ci-build/src/test/regress/expected/triggers.out	2024-05-04 04:26:16.299156000 +0000
+++ /tmp/cirrus-ci-build/build/testrun/pg_upgrade/002_pg_upgrade/data/results/triggers.out	2024-05-04 04:27:56.613074000...
@@ -3720,7 +3720,9 @@
 -- test who runs deferred trigger functions
 -- setup
 create role groot;
+WARNING:  roles created by regression test cases should have names starting with "regress_"
 create role outis;
+WARNING:  roles created by regression test cases should have names starting with "regress_"
 create function whoami() returns trigger language plpgsql
 as $$
 begin

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/triggers.out /tmp/cirrus-ci-build/build/testrun/recovery/027_str...
--- /tmp/cirrus-ci-build/src/test/regress/expected/triggers.out	2024-05-04 04:26:16.299156000 +0000
+++ /tmp/cirrus-ci-build/build/testrun/recovery/027_stream_regress/data/results/triggers.out	2024-05-04 04:28:26.0609400...
@@ -3720,7 +3720,9 @@
 -- test who runs deferred trigger functions
 -- setup
 create role groot;
+WARNING:  roles created by regression test cases should have names starting with "regress_"
 create role outis;
+WARNING:  roles created by regression test cases should have names starting with "regress_"
 create function whoami() returns trigger language plpgsql
 as $$
 begin

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/triggers.out /tmp/cirrus-ci-build/build/testrun/regress/regress/...
--- /tmp/cirrus-ci-build/src/test/regress/expected/triggers.out	2024-05-04 04:26:16.299156000 +0000
+++ /tmp/cirrus-ci-build/build/testrun/regress/regress/results/triggers.out	2024-05-04 04:27:53.081385000 +0000
@@ -3720,7 +3720,9 @@
 -- test who runs deferred trigger functions
 -- setup
 create role groot;
+WARNING:  roles created by regression test cases should have names starting with "regress_"
 create role outis;
+WARNING:  roles created by regression test cases should have names starting with "regress_"
 create function whoami() returns trigger language plpgsql
 as $$
 begin

diff -U3 /tmp/cirrus-ci-build/contrib/unaccent/expected/unaccent.out /tmp/cirrus-ci-build/build/testrun/unaccent/regress...
--- /tmp/cirrus-ci-build/contrib/unaccent/expected/unaccent.out	2024-05-04 02:14:48.147722000 +0000
+++ /tmp/cirrus-ci-build/build/testrun/unaccent/regress/results/unaccent.out	2024-05-04 02:16:32.015899000 +0000
@@ -8,8 +8,10 @@
 \quit
 \endif
 CREATE EXTENSION unaccent;
+WARNING:  duplicate source strings, first one will be used
 SET client_encoding TO 'UTF8';
 SELECT unaccent('foobar');
+WARNING:  duplicate source strings, first one will be used
  unaccent 
 ----------
  foobar

diff -U3 /tmp/cirrus-ci-build/contrib/unaccent/expected/unaccent.out /tmp/cirrus-ci-build/contrib/unaccent/results/unacc...
--- /tmp/cirrus-ci-build/contrib/unaccent/expected/unaccent.out	2024-05-04 02:14:39.182339293 +0000
+++ /tmp/cirrus-ci-build/contrib/unaccent/results/unaccent.out	2024-05-04 02:18:03.654175055 +0000
@@ -8,8 +8,10 @@
 \quit
 \endif
 CREATE EXTENSION unaccent;
+WARNING:  duplicate source strings, first one will be used
 SET client_encoding TO 'UTF8';
 SELECT unaccent('foobar');
+WARNING:  duplicate source strings, first one will be used
  unaccent 
 ----------
  foobar

diff -U3 /tmp/cirrus-ci-build/contrib/unaccent/expected/unaccent.out /tmp/cirrus-ci-build/build/testrun/unaccent/regress...
--- /tmp/cirrus-ci-build/contrib/unaccent/expected/unaccent.out	2024-05-04 02:14:41.455091948 +0000
+++ /tmp/cirrus-ci-build/build/testrun/unaccent/regress/results/unaccent.out	2024-05-04 02:17:02.655102978 +0000
@@ -8,8 +8,10 @@
 \quit
 \endif
 CREATE EXTENSION unaccent;
+WARNING:  duplicate source strings, first one will be used
 SET client_encoding TO 'UTF8';
 SELECT unaccent('foobar');
+WARNING:  duplicate source strings, first one will be used
  unaccent 
 ----------
  foobar

diff -U3 /Users/admin/pgsql/contrib/unaccent/expected/unaccent.out /Users/admin/pgsql/build/testrun/unaccent/regress/res...
--- /Users/admin/pgsql/contrib/unaccent/expected/unaccent.out	2024-05-04 02:14:40
+++ /Users/admin/pgsql/build/testrun/unaccent/regress/results/unaccent.out	2024-05-04 02:20:53
@@ -8,8 +8,10 @@
 \quit
 \endif
 CREATE EXTENSION unaccent;
+WARNING:  duplicate source strings, first one will be used
 SET client_encoding TO 'UTF8';
 SELECT unaccent('foobar');
+WARNING:  duplicate source strings, first one will be used
  unaccent 
 ----------
  foobar

diff -U3 /tmp/cirrus-ci-build/src/test/modules/injection_points/expected/injection_points.out /tmp/cirrus-ci-build/build...
--- /tmp/cirrus-ci-build/src/test/modules/injection_points/expected/injection_points.out	2024-05-03 21:12:22.820109000 +...
+++ /tmp/cirrus-ci-build/build/testrun/injection_points/regress/results/injection_points.out	2024-05-03 21:15:18.8003690...
@@ -169,44 +169,10 @@
 -- Wait for the previous backend process to exit, ensuring that its local
 -- injection points are cleaned up.
 SELECT wait_pid(:'oldpid');
- wait_pid 
-----------
- 
-(1 row)
-
-SELECT injection_points_run('TestConditionLocal1'); -- nothing
- injection_points_run 
-----------------------
- 
-(1 row)
-
-SELECT injection_points_run('TestConditionLocal2'); -- nothing
- injection_points_run 
...

diff -U3 /tmp/cirrus-ci-build/src/test/modules/injection_points/expected/injection_points.out /tmp/cirrus-ci-build/src/t...
--- /tmp/cirrus-ci-build/src/test/modules/injection_points/expected/injection_points.out	2024-05-03 21:12:17.429659968 +...
+++ /tmp/cirrus-ci-build/src/test/modules/injection_points/results/injection_points.out	2024-05-03 21:18:12.245679063 +0...
@@ -169,44 +169,10 @@
 -- Wait for the previous backend process to exit, ensuring that its local
 -- injection points are cleaned up.
 SELECT wait_pid(:'oldpid');
- wait_pid 
-----------
- 
-(1 row)
-
-SELECT injection_points_run('TestConditionLocal1'); -- nothing
- injection_points_run 
-----------------------
- 
-(1 row)
-
-SELECT injection_points_run('TestConditionLocal2'); -- nothing
- injection_points_run 
...

diff -U3 /tmp/cirrus-ci-build/src/test/modules/injection_points/expected/injection_points.out /tmp/cirrus-ci-build/build...
--- /tmp/cirrus-ci-build/src/test/modules/injection_points/expected/injection_points.out	2024-05-03 21:12:16.825447879 +...
+++ /tmp/cirrus-ci-build/build/testrun/injection_points/regress/results/injection_points.out	2024-05-03 21:17:17.8295078...
@@ -169,44 +169,10 @@
 -- Wait for the previous backend process to exit, ensuring that its local
 -- injection points are cleaned up.
 SELECT wait_pid(:'oldpid');
- wait_pid 
-----------
- 
-(1 row)
-
-SELECT injection_points_run('TestConditionLocal1'); -- nothing
- injection_points_run 
-----------------------
- 
-(1 row)
-
-SELECT injection_points_run('TestConditionLocal2'); -- nothing
- injection_points_run 
...

diff -w -U3 C:/cirrus/src/test/modules/injection_points/expected/injection_points.out C:/cirrus/build/testrun/injection_...
--- C:/cirrus/src/test/modules/injection_points/expected/injection_points.out	2024-05-03 21:12:35.706299700 +0000
+++ C:/cirrus/build/testrun/injection_points/regress/results/injection_points.out	2024-05-03 21:20:00.418911300 +0000
@@ -169,44 +169,10 @@
 -- Wait for the previous backend process to exit, ensuring that its local
 -- injection points are cleaned up.
 SELECT wait_pid(:'oldpid');
- wait_pid 
-----------
- 
-(1 row)
-
-SELECT injection_points_run('TestConditionLocal1'); -- nothing
- injection_points_run 
-----------------------
- 
-(1 row)
-
-SELECT injection_points_run('TestConditionLocal2'); -- nothing
- injection_points_run 
...

diff -U3 /Users/admin/pgsql/src/test/modules/injection_points/expected/injection_points.out /Users/admin/pgsql/build/tes...
--- /Users/admin/pgsql/src/test/modules/injection_points/expected/injection_points.out	2024-05-03 21:12:11
+++ /Users/admin/pgsql/build/testrun/injection_points/regress/results/injection_points.out	2024-05-03 21:19:02
@@ -169,44 +169,10 @@
 -- Wait for the previous backend process to exit, ensuring that its local
 -- injection points are cleaned up.
 SELECT wait_pid(:'oldpid');
- wait_pid 
-----------
- 
-(1 row)
-
-SELECT injection_points_run('TestConditionLocal1'); -- nothing
- injection_points_run 
-----------------------
- 
-(1 row)
-
-SELECT injection_points_run('TestConditionLocal2'); -- nothing
- injection_points_run 
...

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/select_parallel.out /tmp/cirrus-ci-build/build/testrun/pg_upgrad...
--- /tmp/cirrus-ci-build/src/test/regress/expected/select_parallel.out	2024-05-03 18:09:55.108109000 +0000
+++ /tmp/cirrus-ci-build/build/testrun/pg_upgrade/002_pg_upgrade/data/results/select_parallel.out	2024-05-03 18:11:29.22...
@@ -451,26 +451,36 @@
   join tenk1 t3 on t3.stringu1 = tenk1.stringu1
   where tenk1.four = t.four
 );
-                                                                                                                       ...
------------------------------------------------------------------------------------------------------------------------...
- Seq Scan on public.tenk1 t
+                                                                                                                       ...
+-----------------------------------------------------------------------------------------------------------------------...
+ Hash Join
    Output: t.unique1, t.unique2, t.two, t.four, t.ten, t.twenty, t.hundred, t.thousand, t.twothousand, t.fivethous, t.t...
-   Filter: (SubPlan 1)
-   SubPlan 1
-     ->  Hash Join
-           Output: t.two
-           Hash Cond: (tenk1.stringu1 = t3.stringu1)
-           ->  Seq Scan on public.tenk1
...

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/select_parallel.out /tmp/cirrus-ci-build/build/testrun/recovery/...
--- /tmp/cirrus-ci-build/src/test/regress/expected/select_parallel.out	2024-05-03 18:09:55.108109000 +0000
+++ /tmp/cirrus-ci-build/build/testrun/recovery/027_stream_regress/data/results/select_parallel.out	2024-05-03 18:12:00....
@@ -451,26 +451,36 @@
   join tenk1 t3 on t3.stringu1 = tenk1.stringu1
   where tenk1.four = t.four
 );
-                                                                                                                       ...
------------------------------------------------------------------------------------------------------------------------...
- Seq Scan on public.tenk1 t
+                                                                                                                       ...
+-----------------------------------------------------------------------------------------------------------------------...
+ Hash Join
    Output: t.unique1, t.unique2, t.two, t.four, t.ten, t.twenty, t.hundred, t.thousand, t.twothousand, t.fivethous, t.t...
-   Filter: (SubPlan 1)
-   SubPlan 1
-     ->  Hash Join
-           Output: t.two
-           Hash Cond: (tenk1.stringu1 = t3.stringu1)
-           ->  Seq Scan on public.tenk1
...

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/select_parallel.out /tmp/cirrus-ci-build/build/testrun/regress/r...
--- /tmp/cirrus-ci-build/src/test/regress/expected/select_parallel.out	2024-05-03 18:09:55.108109000 +0000
+++ /tmp/cirrus-ci-build/build/testrun/regress/regress/results/select_parallel.out	2024-05-03 18:11:26.325932000 +0000
@@ -451,26 +451,36 @@
   join tenk1 t3 on t3.stringu1 = tenk1.stringu1
   where tenk1.four = t.four
 );
-                                                                                                                       ...
------------------------------------------------------------------------------------------------------------------------...
- Seq Scan on public.tenk1 t
+                                                                                                                       ...
+-----------------------------------------------------------------------------------------------------------------------...
+ Hash Join
    Output: t.unique1, t.unique2, t.two, t.four, t.ten, t.twenty, t.hundred, t.thousand, t.twothousand, t.fivethous, t.t...
-   Filter: (SubPlan 1)
-   SubPlan 1
-     ->  Hash Join
-           Output: t.two
-           Hash Cond: (tenk1.stringu1 = t3.stringu1)
-           ->  Seq Scan on public.tenk1
...

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/select_parallel.out /tmp/cirrus-ci-build/src/bin/pg_upgrade/tmp_...
--- /tmp/cirrus-ci-build/src/test/regress/expected/select_parallel.out	2024-05-03 18:09:56.037755660 +0000
+++ /tmp/cirrus-ci-build/src/bin/pg_upgrade/tmp_check/results/select_parallel.out	2024-05-03 18:13:57.013527110 +0000
@@ -451,26 +451,36 @@
   join tenk1 t3 on t3.stringu1 = tenk1.stringu1
   where tenk1.four = t.four
 );
-                                                                                                                       ...
------------------------------------------------------------------------------------------------------------------------...
- Seq Scan on public.tenk1 t
+                                                                                                                       ...
+-----------------------------------------------------------------------------------------------------------------------...
+ Hash Join
    Output: t.unique1, t.unique2, t.two, t.four, t.ten, t.twenty, t.hundred, t.thousand, t.twothousand, t.fivethous, t.t...
-   Filter: (SubPlan 1)
-   SubPlan 1
-     ->  Hash Join
-           Output: t.two
-           Hash Cond: (tenk1.stringu1 = t3.stringu1)
-           ->  Seq Scan on public.tenk1
...

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/select_parallel.out /tmp/cirrus-ci-build/src/test/regress/result...
--- /tmp/cirrus-ci-build/src/test/regress/expected/select_parallel.out	2024-05-03 18:09:56.037755660 +0000
+++ /tmp/cirrus-ci-build/src/test/regress/results/select_parallel.out	2024-05-03 18:12:43.689599419 +0000
@@ -451,26 +451,36 @@
   join tenk1 t3 on t3.stringu1 = tenk1.stringu1
   where tenk1.four = t.four
 );
-                                                                                                                       ...
------------------------------------------------------------------------------------------------------------------------...
- Seq Scan on public.tenk1 t
+                                                                                                                       ...
+-----------------------------------------------------------------------------------------------------------------------...
+ Hash Join
    Output: t.unique1, t.unique2, t.two, t.four, t.ten, t.twenty, t.hundred, t.thousand, t.twothousand, t.fivethous, t.t...
-   Filter: (SubPlan 1)
-   SubPlan 1
-     ->  Hash Join
-           Output: t.two
-           Hash Cond: (tenk1.stringu1 = t3.stringu1)
-           ->  Seq Scan on public.tenk1
...

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/select_parallel.out /tmp/cirrus-ci-build/build/testrun/pg_upgrad...
--- /tmp/cirrus-ci-build/src/test/regress/expected/select_parallel.out	2024-05-03 18:09:56.936397155 +0000
+++ /tmp/cirrus-ci-build/build/testrun/pg_upgrade/002_pg_upgrade/data/results/select_parallel.out	2024-05-03 18:12:35.98...
@@ -451,26 +451,36 @@
   join tenk1 t3 on t3.stringu1 = tenk1.stringu1
   where tenk1.four = t.four
 );
-                                                                                                                       ...
------------------------------------------------------------------------------------------------------------------------...
- Seq Scan on public.tenk1 t
+                                                                                                                       ...
+-----------------------------------------------------------------------------------------------------------------------...
+ Hash Join
    Output: t.unique1, t.unique2, t.two, t.four, t.ten, t.twenty, t.hundred, t.thousand, t.twothousand, t.fivethous, t.t...
-   Filter: (SubPlan 1)
-   SubPlan 1
-     ->  Hash Join
-           Output: t.two
-           Hash Cond: (tenk1.stringu1 = t3.stringu1)
-           ->  Seq Scan on public.tenk1
...

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/select_parallel.out /tmp/cirrus-ci-build/build/testrun/recovery/...
--- /tmp/cirrus-ci-build/src/test/regress/expected/select_parallel.out	2024-05-03 18:09:56.936397155 +0000
+++ /tmp/cirrus-ci-build/build/testrun/recovery/027_stream_regress/data/results/select_parallel.out	2024-05-03 18:13:07....
@@ -451,26 +451,36 @@
   join tenk1 t3 on t3.stringu1 = tenk1.stringu1
   where tenk1.four = t.four
 );
-                                                                                                                       ...
------------------------------------------------------------------------------------------------------------------------...
- Seq Scan on public.tenk1 t
+                                                                                                                       ...
+-----------------------------------------------------------------------------------------------------------------------...
+ Hash Join
    Output: t.unique1, t.unique2, t.two, t.four, t.ten, t.twenty, t.hundred, t.thousand, t.twothousand, t.fivethous, t.t...
-   Filter: (SubPlan 1)
-   SubPlan 1
-     ->  Hash Join
-           Output: t.two
-           Hash Cond: (tenk1.stringu1 = t3.stringu1)
-           ->  Seq Scan on public.tenk1
...

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/select_parallel.out /tmp/cirrus-ci-build/build/testrun/regress/r...
--- /tmp/cirrus-ci-build/src/test/regress/expected/select_parallel.out	2024-05-03 18:09:56.936397155 +0000
+++ /tmp/cirrus-ci-build/build/testrun/regress/regress/results/select_parallel.out	2024-05-03 18:12:31.668297811 +0000
@@ -451,26 +451,36 @@
   join tenk1 t3 on t3.stringu1 = tenk1.stringu1
   where tenk1.four = t.four
 );
-                                                                                                                       ...
------------------------------------------------------------------------------------------------------------------------...
- Seq Scan on public.tenk1 t
+                                                                                                                       ...
+-----------------------------------------------------------------------------------------------------------------------...
+ Hash Join
    Output: t.unique1, t.unique2, t.two, t.four, t.ten, t.twenty, t.hundred, t.thousand, t.twothousand, t.fivethous, t.t...
-   Filter: (SubPlan 1)
-   SubPlan 1
-     ->  Hash Join
-           Output: t.two
-           Hash Cond: (tenk1.stringu1 = t3.stringu1)
-           ->  Seq Scan on public.tenk1
...

diff -w -U3 C:/cirrus/src/test/regress/expected/select_parallel.out C:/cirrus/build/testrun/pg_upgrade/002_pg_upgrade/da...
--- C:/cirrus/src/test/regress/expected/select_parallel.out	2024-05-03 18:10:15.150223900 +0000
+++ C:/cirrus/build/testrun/pg_upgrade/002_pg_upgrade/data/results/select_parallel.out	2024-05-03 18:13:17.527031700 +00...
@@ -452,25 +452,35 @@
   where tenk1.four = t.four
 );
                                                                                                                        ...
------------------------------------------------------------------------------------------------------------------------...
- Seq Scan on public.tenk1 t
+-----------------------------------------------------------------------------------------------------------------------...
+ Hash Join
    Output: t.unique1, t.unique2, t.two, t.four, t.ten, t.twenty, t.hundred, t.thousand, t.twothousand, t.fivethous, t.t...
-   Filter: (SubPlan 1)
-   SubPlan 1
-     ->  Hash Join
-           Output: t.two
-           Hash Cond: (tenk1.stringu1 = t3.stringu1)
-           ->  Seq Scan on public.tenk1
-                 Output: tenk1.unique1, tenk1.unique2, tenk1.two, tenk1.four, tenk1.ten, tenk1.twenty, tenk1.hundred, t...
-                 Filter: (tenk1.four = t.four)
...

diff -w -U3 C:/cirrus/src/test/regress/expected/select_parallel.out C:/cirrus/build/testrun/recovery/027_stream_regress/...
--- C:/cirrus/src/test/regress/expected/select_parallel.out	2024-05-03 18:10:15.150223900 +0000
+++ C:/cirrus/build/testrun/recovery/027_stream_regress/data/results/select_parallel.out	2024-05-03 18:15:32.785798300 +...
@@ -452,25 +452,35 @@
   where tenk1.four = t.four
 );
                                                                                                                        ...
------------------------------------------------------------------------------------------------------------------------...
- Seq Scan on public.tenk1 t
+-----------------------------------------------------------------------------------------------------------------------...
+ Hash Join
    Output: t.unique1, t.unique2, t.two, t.four, t.ten, t.twenty, t.hundred, t.thousand, t.twothousand, t.fivethous, t.t...
-   Filter: (SubPlan 1)
-   SubPlan 1
-     ->  Hash Join
-           Output: t.two
-           Hash Cond: (tenk1.stringu1 = t3.stringu1)
-           ->  Seq Scan on public.tenk1
-                 Output: tenk1.unique1, tenk1.unique2, tenk1.two, tenk1.four, tenk1.ten, tenk1.twenty, tenk1.hundred, t...
-                 Filter: (tenk1.four = t.four)
...

diff -w -U3 C:/cirrus/src/test/regress/expected/select_parallel.out C:/cirrus/build/testrun/regress/regress/results/sele...
--- C:/cirrus/src/test/regress/expected/select_parallel.out	2024-05-03 18:10:15.150223900 +0000
+++ C:/cirrus/build/testrun/regress/regress/results/select_parallel.out	2024-05-03 18:13:14.804865900 +0000
@@ -452,25 +452,35 @@
   where tenk1.four = t.four
 );
                                                                                                                        ...
------------------------------------------------------------------------------------------------------------------------...
- Seq Scan on public.tenk1 t
+-----------------------------------------------------------------------------------------------------------------------...
+ Hash Join
    Output: t.unique1, t.unique2, t.two, t.four, t.ten, t.twenty, t.hundred, t.thousand, t.twothousand, t.fivethous, t.t...
-   Filter: (SubPlan 1)
-   SubPlan 1
-     ->  Hash Join
-           Output: t.two
-           Hash Cond: (tenk1.stringu1 = t3.stringu1)
-           ->  Seq Scan on public.tenk1
-                 Output: tenk1.unique1, tenk1.unique2, tenk1.two, tenk1.four, tenk1.ten, tenk1.twenty, tenk1.hundred, t...
-                 Filter: (tenk1.four = t.four)
...

diff -U3 /Users/admin/pgsql/src/test/regress/expected/select_parallel.out /Users/admin/pgsql/build/testrun/pg_upgrade/00...
--- /Users/admin/pgsql/src/test/regress/expected/select_parallel.out	2024-05-03 18:09:57
+++ /Users/admin/pgsql/build/testrun/pg_upgrade/002_pg_upgrade/data/results/select_parallel.out	2024-05-03 18:12:05
@@ -451,26 +451,36 @@
   join tenk1 t3 on t3.stringu1 = tenk1.stringu1
   where tenk1.four = t.four
 );
-                                                                                                                       ...
------------------------------------------------------------------------------------------------------------------------...
- Seq Scan on public.tenk1 t
+                                                                                                                       ...
+-----------------------------------------------------------------------------------------------------------------------...
+ Hash Join
    Output: t.unique1, t.unique2, t.two, t.four, t.ten, t.twenty, t.hundred, t.thousand, t.twothousand, t.fivethous, t.t...
-   Filter: (SubPlan 1)
-   SubPlan 1
-     ->  Hash Join
-           Output: t.two
-           Hash Cond: (tenk1.stringu1 = t3.stringu1)
-           ->  Seq Scan on public.tenk1
...

diff -U3 /Users/admin/pgsql/src/test/regress/expected/select_parallel.out /Users/admin/pgsql/build/testrun/recovery/027_...
--- /Users/admin/pgsql/src/test/regress/expected/select_parallel.out	2024-05-03 18:09:57
+++ /Users/admin/pgsql/build/testrun/recovery/027_stream_regress/data/results/select_parallel.out	2024-05-03 18:13:13
@@ -451,26 +451,36 @@
   join tenk1 t3 on t3.stringu1 = tenk1.stringu1
   where tenk1.four = t.four
 );
-                                                                                                                       ...
------------------------------------------------------------------------------------------------------------------------...
- Seq Scan on public.tenk1 t
+                                                                                                                       ...
+-----------------------------------------------------------------------------------------------------------------------...
+ Hash Join
    Output: t.unique1, t.unique2, t.two, t.four, t.ten, t.twenty, t.hundred, t.thousand, t.twothousand, t.fivethous, t.t...
-   Filter: (SubPlan 1)
-   SubPlan 1
-     ->  Hash Join
-           Output: t.two
-           Hash Cond: (tenk1.stringu1 = t3.stringu1)
-           ->  Seq Scan on public.tenk1
...

diff -U3 /Users/admin/pgsql/src/test/regress/expected/select_parallel.out /Users/admin/pgsql/build/testrun/regress/regre...
--- /Users/admin/pgsql/src/test/regress/expected/select_parallel.out	2024-05-03 18:09:57
+++ /Users/admin/pgsql/build/testrun/regress/regress/results/select_parallel.out	2024-05-03 18:12:06
@@ -451,26 +451,36 @@
   join tenk1 t3 on t3.stringu1 = tenk1.stringu1
   where tenk1.four = t.four
 );
-                                                                                                                       ...
------------------------------------------------------------------------------------------------------------------------...
- Seq Scan on public.tenk1 t
+                                                                                                                       ...
+-----------------------------------------------------------------------------------------------------------------------...
+ Hash Join
    Output: t.unique1, t.unique2, t.two, t.four, t.ten, t.twenty, t.hundred, t.thousand, t.twothousand, t.fivethous, t.t...
-   Filter: (SubPlan 1)
-   SubPlan 1
-     ->  Hash Join
-           Output: t.two
-           Hash Cond: (tenk1.stringu1 = t3.stringu1)
-           ->  Seq Scan on public.tenk1
...

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/partition_join.out /tmp/cirrus-ci-build/build/testrun/pg_upgrade...
--- /tmp/cirrus-ci-build/src/test/regress/expected/partition_join.out	2024-05-03 14:02:23.317372000 +0000
+++ /tmp/cirrus-ci-build/build/testrun/pg_upgrade/002_pg_upgrade/data/results/partition_join.out	2024-05-03 14:03:58.617...
@@ -5133,17 +5133,15 @@
                               QUERY PLAN                               
 -----------------------------------------------------------------------
  Limit
-   ->  Merge Append
-         Sort Key: x.id
-         ->  Merge Left Join
-               Merge Cond: (x_1.id = y_1.id)
+   ->  Merge Left Join
+         Merge Cond: (x.id = y.id)
+         ->  Append
                ->  Index Only Scan using fract_t0_pkey on fract_t0 x_1
-               ->  Index Only Scan using fract_t0_pkey on fract_t0 y_1
-         ->  Merge Left Join
-               Merge Cond: (x_2.id = y_2.id)
                ->  Index Only Scan using fract_t1_pkey on fract_t1 x_2
+         ->  Append
...

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/partition_join.out /tmp/cirrus-ci-build/build/testrun/recovery/0...
--- /tmp/cirrus-ci-build/src/test/regress/expected/partition_join.out	2024-05-03 14:02:23.317372000 +0000
+++ /tmp/cirrus-ci-build/build/testrun/recovery/027_stream_regress/data/results/partition_join.out	2024-05-03 14:04:27.7...
@@ -5133,17 +5133,15 @@
                               QUERY PLAN                               
 -----------------------------------------------------------------------
  Limit
-   ->  Merge Append
-         Sort Key: x.id
-         ->  Merge Left Join
-               Merge Cond: (x_1.id = y_1.id)
+   ->  Merge Left Join
+         Merge Cond: (x.id = y.id)
+         ->  Append
                ->  Index Only Scan using fract_t0_pkey on fract_t0 x_1
-               ->  Index Only Scan using fract_t0_pkey on fract_t0 y_1
-         ->  Merge Left Join
-               Merge Cond: (x_2.id = y_2.id)
                ->  Index Only Scan using fract_t1_pkey on fract_t1 x_2
+         ->  Append
...

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/partition_join.out /tmp/cirrus-ci-build/build/testrun/regress/re...
--- /tmp/cirrus-ci-build/src/test/regress/expected/partition_join.out	2024-05-03 14:02:23.317372000 +0000
+++ /tmp/cirrus-ci-build/build/testrun/regress/regress/results/partition_join.out	2024-05-03 14:03:52.680121000 +0000
@@ -5133,17 +5133,15 @@
                               QUERY PLAN                               
 -----------------------------------------------------------------------
  Limit
-   ->  Merge Append
-         Sort Key: x.id
-         ->  Merge Left Join
-               Merge Cond: (x_1.id = y_1.id)
+   ->  Merge Left Join
+         Merge Cond: (x.id = y.id)
+         ->  Append
                ->  Index Only Scan using fract_t0_pkey on fract_t0 x_1
-               ->  Index Only Scan using fract_t0_pkey on fract_t0 y_1
-         ->  Merge Left Join
-               Merge Cond: (x_2.id = y_2.id)
                ->  Index Only Scan using fract_t1_pkey on fract_t1 x_2
+         ->  Append
...

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/partition_join.out /tmp/cirrus-ci-build/src/bin/pg_upgrade/tmp_c...
--- /tmp/cirrus-ci-build/src/test/regress/expected/partition_join.out	2024-05-03 14:02:15.941312174 +0000
+++ /tmp/cirrus-ci-build/src/bin/pg_upgrade/tmp_check/results/partition_join.out	2024-05-03 14:06:05.425316625 +0000
@@ -5133,17 +5133,15 @@
                               QUERY PLAN                               
 -----------------------------------------------------------------------
  Limit
-   ->  Merge Append
-         Sort Key: x.id
-         ->  Merge Left Join
-               Merge Cond: (x_1.id = y_1.id)
+   ->  Merge Left Join
+         Merge Cond: (x.id = y.id)
+         ->  Append
                ->  Index Only Scan using fract_t0_pkey on fract_t0 x_1
-               ->  Index Only Scan using fract_t0_pkey on fract_t0 y_1
-         ->  Merge Left Join
-               Merge Cond: (x_2.id = y_2.id)
                ->  Index Only Scan using fract_t1_pkey on fract_t1 x_2
+         ->  Append
...

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/partition_join.out /tmp/cirrus-ci-build/src/test/recovery/tmp_ch...
--- /tmp/cirrus-ci-build/src/test/regress/expected/partition_join.out	2024-05-03 14:02:15.941312174 +0000
+++ /tmp/cirrus-ci-build/src/test/recovery/tmp_check/results/partition_join.out	2024-05-03 14:07:12.041314115 +0000
@@ -5133,17 +5133,15 @@
                               QUERY PLAN                               
 -----------------------------------------------------------------------
  Limit
-   ->  Merge Append
-         Sort Key: x.id
-         ->  Merge Left Join
-               Merge Cond: (x_1.id = y_1.id)
+   ->  Merge Left Join
+         Merge Cond: (x.id = y.id)
+         ->  Append
                ->  Index Only Scan using fract_t0_pkey on fract_t0 x_1
-               ->  Index Only Scan using fract_t0_pkey on fract_t0 y_1
-         ->  Merge Left Join
-               Merge Cond: (x_2.id = y_2.id)
                ->  Index Only Scan using fract_t1_pkey on fract_t1 x_2
+         ->  Append
...

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/partition_join.out /tmp/cirrus-ci-build/src/test/regress/results...
--- /tmp/cirrus-ci-build/src/test/regress/expected/partition_join.out	2024-05-03 14:02:15.941312174 +0000
+++ /tmp/cirrus-ci-build/src/test/regress/results/partition_join.out	2024-05-03 14:04:35.873340446 +0000
@@ -5133,17 +5133,15 @@
                               QUERY PLAN                               
 -----------------------------------------------------------------------
  Limit
-   ->  Merge Append
-         Sort Key: x.id
-         ->  Merge Left Join
-               Merge Cond: (x_1.id = y_1.id)
+   ->  Merge Left Join
+         Merge Cond: (x.id = y.id)
+         ->  Append
                ->  Index Only Scan using fract_t0_pkey on fract_t0 x_1
-               ->  Index Only Scan using fract_t0_pkey on fract_t0 y_1
-         ->  Merge Left Join
-               Merge Cond: (x_2.id = y_2.id)
                ->  Index Only Scan using fract_t1_pkey on fract_t1 x_2
+         ->  Append
...

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/partition_join.out /tmp/cirrus-ci-build/build/testrun/pg_upgrade...
--- /tmp/cirrus-ci-build/src/test/regress/expected/partition_join.out	2024-05-03 14:02:16.062009864 +0000
+++ /tmp/cirrus-ci-build/build/testrun/pg_upgrade/002_pg_upgrade/data/results/partition_join.out	2024-05-03 14:04:23.421...
@@ -5133,17 +5133,15 @@
                               QUERY PLAN                               
 -----------------------------------------------------------------------
  Limit
-   ->  Merge Append
-         Sort Key: x.id
-         ->  Merge Left Join
-               Merge Cond: (x_1.id = y_1.id)
+   ->  Merge Left Join
+         Merge Cond: (x.id = y.id)
+         ->  Append
                ->  Index Only Scan using fract_t0_pkey on fract_t0 x_1
-               ->  Index Only Scan using fract_t0_pkey on fract_t0 y_1
-         ->  Merge Left Join
-               Merge Cond: (x_2.id = y_2.id)
                ->  Index Only Scan using fract_t1_pkey on fract_t1 x_2
+         ->  Append
...

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/partition_join.out /tmp/cirrus-ci-build/build/testrun/recovery/0...
--- /tmp/cirrus-ci-build/src/test/regress/expected/partition_join.out	2024-05-03 14:02:16.062009864 +0000
+++ /tmp/cirrus-ci-build/build/testrun/recovery/027_stream_regress/data/results/partition_join.out	2024-05-03 14:04:49.9...
@@ -5133,17 +5133,15 @@
                               QUERY PLAN                               
 -----------------------------------------------------------------------
  Limit
-   ->  Merge Append
-         Sort Key: x.id
-         ->  Merge Left Join
-               Merge Cond: (x_1.id = y_1.id)
+   ->  Merge Left Join
+         Merge Cond: (x.id = y.id)
+         ->  Append
                ->  Index Only Scan using fract_t0_pkey on fract_t0 x_1
-               ->  Index Only Scan using fract_t0_pkey on fract_t0 y_1
-         ->  Merge Left Join
-               Merge Cond: (x_2.id = y_2.id)
                ->  Index Only Scan using fract_t1_pkey on fract_t1 x_2
+         ->  Append
...

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/partition_join.out /tmp/cirrus-ci-build/build/testrun/regress/re...
--- /tmp/cirrus-ci-build/src/test/regress/expected/partition_join.out	2024-05-03 14:02:16.062009864 +0000
+++ /tmp/cirrus-ci-build/build/testrun/regress/regress/results/partition_join.out	2024-05-03 14:04:18.721996980 +0000
@@ -5133,17 +5133,15 @@
                               QUERY PLAN                               
 -----------------------------------------------------------------------
  Limit
-   ->  Merge Append
-         Sort Key: x.id
-         ->  Merge Left Join
-               Merge Cond: (x_1.id = y_1.id)
+   ->  Merge Left Join
+         Merge Cond: (x.id = y.id)
+         ->  Append
                ->  Index Only Scan using fract_t0_pkey on fract_t0 x_1
-               ->  Index Only Scan using fract_t0_pkey on fract_t0 y_1
-         ->  Merge Left Join
-               Merge Cond: (x_2.id = y_2.id)
                ->  Index Only Scan using fract_t1_pkey on fract_t1 x_2
+         ->  Append
...

diff -w -U3 C:/cirrus/src/test/regress/expected/partition_join.out C:/cirrus/build/testrun/pg_upgrade/002_pg_upgrade/dat...
--- C:/cirrus/src/test/regress/expected/partition_join.out	2024-05-03 14:02:34.464214900 +0000
+++ C:/cirrus/build/testrun/pg_upgrade/002_pg_upgrade/data/results/partition_join.out	2024-05-03 14:06:23.917031900 +000...
@@ -5133,17 +5133,15 @@
                               QUERY PLAN                               
 -----------------------------------------------------------------------
  Limit
-   ->  Merge Append
-         Sort Key: x.id
          ->  Merge Left Join
-               Merge Cond: (x_1.id = y_1.id)
+         Merge Cond: (x.id = y.id)
+         ->  Append
                ->  Index Only Scan using fract_t0_pkey on fract_t0 x_1
-               ->  Index Only Scan using fract_t0_pkey on fract_t0 y_1
-         ->  Merge Left Join
-               Merge Cond: (x_2.id = y_2.id)
                ->  Index Only Scan using fract_t1_pkey on fract_t1 x_2
+         ->  Append
+               ->  Index Only Scan using fract_t0_pkey on fract_t0 y_1
...

diff -w -U3 C:/cirrus/src/test/regress/expected/partition_join.out C:/cirrus/build/testrun/recovery/027_stream_regress/d...
--- C:/cirrus/src/test/regress/expected/partition_join.out	2024-05-03 14:02:34.464214900 +0000
+++ C:/cirrus/build/testrun/recovery/027_stream_regress/data/results/partition_join.out	2024-05-03 14:08:57.381871000 +0...
@@ -5133,17 +5133,15 @@
                               QUERY PLAN                               
 -----------------------------------------------------------------------
  Limit
-   ->  Merge Append
-         Sort Key: x.id
          ->  Merge Left Join
-               Merge Cond: (x_1.id = y_1.id)
+         Merge Cond: (x.id = y.id)
+         ->  Append
                ->  Index Only Scan using fract_t0_pkey on fract_t0 x_1
-               ->  Index Only Scan using fract_t0_pkey on fract_t0 y_1
-         ->  Merge Left Join
-               Merge Cond: (x_2.id = y_2.id)
                ->  Index Only Scan using fract_t1_pkey on fract_t1 x_2
+         ->  Append
+               ->  Index Only Scan using fract_t0_pkey on fract_t0 y_1
...

diff -w -U3 C:/cirrus/src/test/regress/expected/partition_join.out C:/cirrus/build/testrun/regress/regress/results/parti...
--- C:/cirrus/src/test/regress/expected/partition_join.out	2024-05-03 14:02:34.464214900 +0000
+++ C:/cirrus/build/testrun/regress/regress/results/partition_join.out	2024-05-03 14:06:15.918991400 +0000
@@ -5133,17 +5133,15 @@
                               QUERY PLAN                               
 -----------------------------------------------------------------------
  Limit
-   ->  Merge Append
-         Sort Key: x.id
          ->  Merge Left Join
-               Merge Cond: (x_1.id = y_1.id)
+         Merge Cond: (x.id = y.id)
+         ->  Append
                ->  Index Only Scan using fract_t0_pkey on fract_t0 x_1
-               ->  Index Only Scan using fract_t0_pkey on fract_t0 y_1
-         ->  Merge Left Join
-               Merge Cond: (x_2.id = y_2.id)
                ->  Index Only Scan using fract_t1_pkey on fract_t1 x_2
+         ->  Append
+               ->  Index Only Scan using fract_t0_pkey on fract_t0 y_1
...

diff -U3 /Users/admin/pgsql/src/test/regress/expected/partition_join.out /Users/admin/pgsql/build/testrun/pg_upgrade/002...
--- /Users/admin/pgsql/src/test/regress/expected/partition_join.out	2024-05-03 14:02:18
+++ /Users/admin/pgsql/build/testrun/pg_upgrade/002_pg_upgrade/data/results/partition_join.out	2024-05-03 14:04:54
@@ -5133,17 +5133,15 @@
                               QUERY PLAN                               
 -----------------------------------------------------------------------
  Limit
-   ->  Merge Append
-         Sort Key: x.id
-         ->  Merge Left Join
-               Merge Cond: (x_1.id = y_1.id)
+   ->  Merge Left Join
+         Merge Cond: (x.id = y.id)
+         ->  Append
                ->  Index Only Scan using fract_t0_pkey on fract_t0 x_1
-               ->  Index Only Scan using fract_t0_pkey on fract_t0 y_1
-         ->  Merge Left Join
-               Merge Cond: (x_2.id = y_2.id)
                ->  Index Only Scan using fract_t1_pkey on fract_t1 x_2
+         ->  Append
...

diff -U3 /Users/admin/pgsql/src/test/regress/expected/partition_join.out /Users/admin/pgsql/build/testrun/recovery/027_s...
--- /Users/admin/pgsql/src/test/regress/expected/partition_join.out	2024-05-03 14:02:18
+++ /Users/admin/pgsql/build/testrun/recovery/027_stream_regress/data/results/partition_join.out	2024-05-03 14:05:58
@@ -5133,17 +5133,15 @@
                               QUERY PLAN                               
 -----------------------------------------------------------------------
  Limit
-   ->  Merge Append
-         Sort Key: x.id
-         ->  Merge Left Join
-               Merge Cond: (x_1.id = y_1.id)
+   ->  Merge Left Join
+         Merge Cond: (x.id = y.id)
+         ->  Append
                ->  Index Only Scan using fract_t0_pkey on fract_t0 x_1
-               ->  Index Only Scan using fract_t0_pkey on fract_t0 y_1
-         ->  Merge Left Join
-               Merge Cond: (x_2.id = y_2.id)
                ->  Index Only Scan using fract_t1_pkey on fract_t1 x_2
+         ->  Append
...

diff -U3 /Users/admin/pgsql/src/test/regress/expected/partition_join.out /Users/admin/pgsql/build/testrun/regress/regres...
--- /Users/admin/pgsql/src/test/regress/expected/partition_join.out	2024-05-03 14:02:18
+++ /Users/admin/pgsql/build/testrun/regress/regress/results/partition_join.out	2024-05-03 14:04:54
@@ -5133,17 +5133,15 @@
                               QUERY PLAN                               
 -----------------------------------------------------------------------
  Limit
-   ->  Merge Append
-         Sort Key: x.id
-         ->  Merge Left Join
-               Merge Cond: (x_1.id = y_1.id)
+   ->  Merge Left Join
+         Merge Cond: (x.id = y.id)
+         ->  Append
                ->  Index Only Scan using fract_t0_pkey on fract_t0 x_1
-               ->  Index Only Scan using fract_t0_pkey on fract_t0 y_1
-         ->  Merge Left Join
-               Merge Cond: (x_2.id = y_2.id)
                ->  Index Only Scan using fract_t1_pkey on fract_t1 x_2
+         ->  Append
...

diff -w -U3 C:/cirrus/src/test/regress/expected/compression_1.out C:/cirrus/build/testrun/pg_upgrade/002_pg_upgrade/data...
--- C:/cirrus/src/test/regress/expected/compression_1.out	2024-05-03 13:07:06.257962600 +0000
+++ C:/cirrus/build/testrun/pg_upgrade/002_pg_upgrade/data/results/compression.out	2024-05-03 13:10:50.205338300 +0000
@@ -216,13 +216,16 @@
 -----------------------
 (0 rows)
 
--- test compression with inheritance, error
-CREATE TABLE cminh() INHERITS(cmdata, cmdata1);
+-- test compression with inheritance
+CREATE TABLE cminh() INHERITS(cmdata, cmdata1); -- error
 ERROR:  relation "cmdata1" does not exist
-CREATE TABLE cminh(f1 TEXT COMPRESSION lz4) INHERITS(cmdata);
+CREATE TABLE cminh(f1 TEXT COMPRESSION lz4) INHERITS(cmdata); -- error
 NOTICE:  merging column "f1" with inherited definition
 ERROR:  column "f1" has a compression method conflict
 DETAIL:  pglz versus lz4
+CREATE TABLE cmdata3(f1 text);
+CREATE TABLE cminh() INHERITS (cmdata, cmdata3);
+NOTICE:  merging multiple inherited definitions of column "f1"
...

diff -w -U3 C:/cirrus/src/test/regress/expected/compression_1.out C:/cirrus/build/testrun/recovery/027_stream_regress/da...
--- C:/cirrus/src/test/regress/expected/compression_1.out	2024-05-03 13:07:06.257962600 +0000
+++ C:/cirrus/build/testrun/recovery/027_stream_regress/data/results/compression.out	2024-05-03 13:13:00.351329700 +0000
@@ -216,13 +216,16 @@
 -----------------------
 (0 rows)
 
--- test compression with inheritance, error
-CREATE TABLE cminh() INHERITS(cmdata, cmdata1);
+-- test compression with inheritance
+CREATE TABLE cminh() INHERITS(cmdata, cmdata1); -- error
 ERROR:  relation "cmdata1" does not exist
-CREATE TABLE cminh(f1 TEXT COMPRESSION lz4) INHERITS(cmdata);
+CREATE TABLE cminh(f1 TEXT COMPRESSION lz4) INHERITS(cmdata); -- error
 NOTICE:  merging column "f1" with inherited definition
 ERROR:  column "f1" has a compression method conflict
 DETAIL:  pglz versus lz4
+CREATE TABLE cmdata3(f1 text);
+CREATE TABLE cminh() INHERITS (cmdata, cmdata3);
+NOTICE:  merging multiple inherited definitions of column "f1"
...

diff -w -U3 C:/cirrus/src/test/regress/expected/compression_1.out C:/cirrus/build/testrun/regress/regress/results/compre...
--- C:/cirrus/src/test/regress/expected/compression_1.out	2024-05-03 13:07:06.257962600 +0000
+++ C:/cirrus/build/testrun/regress/regress/results/compression.out	2024-05-03 13:10:43.366943400 +0000
@@ -216,13 +216,16 @@
 -----------------------
 (0 rows)
 
--- test compression with inheritance, error
-CREATE TABLE cminh() INHERITS(cmdata, cmdata1);
+-- test compression with inheritance
+CREATE TABLE cminh() INHERITS(cmdata, cmdata1); -- error
 ERROR:  relation "cmdata1" does not exist
-CREATE TABLE cminh(f1 TEXT COMPRESSION lz4) INHERITS(cmdata);
+CREATE TABLE cminh(f1 TEXT COMPRESSION lz4) INHERITS(cmdata); -- error
 NOTICE:  merging column "f1" with inherited definition
 ERROR:  column "f1" has a compression method conflict
 DETAIL:  pglz versus lz4
+CREATE TABLE cmdata3(f1 text);
+CREATE TABLE cminh() INHERITS (cmdata, cmdata3);
+NOTICE:  merging multiple inherited definitions of column "f1"
...

diff -w -U3 C:/cirrus/src/test/regress/expected/compression_1.out C:/cirrus/build/testrun/pg_upgrade/002_pg_upgrade/data...
--- C:/cirrus/src/test/regress/expected/compression_1.out	2024-05-03 13:04:24.930899300 +0000
+++ C:/cirrus/build/testrun/pg_upgrade/002_pg_upgrade/data/results/compression.out	2024-05-03 13:08:24.826397700 +0000
@@ -216,13 +216,16 @@
 -----------------------
 (0 rows)
 
--- test compression with inheritance, error
-CREATE TABLE cminh() INHERITS(cmdata, cmdata1);
+-- test compression with inheritance
+CREATE TABLE cminh() INHERITS(cmdata, cmdata1); -- error
 ERROR:  relation "cmdata1" does not exist
-CREATE TABLE cminh(f1 TEXT COMPRESSION lz4) INHERITS(cmdata);
+CREATE TABLE cminh(f1 TEXT COMPRESSION lz4) INHERITS(cmdata); -- error
 NOTICE:  merging column "f1" with inherited definition
 ERROR:  column "f1" has a compression method conflict
 DETAIL:  pglz versus lz4
+CREATE TABLE cmdata3(f1 text);
+CREATE TABLE cminh() INHERITS (cmdata, cmdata3);
+NOTICE:  merging multiple inherited definitions of column "f1"
...

diff -w -U3 C:/cirrus/src/test/regress/expected/compression_1.out C:/cirrus/build/testrun/recovery/027_stream_regress/da...
--- C:/cirrus/src/test/regress/expected/compression_1.out	2024-05-03 13:04:24.930899300 +0000
+++ C:/cirrus/build/testrun/recovery/027_stream_regress/data/results/compression.out	2024-05-03 13:10:44.254125600 +0000
@@ -216,13 +216,16 @@
 -----------------------
 (0 rows)
 
--- test compression with inheritance, error
-CREATE TABLE cminh() INHERITS(cmdata, cmdata1);
+-- test compression with inheritance
+CREATE TABLE cminh() INHERITS(cmdata, cmdata1); -- error
 ERROR:  relation "cmdata1" does not exist
-CREATE TABLE cminh(f1 TEXT COMPRESSION lz4) INHERITS(cmdata);
+CREATE TABLE cminh(f1 TEXT COMPRESSION lz4) INHERITS(cmdata); -- error
 NOTICE:  merging column "f1" with inherited definition
 ERROR:  column "f1" has a compression method conflict
 DETAIL:  pglz versus lz4
+CREATE TABLE cmdata3(f1 text);
+CREATE TABLE cminh() INHERITS (cmdata, cmdata3);
+NOTICE:  merging multiple inherited definitions of column "f1"
...

diff -w -U3 C:/cirrus/src/test/regress/expected/compression_1.out C:/cirrus/build/testrun/regress/regress/results/compre...
--- C:/cirrus/src/test/regress/expected/compression_1.out	2024-05-03 13:04:24.930899300 +0000
+++ C:/cirrus/build/testrun/regress/regress/results/compression.out	2024-05-03 13:08:20.318587400 +0000
@@ -216,13 +216,16 @@
 -----------------------
 (0 rows)
 
--- test compression with inheritance, error
-CREATE TABLE cminh() INHERITS(cmdata, cmdata1);
+-- test compression with inheritance
+CREATE TABLE cminh() INHERITS(cmdata, cmdata1); -- error
 ERROR:  relation "cmdata1" does not exist
-CREATE TABLE cminh(f1 TEXT COMPRESSION lz4) INHERITS(cmdata);
+CREATE TABLE cminh(f1 TEXT COMPRESSION lz4) INHERITS(cmdata); -- error
 NOTICE:  merging column "f1" with inherited definition
 ERROR:  column "f1" has a compression method conflict
 DETAIL:  pglz versus lz4
+CREATE TABLE cmdata3(f1 text);
+CREATE TABLE cminh() INHERITS (cmdata, cmdata3);
+NOTICE:  merging multiple inherited definitions of column "f1"
...

diff -w -U3 C:/cirrus/src/test/regress/expected/compression_1.out C:/cirrus/build/testrun/pg_upgrade/002_pg_upgrade/data...
--- C:/cirrus/src/test/regress/expected/compression_1.out	2024-05-03 13:00:56.797252400 +0000
+++ C:/cirrus/build/testrun/pg_upgrade/002_pg_upgrade/data/results/compression.out	2024-05-03 13:04:44.523974600 +0000
@@ -216,13 +216,16 @@
 -----------------------
 (0 rows)
 
--- test compression with inheritance, error
-CREATE TABLE cminh() INHERITS(cmdata, cmdata1);
+-- test compression with inheritance
+CREATE TABLE cminh() INHERITS(cmdata, cmdata1); -- error
 ERROR:  relation "cmdata1" does not exist
-CREATE TABLE cminh(f1 TEXT COMPRESSION lz4) INHERITS(cmdata);
+CREATE TABLE cminh(f1 TEXT COMPRESSION lz4) INHERITS(cmdata); -- error
 NOTICE:  merging column "f1" with inherited definition
 ERROR:  column "f1" has a compression method conflict
 DETAIL:  pglz versus lz4
+CREATE TABLE cmdata3(f1 text);
+CREATE TABLE cminh() INHERITS (cmdata, cmdata3);
+NOTICE:  merging multiple inherited definitions of column "f1"
...

diff -w -U3 C:/cirrus/src/test/regress/expected/compression_1.out C:/cirrus/build/testrun/recovery/027_stream_regress/da...
--- C:/cirrus/src/test/regress/expected/compression_1.out	2024-05-03 13:00:56.797252400 +0000
+++ C:/cirrus/build/testrun/recovery/027_stream_regress/data/results/compression.out	2024-05-03 13:06:44.458057100 +0000
@@ -216,13 +216,16 @@
 -----------------------
 (0 rows)
 
--- test compression with inheritance, error
-CREATE TABLE cminh() INHERITS(cmdata, cmdata1);
+-- test compression with inheritance
+CREATE TABLE cminh() INHERITS(cmdata, cmdata1); -- error
 ERROR:  relation "cmdata1" does not exist
-CREATE TABLE cminh(f1 TEXT COMPRESSION lz4) INHERITS(cmdata);
+CREATE TABLE cminh(f1 TEXT COMPRESSION lz4) INHERITS(cmdata); -- error
 NOTICE:  merging column "f1" with inherited definition
 ERROR:  column "f1" has a compression method conflict
 DETAIL:  pglz versus lz4
+CREATE TABLE cmdata3(f1 text);
+CREATE TABLE cminh() INHERITS (cmdata, cmdata3);
+NOTICE:  merging multiple inherited definitions of column "f1"
...

diff -w -U3 C:/cirrus/src/test/regress/expected/compression_1.out C:/cirrus/build/testrun/regress/regress/results/compre...
--- C:/cirrus/src/test/regress/expected/compression_1.out	2024-05-03 13:00:56.797252400 +0000
+++ C:/cirrus/build/testrun/regress/regress/results/compression.out	2024-05-03 13:04:29.816458900 +0000
@@ -216,13 +216,16 @@
 -----------------------
 (0 rows)
 
--- test compression with inheritance, error
-CREATE TABLE cminh() INHERITS(cmdata, cmdata1);
+-- test compression with inheritance
+CREATE TABLE cminh() INHERITS(cmdata, cmdata1); -- error
 ERROR:  relation "cmdata1" does not exist
-CREATE TABLE cminh(f1 TEXT COMPRESSION lz4) INHERITS(cmdata);
+CREATE TABLE cminh(f1 TEXT COMPRESSION lz4) INHERITS(cmdata); -- error
 NOTICE:  merging column "f1" with inherited definition
 ERROR:  column "f1" has a compression method conflict
 DETAIL:  pglz versus lz4
+CREATE TABLE cmdata3(f1 text);
+CREATE TABLE cminh() INHERITS (cmdata, cmdata3);
+NOTICE:  merging multiple inherited definitions of column "f1"
...

diff -w -U3 C:/cirrus/src/test/regress/expected/compression_1.out C:/cirrus/build/testrun/pg_upgrade/002_pg_upgrade/data...
--- C:/cirrus/src/test/regress/expected/compression_1.out	2024-05-03 12:50:57.421326300 +0000
+++ C:/cirrus/build/testrun/pg_upgrade/002_pg_upgrade/data/results/compression.out	2024-05-03 12:54:51.092563800 +0000
@@ -216,13 +216,16 @@
 -----------------------
 (0 rows)
 
--- test compression with inheritance, error
-CREATE TABLE cminh() INHERITS(cmdata, cmdata1);
+-- test compression with inheritance
+CREATE TABLE cminh() INHERITS(cmdata, cmdata1); -- error
 ERROR:  relation "cmdata1" does not exist
-CREATE TABLE cminh(f1 TEXT COMPRESSION lz4) INHERITS(cmdata);
+CREATE TABLE cminh(f1 TEXT COMPRESSION lz4) INHERITS(cmdata); -- error
 NOTICE:  merging column "f1" with inherited definition
 ERROR:  column "f1" has a compression method conflict
 DETAIL:  pglz versus lz4
+CREATE TABLE cmdata3(f1 text);
+CREATE TABLE cminh() INHERITS (cmdata, cmdata3);
+NOTICE:  merging multiple inherited definitions of column "f1"
...

diff -w -U3 C:/cirrus/src/test/regress/expected/compression_1.out C:/cirrus/build/testrun/recovery/027_stream_regress/da...
--- C:/cirrus/src/test/regress/expected/compression_1.out	2024-05-03 12:50:57.421326300 +0000
+++ C:/cirrus/build/testrun/recovery/027_stream_regress/data/results/compression.out	2024-05-03 12:57:24.386450700 +0000
@@ -216,13 +216,16 @@
 -----------------------
 (0 rows)
 
--- test compression with inheritance, error
-CREATE TABLE cminh() INHERITS(cmdata, cmdata1);
+-- test compression with inheritance
+CREATE TABLE cminh() INHERITS(cmdata, cmdata1); -- error
 ERROR:  relation "cmdata1" does not exist
-CREATE TABLE cminh(f1 TEXT COMPRESSION lz4) INHERITS(cmdata);
+CREATE TABLE cminh(f1 TEXT COMPRESSION lz4) INHERITS(cmdata); -- error
 NOTICE:  merging column "f1" with inherited definition
 ERROR:  column "f1" has a compression method conflict
 DETAIL:  pglz versus lz4
+CREATE TABLE cmdata3(f1 text);
+CREATE TABLE cminh() INHERITS (cmdata, cmdata3);
+NOTICE:  merging multiple inherited definitions of column "f1"
...

diff -w -U3 C:/cirrus/src/test/regress/expected/compression_1.out C:/cirrus/build/testrun/regress/regress/results/compre...
--- C:/cirrus/src/test/regress/expected/compression_1.out	2024-05-03 12:50:57.421326300 +0000
+++ C:/cirrus/build/testrun/regress/regress/results/compression.out	2024-05-03 12:54:43.154097300 +0000
@@ -216,13 +216,16 @@
 -----------------------
 (0 rows)
 
--- test compression with inheritance, error
-CREATE TABLE cminh() INHERITS(cmdata, cmdata1);
+-- test compression with inheritance
+CREATE TABLE cminh() INHERITS(cmdata, cmdata1); -- error
 ERROR:  relation "cmdata1" does not exist
-CREATE TABLE cminh(f1 TEXT COMPRESSION lz4) INHERITS(cmdata);
+CREATE TABLE cminh(f1 TEXT COMPRESSION lz4) INHERITS(cmdata); -- error
 NOTICE:  merging column "f1" with inherited definition
 ERROR:  column "f1" has a compression method conflict
 DETAIL:  pglz versus lz4
+CREATE TABLE cmdata3(f1 text);
+CREATE TABLE cminh() INHERITS (cmdata, cmdata3);
+NOTICE:  merging multiple inherited definitions of column "f1"
...

diff -w -U3 C:/cirrus/src/test/regress/expected/compression_1.out C:/cirrus/build/testrun/pg_upgrade/002_pg_upgrade/data...
--- C:/cirrus/src/test/regress/expected/compression_1.out	2024-05-03 12:36:26.026916500 +0000
+++ C:/cirrus/build/testrun/pg_upgrade/002_pg_upgrade/data/results/compression.out	2024-05-03 12:40:02.599744000 +0000
@@ -216,13 +216,16 @@
 -----------------------
 (0 rows)
 
--- test compression with inheritance, error
-CREATE TABLE cminh() INHERITS(cmdata, cmdata1);
+-- test compression with inheritance
+CREATE TABLE cminh() INHERITS(cmdata, cmdata1); -- error
 ERROR:  relation "cmdata1" does not exist
-CREATE TABLE cminh(f1 TEXT COMPRESSION lz4) INHERITS(cmdata);
+CREATE TABLE cminh(f1 TEXT COMPRESSION lz4) INHERITS(cmdata); -- error
 NOTICE:  merging column "f1" with inherited definition
 ERROR:  column "f1" has a compression method conflict
 DETAIL:  pglz versus lz4
+CREATE TABLE cmdata3(f1 text);
+CREATE TABLE cminh() INHERITS (cmdata, cmdata3);
+NOTICE:  merging multiple inherited definitions of column "f1"
...

diff -w -U3 C:/cirrus/src/test/regress/expected/compression_1.out C:/cirrus/build/testrun/recovery/027_stream_regress/da...
--- C:/cirrus/src/test/regress/expected/compression_1.out	2024-05-03 12:36:26.026916500 +0000
+++ C:/cirrus/build/testrun/recovery/027_stream_regress/data/results/compression.out	2024-05-03 12:42:13.715942300 +0000
@@ -216,13 +216,16 @@
 -----------------------
 (0 rows)
 
--- test compression with inheritance, error
-CREATE TABLE cminh() INHERITS(cmdata, cmdata1);
+-- test compression with inheritance
+CREATE TABLE cminh() INHERITS(cmdata, cmdata1); -- error
 ERROR:  relation "cmdata1" does not exist
-CREATE TABLE cminh(f1 TEXT COMPRESSION lz4) INHERITS(cmdata);
+CREATE TABLE cminh(f1 TEXT COMPRESSION lz4) INHERITS(cmdata); -- error
 NOTICE:  merging column "f1" with inherited definition
 ERROR:  column "f1" has a compression method conflict
 DETAIL:  pglz versus lz4
+CREATE TABLE cmdata3(f1 text);
+CREATE TABLE cminh() INHERITS (cmdata, cmdata3);
+NOTICE:  merging multiple inherited definitions of column "f1"
...

diff -w -U3 C:/cirrus/src/test/regress/expected/compression_1.out C:/cirrus/build/testrun/regress/regress/results/compre...
--- C:/cirrus/src/test/regress/expected/compression_1.out	2024-05-03 12:36:26.026916500 +0000
+++ C:/cirrus/build/testrun/regress/regress/results/compression.out	2024-05-03 12:39:56.781390000 +0000
@@ -216,13 +216,16 @@
 -----------------------
 (0 rows)
 
--- test compression with inheritance, error
-CREATE TABLE cminh() INHERITS(cmdata, cmdata1);
+-- test compression with inheritance
+CREATE TABLE cminh() INHERITS(cmdata, cmdata1); -- error
 ERROR:  relation "cmdata1" does not exist
-CREATE TABLE cminh(f1 TEXT COMPRESSION lz4) INHERITS(cmdata);
+CREATE TABLE cminh(f1 TEXT COMPRESSION lz4) INHERITS(cmdata); -- error
 NOTICE:  merging column "f1" with inherited definition
 ERROR:  column "f1" has a compression method conflict
 DETAIL:  pglz versus lz4
+CREATE TABLE cmdata3(f1 text);
+CREATE TABLE cminh() INHERITS (cmdata, cmdata3);
+NOTICE:  merging multiple inherited definitions of column "f1"
...

diff -w -U3 C:/cirrus/src/test/regress/expected/compression_1.out C:/cirrus/build/testrun/pg_upgrade/002_pg_upgrade/data...
--- C:/cirrus/src/test/regress/expected/compression_1.out	2024-05-03 12:07:24.649401200 +0000
+++ C:/cirrus/build/testrun/pg_upgrade/002_pg_upgrade/data/results/compression.out	2024-05-03 12:11:17.883605400 +0000
@@ -216,13 +216,16 @@
 -----------------------
 (0 rows)
 
--- test compression with inheritance, error
-CREATE TABLE cminh() INHERITS(cmdata, cmdata1);
+-- test compression with inheritance
+CREATE TABLE cminh() INHERITS(cmdata, cmdata1); -- error
 ERROR:  relation "cmdata1" does not exist
-CREATE TABLE cminh(f1 TEXT COMPRESSION lz4) INHERITS(cmdata);
+CREATE TABLE cminh(f1 TEXT COMPRESSION lz4) INHERITS(cmdata); -- error
 NOTICE:  merging column "f1" with inherited definition
 ERROR:  column "f1" has a compression method conflict
 DETAIL:  pglz versus lz4
+CREATE TABLE cmdata3(f1 text);
+CREATE TABLE cminh() INHERITS (cmdata, cmdata3);
+NOTICE:  merging multiple inherited definitions of column "f1"
...

diff -w -U3 C:/cirrus/src/test/regress/expected/compression_1.out C:/cirrus/build/testrun/recovery/027_stream_regress/da...
--- C:/cirrus/src/test/regress/expected/compression_1.out	2024-05-03 12:07:24.649401200 +0000
+++ C:/cirrus/build/testrun/recovery/027_stream_regress/data/results/compression.out	2024-05-03 12:13:30.947992500 +0000
@@ -216,13 +216,16 @@
 -----------------------
 (0 rows)
 
--- test compression with inheritance, error
-CREATE TABLE cminh() INHERITS(cmdata, cmdata1);
+-- test compression with inheritance
+CREATE TABLE cminh() INHERITS(cmdata, cmdata1); -- error
 ERROR:  relation "cmdata1" does not exist
-CREATE TABLE cminh(f1 TEXT COMPRESSION lz4) INHERITS(cmdata);
+CREATE TABLE cminh(f1 TEXT COMPRESSION lz4) INHERITS(cmdata); -- error
 NOTICE:  merging column "f1" with inherited definition
 ERROR:  column "f1" has a compression method conflict
 DETAIL:  pglz versus lz4
+CREATE TABLE cmdata3(f1 text);
+CREATE TABLE cminh() INHERITS (cmdata, cmdata3);
+NOTICE:  merging multiple inherited definitions of column "f1"
...

diff -w -U3 C:/cirrus/src/test/regress/expected/compression_1.out C:/cirrus/build/testrun/regress/regress/results/compre...
--- C:/cirrus/src/test/regress/expected/compression_1.out	2024-05-03 12:07:24.649401200 +0000
+++ C:/cirrus/build/testrun/regress/regress/results/compression.out	2024-05-03 12:11:02.918773000 +0000
@@ -216,13 +216,16 @@
 -----------------------
 (0 rows)
 
--- test compression with inheritance, error
-CREATE TABLE cminh() INHERITS(cmdata, cmdata1);
+-- test compression with inheritance
+CREATE TABLE cminh() INHERITS(cmdata, cmdata1); -- error
 ERROR:  relation "cmdata1" does not exist
-CREATE TABLE cminh(f1 TEXT COMPRESSION lz4) INHERITS(cmdata);
+CREATE TABLE cminh(f1 TEXT COMPRESSION lz4) INHERITS(cmdata); -- error
 NOTICE:  merging column "f1" with inherited definition
 ERROR:  column "f1" has a compression method conflict
 DETAIL:  pglz versus lz4
+CREATE TABLE cmdata3(f1 text);
+CREATE TABLE cminh() INHERITS (cmdata, cmdata3);
+NOTICE:  merging multiple inherited definitions of column "f1"
...

diff -w -U3 C:/cirrus/src/test/regress/expected/compression_1.out C:/cirrus/build/testrun/pg_upgrade/002_pg_upgrade/data...
--- C:/cirrus/src/test/regress/expected/compression_1.out	2024-05-03 12:05:16.847101400 +0000
+++ C:/cirrus/build/testrun/pg_upgrade/002_pg_upgrade/data/results/compression.out	2024-05-03 12:08:58.297418400 +0000
@@ -216,13 +216,16 @@
 -----------------------
 (0 rows)
 
--- test compression with inheritance, error
-CREATE TABLE cminh() INHERITS(cmdata, cmdata1);
+-- test compression with inheritance
+CREATE TABLE cminh() INHERITS(cmdata, cmdata1); -- error
 ERROR:  relation "cmdata1" does not exist
-CREATE TABLE cminh(f1 TEXT COMPRESSION lz4) INHERITS(cmdata);
+CREATE TABLE cminh(f1 TEXT COMPRESSION lz4) INHERITS(cmdata); -- error
 NOTICE:  merging column "f1" with inherited definition
 ERROR:  column "f1" has a compression method conflict
 DETAIL:  pglz versus lz4
+CREATE TABLE cmdata3(f1 text);
+CREATE TABLE cminh() INHERITS (cmdata, cmdata3);
+NOTICE:  merging multiple inherited definitions of column "f1"
...

diff -w -U3 C:/cirrus/src/test/regress/expected/compression_1.out C:/cirrus/build/testrun/recovery/027_stream_regress/da...
--- C:/cirrus/src/test/regress/expected/compression_1.out	2024-05-03 12:05:16.847101400 +0000
+++ C:/cirrus/build/testrun/recovery/027_stream_regress/data/results/compression.out	2024-05-03 12:11:06.661671600 +0000
@@ -216,13 +216,16 @@
 -----------------------
 (0 rows)
 
--- test compression with inheritance, error
-CREATE TABLE cminh() INHERITS(cmdata, cmdata1);
+-- test compression with inheritance
+CREATE TABLE cminh() INHERITS(cmdata, cmdata1); -- error
 ERROR:  relation "cmdata1" does not exist
-CREATE TABLE cminh(f1 TEXT COMPRESSION lz4) INHERITS(cmdata);
+CREATE TABLE cminh(f1 TEXT COMPRESSION lz4) INHERITS(cmdata); -- error
 NOTICE:  merging column "f1" with inherited definition
 ERROR:  column "f1" has a compression method conflict
 DETAIL:  pglz versus lz4
+CREATE TABLE cmdata3(f1 text);
+CREATE TABLE cminh() INHERITS (cmdata, cmdata3);
+NOTICE:  merging multiple inherited definitions of column "f1"
...

diff -w -U3 C:/cirrus/src/test/regress/expected/compression_1.out C:/cirrus/build/testrun/regress/regress/results/compre...
--- C:/cirrus/src/test/regress/expected/compression_1.out	2024-05-03 12:05:16.847101400 +0000
+++ C:/cirrus/build/testrun/regress/regress/results/compression.out	2024-05-03 12:08:53.010307800 +0000
@@ -216,13 +216,16 @@
 -----------------------
 (0 rows)
 
--- test compression with inheritance, error
-CREATE TABLE cminh() INHERITS(cmdata, cmdata1);
+-- test compression with inheritance
+CREATE TABLE cminh() INHERITS(cmdata, cmdata1); -- error
 ERROR:  relation "cmdata1" does not exist
-CREATE TABLE cminh(f1 TEXT COMPRESSION lz4) INHERITS(cmdata);
+CREATE TABLE cminh(f1 TEXT COMPRESSION lz4) INHERITS(cmdata); -- error
 NOTICE:  merging column "f1" with inherited definition
 ERROR:  column "f1" has a compression method conflict
 DETAIL:  pglz versus lz4
+CREATE TABLE cmdata3(f1 text);
+CREATE TABLE cminh() INHERITS (cmdata, cmdata3);
+NOTICE:  merging multiple inherited definitions of column "f1"
...

diff -w -U3 C:/cirrus/src/test/regress/expected/compression_1.out C:/cirrus/build/testrun/pg_upgrade/002_pg_upgrade/data...
--- C:/cirrus/src/test/regress/expected/compression_1.out	2024-05-03 12:01:05.321115000 +0000
+++ C:/cirrus/build/testrun/pg_upgrade/002_pg_upgrade/data/results/compression.out	2024-05-03 12:04:49.378645000 +0000
@@ -216,13 +216,16 @@
 -----------------------
 (0 rows)
 
--- test compression with inheritance, error
-CREATE TABLE cminh() INHERITS(cmdata, cmdata1);
+-- test compression with inheritance
+CREATE TABLE cminh() INHERITS(cmdata, cmdata1); -- error
 ERROR:  relation "cmdata1" does not exist
-CREATE TABLE cminh(f1 TEXT COMPRESSION lz4) INHERITS(cmdata);
+CREATE TABLE cminh(f1 TEXT COMPRESSION lz4) INHERITS(cmdata); -- error
 NOTICE:  merging column "f1" with inherited definition
 ERROR:  column "f1" has a compression method conflict
 DETAIL:  pglz versus lz4
+CREATE TABLE cmdata3(f1 text);
+CREATE TABLE cminh() INHERITS (cmdata, cmdata3);
+NOTICE:  merging multiple inherited definitions of column "f1"
...

diff -w -U3 C:/cirrus/src/test/regress/expected/compression_1.out C:/cirrus/build/testrun/recovery/027_stream_regress/da...
--- C:/cirrus/src/test/regress/expected/compression_1.out	2024-05-03 12:01:05.321115000 +0000
+++ C:/cirrus/build/testrun/recovery/027_stream_regress/data/results/compression.out	2024-05-03 12:07:15.266823400 +0000
@@ -216,13 +216,16 @@
 -----------------------
 (0 rows)
 
--- test compression with inheritance, error
-CREATE TABLE cminh() INHERITS(cmdata, cmdata1);
+-- test compression with inheritance
+CREATE TABLE cminh() INHERITS(cmdata, cmdata1); -- error
 ERROR:  relation "cmdata1" does not exist
-CREATE TABLE cminh(f1 TEXT COMPRESSION lz4) INHERITS(cmdata);
+CREATE TABLE cminh(f1 TEXT COMPRESSION lz4) INHERITS(cmdata); -- error
 NOTICE:  merging column "f1" with inherited definition
 ERROR:  column "f1" has a compression method conflict
 DETAIL:  pglz versus lz4
+CREATE TABLE cmdata3(f1 text);
+CREATE TABLE cminh() INHERITS (cmdata, cmdata3);
+NOTICE:  merging multiple inherited definitions of column "f1"
...

diff -w -U3 C:/cirrus/src/test/regress/expected/compression_1.out C:/cirrus/build/testrun/regress/regress/results/compre...
--- C:/cirrus/src/test/regress/expected/compression_1.out	2024-05-03 12:01:05.321115000 +0000
+++ C:/cirrus/build/testrun/regress/regress/results/compression.out	2024-05-03 12:04:43.258530100 +0000
@@ -216,13 +216,16 @@
 -----------------------
 (0 rows)
 
--- test compression with inheritance, error
-CREATE TABLE cminh() INHERITS(cmdata, cmdata1);
+-- test compression with inheritance
+CREATE TABLE cminh() INHERITS(cmdata, cmdata1); -- error
 ERROR:  relation "cmdata1" does not exist
-CREATE TABLE cminh(f1 TEXT COMPRESSION lz4) INHERITS(cmdata);
+CREATE TABLE cminh(f1 TEXT COMPRESSION lz4) INHERITS(cmdata); -- error
 NOTICE:  merging column "f1" with inherited definition
 ERROR:  column "f1" has a compression method conflict
 DETAIL:  pglz versus lz4
+CREATE TABLE cmdata3(f1 text);
+CREATE TABLE cminh() INHERITS (cmdata, cmdata3);
+NOTICE:  merging multiple inherited definitions of column "f1"
...

diff -w -U3 C:/cirrus/src/test/regress/expected/compression_1.out C:/cirrus/build/testrun/pg_upgrade/002_pg_upgrade/data...
--- C:/cirrus/src/test/regress/expected/compression_1.out	2024-05-03 11:36:17.079763600 +0000
+++ C:/cirrus/build/testrun/pg_upgrade/002_pg_upgrade/data/results/compression.out	2024-05-03 11:39:36.083459300 +0000
@@ -216,13 +216,16 @@
 -----------------------
 (0 rows)
 
--- test compression with inheritance, error
-CREATE TABLE cminh() INHERITS(cmdata, cmdata1);
+-- test compression with inheritance
+CREATE TABLE cminh() INHERITS(cmdata, cmdata1); -- error
 ERROR:  relation "cmdata1" does not exist
-CREATE TABLE cminh(f1 TEXT COMPRESSION lz4) INHERITS(cmdata);
+CREATE TABLE cminh(f1 TEXT COMPRESSION lz4) INHERITS(cmdata); -- error
 NOTICE:  merging column "f1" with inherited definition
 ERROR:  column "f1" has a compression method conflict
 DETAIL:  pglz versus lz4
+CREATE TABLE cmdata3(f1 text);
+CREATE TABLE cminh() INHERITS (cmdata, cmdata3);
+NOTICE:  merging multiple inherited definitions of column "f1"
...

diff -w -U3 C:/cirrus/src/test/regress/expected/compression_1.out C:/cirrus/build/testrun/recovery/027_stream_regress/da...
--- C:/cirrus/src/test/regress/expected/compression_1.out	2024-05-03 11:36:17.079763600 +0000
+++ C:/cirrus/build/testrun/recovery/027_stream_regress/data/results/compression.out	2024-05-03 11:41:52.587789600 +0000
@@ -216,13 +216,16 @@
 -----------------------
 (0 rows)
 
--- test compression with inheritance, error
-CREATE TABLE cminh() INHERITS(cmdata, cmdata1);
+-- test compression with inheritance
+CREATE TABLE cminh() INHERITS(cmdata, cmdata1); -- error
 ERROR:  relation "cmdata1" does not exist
-CREATE TABLE cminh(f1 TEXT COMPRESSION lz4) INHERITS(cmdata);
+CREATE TABLE cminh(f1 TEXT COMPRESSION lz4) INHERITS(cmdata); -- error
 NOTICE:  merging column "f1" with inherited definition
 ERROR:  column "f1" has a compression method conflict
 DETAIL:  pglz versus lz4
+CREATE TABLE cmdata3(f1 text);
+CREATE TABLE cminh() INHERITS (cmdata, cmdata3);
+NOTICE:  merging multiple inherited definitions of column "f1"
...

diff -w -U3 C:/cirrus/src/test/regress/expected/compression_1.out C:/cirrus/build/testrun/regress/regress/results/compre...
--- C:/cirrus/src/test/regress/expected/compression_1.out	2024-05-03 11:36:17.079763600 +0000
+++ C:/cirrus/build/testrun/regress/regress/results/compression.out	2024-05-03 11:39:31.013145000 +0000
@@ -216,13 +216,16 @@
 -----------------------
 (0 rows)
 
--- test compression with inheritance, error
-CREATE TABLE cminh() INHERITS(cmdata, cmdata1);
+-- test compression with inheritance
+CREATE TABLE cminh() INHERITS(cmdata, cmdata1); -- error
 ERROR:  relation "cmdata1" does not exist
-CREATE TABLE cminh(f1 TEXT COMPRESSION lz4) INHERITS(cmdata);
+CREATE TABLE cminh(f1 TEXT COMPRESSION lz4) INHERITS(cmdata); -- error
 NOTICE:  merging column "f1" with inherited definition
 ERROR:  column "f1" has a compression method conflict
 DETAIL:  pglz versus lz4
+CREATE TABLE cmdata3(f1 text);
+CREATE TABLE cminh() INHERITS (cmdata, cmdata3);
+NOTICE:  merging multiple inherited definitions of column "f1"
...

diff -w -U3 C:/cirrus/src/test/regress/expected/compression_1.out C:/cirrus/build/testrun/pg_upgrade/002_pg_upgrade/data...
--- C:/cirrus/src/test/regress/expected/compression_1.out	2024-05-03 11:06:38.763066200 +0000
+++ C:/cirrus/build/testrun/pg_upgrade/002_pg_upgrade/data/results/compression.out	2024-05-03 11:10:18.307989200 +0000
@@ -216,13 +216,16 @@
 -----------------------
 (0 rows)
 
--- test compression with inheritance, error
-CREATE TABLE cminh() INHERITS(cmdata, cmdata1);
+-- test compression with inheritance
+CREATE TABLE cminh() INHERITS(cmdata, cmdata1); -- error
 ERROR:  relation "cmdata1" does not exist
-CREATE TABLE cminh(f1 TEXT COMPRESSION lz4) INHERITS(cmdata);
+CREATE TABLE cminh(f1 TEXT COMPRESSION lz4) INHERITS(cmdata); -- error
 NOTICE:  merging column "f1" with inherited definition
 ERROR:  column "f1" has a compression method conflict
 DETAIL:  pglz versus lz4
+CREATE TABLE cmdata3(f1 text);
+CREATE TABLE cminh() INHERITS (cmdata, cmdata3);
+NOTICE:  merging multiple inherited definitions of column "f1"
...

diff -w -U3 C:/cirrus/src/test/regress/expected/compression_1.out C:/cirrus/build/testrun/recovery/027_stream_regress/da...
--- C:/cirrus/src/test/regress/expected/compression_1.out	2024-05-03 11:06:38.763066200 +0000
+++ C:/cirrus/build/testrun/recovery/027_stream_regress/data/results/compression.out	2024-05-03 11:12:25.261542700 +0000
@@ -216,13 +216,16 @@
 -----------------------
 (0 rows)
 
--- test compression with inheritance, error
-CREATE TABLE cminh() INHERITS(cmdata, cmdata1);
+-- test compression with inheritance
+CREATE TABLE cminh() INHERITS(cmdata, cmdata1); -- error
 ERROR:  relation "cmdata1" does not exist
-CREATE TABLE cminh(f1 TEXT COMPRESSION lz4) INHERITS(cmdata);
+CREATE TABLE cminh(f1 TEXT COMPRESSION lz4) INHERITS(cmdata); -- error
 NOTICE:  merging column "f1" with inherited definition
 ERROR:  column "f1" has a compression method conflict
 DETAIL:  pglz versus lz4
+CREATE TABLE cmdata3(f1 text);
+CREATE TABLE cminh() INHERITS (cmdata, cmdata3);
+NOTICE:  merging multiple inherited definitions of column "f1"
...

diff -w -U3 C:/cirrus/src/test/regress/expected/compression_1.out C:/cirrus/build/testrun/regress/regress/results/compre...
--- C:/cirrus/src/test/regress/expected/compression_1.out	2024-05-03 11:06:38.763066200 +0000
+++ C:/cirrus/build/testrun/regress/regress/results/compression.out	2024-05-03 11:10:06.699598400 +0000
@@ -216,13 +216,16 @@
 -----------------------
 (0 rows)
 
--- test compression with inheritance, error
-CREATE TABLE cminh() INHERITS(cmdata, cmdata1);
+-- test compression with inheritance
+CREATE TABLE cminh() INHERITS(cmdata, cmdata1); -- error
 ERROR:  relation "cmdata1" does not exist
-CREATE TABLE cminh(f1 TEXT COMPRESSION lz4) INHERITS(cmdata);
+CREATE TABLE cminh(f1 TEXT COMPRESSION lz4) INHERITS(cmdata); -- error
 NOTICE:  merging column "f1" with inherited definition
 ERROR:  column "f1" has a compression method conflict
 DETAIL:  pglz versus lz4
+CREATE TABLE cmdata3(f1 text);
+CREATE TABLE cminh() INHERITS (cmdata, cmdata3);
+NOTICE:  merging multiple inherited definitions of column "f1"
...

diff -w -U3 C:/cirrus/src/test/regress/expected/compression_1.out C:/cirrus/build/testrun/pg_upgrade/002_pg_upgrade/data...
--- C:/cirrus/src/test/regress/expected/compression_1.out	2024-05-03 11:03:58.257093500 +0000
+++ C:/cirrus/build/testrun/pg_upgrade/002_pg_upgrade/data/results/compression.out	2024-05-03 11:07:31.222956400 +0000
@@ -216,13 +216,16 @@
 -----------------------
 (0 rows)
 
--- test compression with inheritance, error
-CREATE TABLE cminh() INHERITS(cmdata, cmdata1);
+-- test compression with inheritance
+CREATE TABLE cminh() INHERITS(cmdata, cmdata1); -- error
 ERROR:  relation "cmdata1" does not exist
-CREATE TABLE cminh(f1 TEXT COMPRESSION lz4) INHERITS(cmdata);
+CREATE TABLE cminh(f1 TEXT COMPRESSION lz4) INHERITS(cmdata); -- error
 NOTICE:  merging column "f1" with inherited definition
 ERROR:  column "f1" has a compression method conflict
 DETAIL:  pglz versus lz4
+CREATE TABLE cmdata3(f1 text);
+CREATE TABLE cminh() INHERITS (cmdata, cmdata3);
+NOTICE:  merging multiple inherited definitions of column "f1"
...

diff -w -U3 C:/cirrus/src/test/regress/expected/compression_1.out C:/cirrus/build/testrun/recovery/027_stream_regress/da...
--- C:/cirrus/src/test/regress/expected/compression_1.out	2024-05-03 11:03:58.257093500 +0000
+++ C:/cirrus/build/testrun/recovery/027_stream_regress/data/results/compression.out	2024-05-03 11:09:38.048096600 +0000
@@ -216,13 +216,16 @@
 -----------------------
 (0 rows)
 
--- test compression with inheritance, error
-CREATE TABLE cminh() INHERITS(cmdata, cmdata1);
+-- test compression with inheritance
+CREATE TABLE cminh() INHERITS(cmdata, cmdata1); -- error
 ERROR:  relation "cmdata1" does not exist
-CREATE TABLE cminh(f1 TEXT COMPRESSION lz4) INHERITS(cmdata);
+CREATE TABLE cminh(f1 TEXT COMPRESSION lz4) INHERITS(cmdata); -- error
 NOTICE:  merging column "f1" with inherited definition
 ERROR:  column "f1" has a compression method conflict
 DETAIL:  pglz versus lz4
+CREATE TABLE cmdata3(f1 text);
+CREATE TABLE cminh() INHERITS (cmdata, cmdata3);
+NOTICE:  merging multiple inherited definitions of column "f1"
...

diff -w -U3 C:/cirrus/src/test/regress/expected/compression_1.out C:/cirrus/build/testrun/regress/regress/results/compre...
--- C:/cirrus/src/test/regress/expected/compression_1.out	2024-05-03 11:03:58.257093500 +0000
+++ C:/cirrus/build/testrun/regress/regress/results/compression.out	2024-05-03 11:07:19.189268700 +0000
@@ -216,13 +216,16 @@
 -----------------------
 (0 rows)
 
--- test compression with inheritance, error
-CREATE TABLE cminh() INHERITS(cmdata, cmdata1);
+-- test compression with inheritance
+CREATE TABLE cminh() INHERITS(cmdata, cmdata1); -- error
 ERROR:  relation "cmdata1" does not exist
-CREATE TABLE cminh(f1 TEXT COMPRESSION lz4) INHERITS(cmdata);
+CREATE TABLE cminh(f1 TEXT COMPRESSION lz4) INHERITS(cmdata); -- error
 NOTICE:  merging column "f1" with inherited definition
 ERROR:  column "f1" has a compression method conflict
 DETAIL:  pglz versus lz4
+CREATE TABLE cmdata3(f1 text);
+CREATE TABLE cminh() INHERITS (cmdata, cmdata3);
+NOTICE:  merging multiple inherited definitions of column "f1"
...

diff -w -U3 C:/cirrus/src/test/regress/expected/compression_1.out C:/cirrus/build/testrun/pg_upgrade/002_pg_upgrade/data...
--- C:/cirrus/src/test/regress/expected/compression_1.out	2024-05-03 10:59:58.640108100 +0000
+++ C:/cirrus/build/testrun/pg_upgrade/002_pg_upgrade/data/results/compression.out	2024-05-03 11:03:32.930483400 +0000
@@ -216,13 +216,16 @@
 -----------------------
 (0 rows)
 
--- test compression with inheritance, error
-CREATE TABLE cminh() INHERITS(cmdata, cmdata1);
+-- test compression with inheritance
+CREATE TABLE cminh() INHERITS(cmdata, cmdata1); -- error
 ERROR:  relation "cmdata1" does not exist
-CREATE TABLE cminh(f1 TEXT COMPRESSION lz4) INHERITS(cmdata);
+CREATE TABLE cminh(f1 TEXT COMPRESSION lz4) INHERITS(cmdata); -- error
 NOTICE:  merging column "f1" with inherited definition
 ERROR:  column "f1" has a compression method conflict
 DETAIL:  pglz versus lz4
+CREATE TABLE cmdata3(f1 text);
+CREATE TABLE cminh() INHERITS (cmdata, cmdata3);
+NOTICE:  merging multiple inherited definitions of column "f1"
...

diff -w -U3 C:/cirrus/src/test/regress/expected/compression_1.out C:/cirrus/build/testrun/recovery/027_stream_regress/da...
--- C:/cirrus/src/test/regress/expected/compression_1.out	2024-05-03 10:59:58.640108100 +0000
+++ C:/cirrus/build/testrun/recovery/027_stream_regress/data/results/compression.out	2024-05-03 11:05:32.864065100 +0000
@@ -216,13 +216,16 @@
 -----------------------
 (0 rows)
 
--- test compression with inheritance, error
-CREATE TABLE cminh() INHERITS(cmdata, cmdata1);
+-- test compression with inheritance
+CREATE TABLE cminh() INHERITS(cmdata, cmdata1); -- error
 ERROR:  relation "cmdata1" does not exist
-CREATE TABLE cminh(f1 TEXT COMPRESSION lz4) INHERITS(cmdata);
+CREATE TABLE cminh(f1 TEXT COMPRESSION lz4) INHERITS(cmdata); -- error
 NOTICE:  merging column "f1" with inherited definition
 ERROR:  column "f1" has a compression method conflict
 DETAIL:  pglz versus lz4
+CREATE TABLE cmdata3(f1 text);
+CREATE TABLE cminh() INHERITS (cmdata, cmdata3);
+NOTICE:  merging multiple inherited definitions of column "f1"
...

diff -w -U3 C:/cirrus/src/test/regress/expected/compression_1.out C:/cirrus/build/testrun/regress/regress/results/compre...
--- C:/cirrus/src/test/regress/expected/compression_1.out	2024-05-03 10:59:58.640108100 +0000
+++ C:/cirrus/build/testrun/regress/regress/results/compression.out	2024-05-03 11:03:27.187814500 +0000
@@ -216,13 +216,16 @@
 -----------------------
 (0 rows)
 
--- test compression with inheritance, error
-CREATE TABLE cminh() INHERITS(cmdata, cmdata1);
+-- test compression with inheritance
+CREATE TABLE cminh() INHERITS(cmdata, cmdata1); -- error
 ERROR:  relation "cmdata1" does not exist
-CREATE TABLE cminh(f1 TEXT COMPRESSION lz4) INHERITS(cmdata);
+CREATE TABLE cminh(f1 TEXT COMPRESSION lz4) INHERITS(cmdata); -- error
 NOTICE:  merging column "f1" with inherited definition
 ERROR:  column "f1" has a compression method conflict
 DETAIL:  pglz versus lz4
+CREATE TABLE cmdata3(f1 text);
+CREATE TABLE cminh() INHERITS (cmdata, cmdata3);
+NOTICE:  merging multiple inherited definitions of column "f1"
...

diff -w -U3 C:/cirrus/src/test/regress/expected/compression_1.out C:/cirrus/build/testrun/pg_upgrade/002_pg_upgrade/data...
--- C:/cirrus/src/test/regress/expected/compression_1.out	2024-05-03 10:49:01.914737000 +0000
+++ C:/cirrus/build/testrun/pg_upgrade/002_pg_upgrade/data/results/compression.out	2024-05-03 10:52:44.006847000 +0000
@@ -216,13 +216,16 @@
 -----------------------
 (0 rows)
 
--- test compression with inheritance, error
-CREATE TABLE cminh() INHERITS(cmdata, cmdata1);
+-- test compression with inheritance
+CREATE TABLE cminh() INHERITS(cmdata, cmdata1); -- error
 ERROR:  relation "cmdata1" does not exist
-CREATE TABLE cminh(f1 TEXT COMPRESSION lz4) INHERITS(cmdata);
+CREATE TABLE cminh(f1 TEXT COMPRESSION lz4) INHERITS(cmdata); -- error
 NOTICE:  merging column "f1" with inherited definition
 ERROR:  column "f1" has a compression method conflict
 DETAIL:  pglz versus lz4
+CREATE TABLE cmdata3(f1 text);
+CREATE TABLE cminh() INHERITS (cmdata, cmdata3);
+NOTICE:  merging multiple inherited definitions of column "f1"
...

diff -w -U3 C:/cirrus/src/test/regress/expected/compression_1.out C:/cirrus/build/testrun/recovery/027_stream_regress/da...
--- C:/cirrus/src/test/regress/expected/compression_1.out	2024-05-03 10:49:01.914737000 +0000
+++ C:/cirrus/build/testrun/recovery/027_stream_regress/data/results/compression.out	2024-05-03 10:54:55.298804000 +0000
@@ -216,13 +216,16 @@
 -----------------------
 (0 rows)
 
--- test compression with inheritance, error
-CREATE TABLE cminh() INHERITS(cmdata, cmdata1);
+-- test compression with inheritance
+CREATE TABLE cminh() INHERITS(cmdata, cmdata1); -- error
 ERROR:  relation "cmdata1" does not exist
-CREATE TABLE cminh(f1 TEXT COMPRESSION lz4) INHERITS(cmdata);
+CREATE TABLE cminh(f1 TEXT COMPRESSION lz4) INHERITS(cmdata); -- error
 NOTICE:  merging column "f1" with inherited definition
 ERROR:  column "f1" has a compression method conflict
 DETAIL:  pglz versus lz4
+CREATE TABLE cmdata3(f1 text);
+CREATE TABLE cminh() INHERITS (cmdata, cmdata3);
+NOTICE:  merging multiple inherited definitions of column "f1"
...

diff -w -U3 C:/cirrus/src/test/regress/expected/compression_1.out C:/cirrus/build/testrun/regress/regress/results/compre...
--- C:/cirrus/src/test/regress/expected/compression_1.out	2024-05-03 10:49:01.914737000 +0000
+++ C:/cirrus/build/testrun/regress/regress/results/compression.out	2024-05-03 10:52:36.960977100 +0000
@@ -216,13 +216,16 @@
 -----------------------
 (0 rows)
 
--- test compression with inheritance, error
-CREATE TABLE cminh() INHERITS(cmdata, cmdata1);
+-- test compression with inheritance
+CREATE TABLE cminh() INHERITS(cmdata, cmdata1); -- error
 ERROR:  relation "cmdata1" does not exist
-CREATE TABLE cminh(f1 TEXT COMPRESSION lz4) INHERITS(cmdata);
+CREATE TABLE cminh(f1 TEXT COMPRESSION lz4) INHERITS(cmdata); -- error
 NOTICE:  merging column "f1" with inherited definition
 ERROR:  column "f1" has a compression method conflict
 DETAIL:  pglz versus lz4
+CREATE TABLE cmdata3(f1 text);
+CREATE TABLE cminh() INHERITS (cmdata, cmdata3);
+NOTICE:  merging multiple inherited definitions of column "f1"
...

diff -w -U3 C:/cirrus/src/test/regress/expected/compression_1.out C:/cirrus/build/testrun/pg_upgrade/002_pg_upgrade/data...
--- C:/cirrus/src/test/regress/expected/compression_1.out	2024-05-03 10:35:03.180833600 +0000
+++ C:/cirrus/build/testrun/pg_upgrade/002_pg_upgrade/data/results/compression.out	2024-05-03 10:38:36.786797400 +0000
@@ -216,13 +216,16 @@
 -----------------------
 (0 rows)
 
--- test compression with inheritance, error
-CREATE TABLE cminh() INHERITS(cmdata, cmdata1);
+-- test compression with inheritance
+CREATE TABLE cminh() INHERITS(cmdata, cmdata1); -- error
 ERROR:  relation "cmdata1" does not exist
-CREATE TABLE cminh(f1 TEXT COMPRESSION lz4) INHERITS(cmdata);
+CREATE TABLE cminh(f1 TEXT COMPRESSION lz4) INHERITS(cmdata); -- error
 NOTICE:  merging column "f1" with inherited definition
 ERROR:  column "f1" has a compression method conflict
 DETAIL:  pglz versus lz4
+CREATE TABLE cmdata3(f1 text);
+CREATE TABLE cminh() INHERITS (cmdata, cmdata3);
+NOTICE:  merging multiple inherited definitions of column "f1"
...

diff -w -U3 C:/cirrus/src/test/regress/expected/compression_1.out C:/cirrus/build/testrun/recovery/027_stream_regress/da...
--- C:/cirrus/src/test/regress/expected/compression_1.out	2024-05-03 10:35:03.180833600 +0000
+++ C:/cirrus/build/testrun/recovery/027_stream_regress/data/results/compression.out	2024-05-03 10:40:43.525899100 +0000
@@ -216,13 +216,16 @@
 -----------------------
 (0 rows)
 
--- test compression with inheritance, error
-CREATE TABLE cminh() INHERITS(cmdata, cmdata1);
+-- test compression with inheritance
+CREATE TABLE cminh() INHERITS(cmdata, cmdata1); -- error
 ERROR:  relation "cmdata1" does not exist
-CREATE TABLE cminh(f1 TEXT COMPRESSION lz4) INHERITS(cmdata);
+CREATE TABLE cminh(f1 TEXT COMPRESSION lz4) INHERITS(cmdata); -- error
 NOTICE:  merging column "f1" with inherited definition
 ERROR:  column "f1" has a compression method conflict
 DETAIL:  pglz versus lz4
+CREATE TABLE cmdata3(f1 text);
+CREATE TABLE cminh() INHERITS (cmdata, cmdata3);
+NOTICE:  merging multiple inherited definitions of column "f1"
...

diff -w -U3 C:/cirrus/src/test/regress/expected/compression_1.out C:/cirrus/build/testrun/regress/regress/results/compre...
--- C:/cirrus/src/test/regress/expected/compression_1.out	2024-05-03 10:35:03.180833600 +0000
+++ C:/cirrus/build/testrun/regress/regress/results/compression.out	2024-05-03 10:38:31.063665100 +0000
@@ -216,13 +216,16 @@
 -----------------------
 (0 rows)
 
--- test compression with inheritance, error
-CREATE TABLE cminh() INHERITS(cmdata, cmdata1);
+-- test compression with inheritance
+CREATE TABLE cminh() INHERITS(cmdata, cmdata1); -- error
 ERROR:  relation "cmdata1" does not exist
-CREATE TABLE cminh(f1 TEXT COMPRESSION lz4) INHERITS(cmdata);
+CREATE TABLE cminh(f1 TEXT COMPRESSION lz4) INHERITS(cmdata); -- error
 NOTICE:  merging column "f1" with inherited definition
 ERROR:  column "f1" has a compression method conflict
 DETAIL:  pglz versus lz4
+CREATE TABLE cmdata3(f1 text);
+CREATE TABLE cminh() INHERITS (cmdata, cmdata3);
+NOTICE:  merging multiple inherited definitions of column "f1"
...

diff -w -U3 C:/cirrus/src/test/regress/expected/compression_1.out C:/cirrus/build/testrun/pg_upgrade/002_pg_upgrade/data...
--- C:/cirrus/src/test/regress/expected/compression_1.out	2024-05-03 10:04:06.940259300 +0000
+++ C:/cirrus/build/testrun/pg_upgrade/002_pg_upgrade/data/results/compression.out	2024-05-03 10:07:47.780463500 +0000
@@ -216,13 +216,16 @@
 -----------------------
 (0 rows)
 
--- test compression with inheritance, error
-CREATE TABLE cminh() INHERITS(cmdata, cmdata1);
+-- test compression with inheritance
+CREATE TABLE cminh() INHERITS(cmdata, cmdata1); -- error
 ERROR:  relation "cmdata1" does not exist
-CREATE TABLE cminh(f1 TEXT COMPRESSION lz4) INHERITS(cmdata);
+CREATE TABLE cminh(f1 TEXT COMPRESSION lz4) INHERITS(cmdata); -- error
 NOTICE:  merging column "f1" with inherited definition
 ERROR:  column "f1" has a compression method conflict
 DETAIL:  pglz versus lz4
+CREATE TABLE cmdata3(f1 text);
+CREATE TABLE cminh() INHERITS (cmdata, cmdata3);
+NOTICE:  merging multiple inherited definitions of column "f1"
...

diff -w -U3 C:/cirrus/src/test/regress/expected/compression_1.out C:/cirrus/build/testrun/recovery/027_stream_regress/da...
--- C:/cirrus/src/test/regress/expected/compression_1.out	2024-05-03 10:04:06.940259300 +0000
+++ C:/cirrus/build/testrun/recovery/027_stream_regress/data/results/compression.out	2024-05-03 10:10:05.185307000 +0000
@@ -216,13 +216,16 @@
 -----------------------
 (0 rows)
 
--- test compression with inheritance, error
-CREATE TABLE cminh() INHERITS(cmdata, cmdata1);
+-- test compression with inheritance
+CREATE TABLE cminh() INHERITS(cmdata, cmdata1); -- error
 ERROR:  relation "cmdata1" does not exist
-CREATE TABLE cminh(f1 TEXT COMPRESSION lz4) INHERITS(cmdata);
+CREATE TABLE cminh(f1 TEXT COMPRESSION lz4) INHERITS(cmdata); -- error
 NOTICE:  merging column "f1" with inherited definition
 ERROR:  column "f1" has a compression method conflict
 DETAIL:  pglz versus lz4
+CREATE TABLE cmdata3(f1 text);
+CREATE TABLE cminh() INHERITS (cmdata, cmdata3);
+NOTICE:  merging multiple inherited definitions of column "f1"
...

diff -w -U3 C:/cirrus/src/test/regress/expected/compression_1.out C:/cirrus/build/testrun/regress/regress/results/compre...
--- C:/cirrus/src/test/regress/expected/compression_1.out	2024-05-03 10:04:06.940259300 +0000
+++ C:/cirrus/build/testrun/regress/regress/results/compression.out	2024-05-03 10:07:32.349794600 +0000
@@ -216,13 +216,16 @@
 -----------------------
 (0 rows)
 
--- test compression with inheritance, error
-CREATE TABLE cminh() INHERITS(cmdata, cmdata1);
+-- test compression with inheritance
+CREATE TABLE cminh() INHERITS(cmdata, cmdata1); -- error
 ERROR:  relation "cmdata1" does not exist
-CREATE TABLE cminh(f1 TEXT COMPRESSION lz4) INHERITS(cmdata);
+CREATE TABLE cminh(f1 TEXT COMPRESSION lz4) INHERITS(cmdata); -- error
 NOTICE:  merging column "f1" with inherited definition
 ERROR:  column "f1" has a compression method conflict
 DETAIL:  pglz versus lz4
+CREATE TABLE cmdata3(f1 text);
+CREATE TABLE cminh() INHERITS (cmdata, cmdata3);
+NOTICE:  merging multiple inherited definitions of column "f1"
...

diff -w -U3 C:/cirrus/src/test/regress/expected/compression_1.out C:/cirrus/build/testrun/pg_upgrade/002_pg_upgrade/data...
--- C:/cirrus/src/test/regress/expected/compression_1.out	2024-05-03 09:34:59.835414300 +0000
+++ C:/cirrus/build/testrun/pg_upgrade/002_pg_upgrade/data/results/compression.out	2024-05-03 09:38:26.220048900 +0000
@@ -216,13 +216,16 @@
 -----------------------
 (0 rows)
 
--- test compression with inheritance, error
-CREATE TABLE cminh() INHERITS(cmdata, cmdata1);
+-- test compression with inheritance
+CREATE TABLE cminh() INHERITS(cmdata, cmdata1); -- error
 ERROR:  relation "cmdata1" does not exist
-CREATE TABLE cminh(f1 TEXT COMPRESSION lz4) INHERITS(cmdata);
+CREATE TABLE cminh(f1 TEXT COMPRESSION lz4) INHERITS(cmdata); -- error
 NOTICE:  merging column "f1" with inherited definition
 ERROR:  column "f1" has a compression method conflict
 DETAIL:  pglz versus lz4
+CREATE TABLE cmdata3(f1 text);
+CREATE TABLE cminh() INHERITS (cmdata, cmdata3);
+NOTICE:  merging multiple inherited definitions of column "f1"
...

diff -w -U3 C:/cirrus/src/test/regress/expected/compression_1.out C:/cirrus/build/testrun/recovery/027_stream_regress/da...
--- C:/cirrus/src/test/regress/expected/compression_1.out	2024-05-03 09:34:59.835414300 +0000
+++ C:/cirrus/build/testrun/recovery/027_stream_regress/data/results/compression.out	2024-05-03 09:40:26.655532800 +0000
@@ -216,13 +216,16 @@
 -----------------------
 (0 rows)
 
--- test compression with inheritance, error
-CREATE TABLE cminh() INHERITS(cmdata, cmdata1);
+-- test compression with inheritance
+CREATE TABLE cminh() INHERITS(cmdata, cmdata1); -- error
 ERROR:  relation "cmdata1" does not exist
-CREATE TABLE cminh(f1 TEXT COMPRESSION lz4) INHERITS(cmdata);
+CREATE TABLE cminh(f1 TEXT COMPRESSION lz4) INHERITS(cmdata); -- error
 NOTICE:  merging column "f1" with inherited definition
 ERROR:  column "f1" has a compression method conflict
 DETAIL:  pglz versus lz4
+CREATE TABLE cmdata3(f1 text);
+CREATE TABLE cminh() INHERITS (cmdata, cmdata3);
+NOTICE:  merging multiple inherited definitions of column "f1"
...

diff -w -U3 C:/cirrus/src/test/regress/expected/compression_1.out C:/cirrus/build/testrun/regress/regress/results/compre...
--- C:/cirrus/src/test/regress/expected/compression_1.out	2024-05-03 09:34:59.835414300 +0000
+++ C:/cirrus/build/testrun/regress/regress/results/compression.out	2024-05-03 09:38:19.700515000 +0000
@@ -216,13 +216,16 @@
 -----------------------
 (0 rows)
 
--- test compression with inheritance, error
-CREATE TABLE cminh() INHERITS(cmdata, cmdata1);
+-- test compression with inheritance
+CREATE TABLE cminh() INHERITS(cmdata, cmdata1); -- error
 ERROR:  relation "cmdata1" does not exist
-CREATE TABLE cminh(f1 TEXT COMPRESSION lz4) INHERITS(cmdata);
+CREATE TABLE cminh(f1 TEXT COMPRESSION lz4) INHERITS(cmdata); -- error
 NOTICE:  merging column "f1" with inherited definition
 ERROR:  column "f1" has a compression method conflict
 DETAIL:  pglz versus lz4
+CREATE TABLE cmdata3(f1 text);
+CREATE TABLE cminh() INHERITS (cmdata, cmdata3);
+NOTICE:  merging multiple inherited definitions of column "f1"
...

diff -U3 /tmp/cirrus-ci-build/src/test/isolation/expected/timeouts.out /tmp/cirrus-ci-build/build/testrun/isolation/isol...
--- /tmp/cirrus-ci-build/src/test/isolation/expected/timeouts.out	2024-05-03 08:47:52.620707000 +0000
+++ /tmp/cirrus-ci-build/build/testrun/isolation/isolation/results/timeouts.out	2024-05-03 08:49:32.292986000 +0000
@@ -57,7 +57,7 @@
 step sto: SET statement_timeout = '10ms';
 step update: DELETE FROM accounts WHERE accountid = 'checking'; <waiting ...>
 step update: <... completed>
-ERROR:  canceling statement due to statement timeout
+ERROR:  canceling statement due to user request
 
 starting permutation: wrtbl lto update
 step wrtbl: UPDATE accounts SET balance = balance + 100;

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/alter_table.out /tmp/cirrus-ci-build/build/testrun/pg_upgrade/00...
--- /tmp/cirrus-ci-build/src/test/regress/expected/alter_table.out	2024-05-03 06:45:51.119846000 +0000
+++ /tmp/cirrus-ci-build/build/testrun/pg_upgrade/002_pg_upgrade/data/results/alter_table.out	2024-05-03 06:47:27.382899...
@@ -3476,9 +3476,20 @@
 WHERE relkind IN ('r', 'i', 'S', 't', 'm') AND mapped_oid IS DISTINCT FROM oid;
 SELECT m.* FROM filenode_mapping m LEFT JOIN pg_class c ON c.oid = m.oid
 WHERE c.oid IS NOT NULL OR m.mapped_oid IS NOT NULL;
- oid | mapped_oid | reltablespace | relfilenode | relname 
------+------------+---------------+-------------+---------
-(0 rows)
+  oid  | mapped_oid | reltablespace | relfilenode |       relname        
+-------+------------+---------------+-------------+----------------------
+ 37844 |            |             0 |       37844 | pktable_pkey
+ 37841 |            |             0 |       37841 | pktable
+ 37846 |            |             0 |       37846 | fktable
+ 38353 |            |             0 |       38360 | foo
+ 38364 |            |             0 |       38364 | pg_toast_38353_index
+ 38363 |            |             0 |       38363 | pg_toast_38353
+ 38591 |            |             0 |       38591 | old_oids
+ 38611 |            |             0 |       38611 | pg_toast_38608
...

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/alter_table.out /tmp/cirrus-ci-build/build/testrun/recovery/027_...
--- /tmp/cirrus-ci-build/src/test/regress/expected/alter_table.out	2024-05-03 06:45:51.119846000 +0000
+++ /tmp/cirrus-ci-build/build/testrun/recovery/027_stream_regress/data/results/alter_table.out	2024-05-03 06:47:56.4853...
@@ -3476,9 +3476,20 @@
 WHERE relkind IN ('r', 'i', 'S', 't', 'm') AND mapped_oid IS DISTINCT FROM oid;
 SELECT m.* FROM filenode_mapping m LEFT JOIN pg_class c ON c.oid = m.oid
 WHERE c.oid IS NOT NULL OR m.mapped_oid IS NOT NULL;
- oid | mapped_oid | reltablespace | relfilenode | relname 
------+------------+---------------+-------------+---------
-(0 rows)
+  oid  | mapped_oid | reltablespace | relfilenode |       relname        
+-------+------------+---------------+-------------+----------------------
+ 37676 |            |             0 |       37676 | pktable_pkey
+ 37673 |            |             0 |       37673 | pktable
+ 37686 |            |             0 |       37686 | fktable
+ 38322 |            |             0 |       38327 | foo
+ 38331 |            |             0 |       38331 | pg_toast_38322_index
+ 38330 |            |             0 |       38330 | pg_toast_38322
+ 38549 |            |             0 |       38549 | old_oids
+ 38580 |            |             0 |       38580 | pg_toast_38577
...

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/alter_table.out /tmp/cirrus-ci-build/build/testrun/regress/regre...
--- /tmp/cirrus-ci-build/src/test/regress/expected/alter_table.out	2024-05-03 06:45:51.119846000 +0000
+++ /tmp/cirrus-ci-build/build/testrun/regress/regress/results/alter_table.out	2024-05-03 06:47:21.978843000 +0000
@@ -3476,9 +3476,20 @@
 WHERE relkind IN ('r', 'i', 'S', 't', 'm') AND mapped_oid IS DISTINCT FROM oid;
 SELECT m.* FROM filenode_mapping m LEFT JOIN pg_class c ON c.oid = m.oid
 WHERE c.oid IS NOT NULL OR m.mapped_oid IS NOT NULL;
- oid | mapped_oid | reltablespace | relfilenode | relname 
------+------------+---------------+-------------+---------
-(0 rows)
+  oid  | mapped_oid | reltablespace | relfilenode |       relname        
+-------+------------+---------------+-------------+----------------------
+ 37877 |            |             0 |       37877 | pktable_pkey
+ 37874 |            |             0 |       37874 | pktable
+ 37879 |            |             0 |       37879 | fktable
+ 38375 |            |             0 |       38380 | foo
+ 38384 |            |             0 |       38384 | pg_toast_38375_index
+ 38383 |            |             0 |       38383 | pg_toast_38375
+ 38597 |            |             0 |       38597 | old_oids
+ 38615 |            |             0 |       38615 | pg_toast_38612
...

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/alter_table.out /tmp/cirrus-ci-build/src/bin/pg_upgrade/tmp_chec...
--- /tmp/cirrus-ci-build/src/test/regress/expected/alter_table.out	2024-05-03 06:45:40.773385309 +0000
+++ /tmp/cirrus-ci-build/src/bin/pg_upgrade/tmp_check/results/alter_table.out	2024-05-03 06:49:31.361259993 +0000
@@ -3476,9 +3476,29 @@
 WHERE relkind IN ('r', 'i', 'S', 't', 'm') AND mapped_oid IS DISTINCT FROM oid;
 SELECT m.* FROM filenode_mapping m LEFT JOIN pg_class c ON c.oid = m.oid
 WHERE c.oid IS NOT NULL OR m.mapped_oid IS NOT NULL;
- oid | mapped_oid | reltablespace | relfilenode | relname 
------+------------+---------------+-------------+---------
-(0 rows)
+  oid  | mapped_oid | reltablespace | relfilenode |       relname        
+-------+------------+---------------+-------------+----------------------
+ 37994 |            |             0 |       37994 | users_id_seq
+ 38000 |            |             0 |       38000 | pg_toast_37995
+ 38001 |            |             0 |       38001 | pg_toast_37995_index
+ 37995 |            |             0 |       37995 | users
+ 38251 |            |             0 |       38251 | foo
+ 37807 |            |             0 |       37807 | pktable_pkey
+ 37804 |            |             0 |       37804 | pktable
+ 37810 |            |             0 |       37810 | fktable
...

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/alter_table.out /tmp/cirrus-ci-build/src/test/recovery/tmp_check...
--- /tmp/cirrus-ci-build/src/test/regress/expected/alter_table.out	2024-05-03 06:45:40.773385309 +0000
+++ /tmp/cirrus-ci-build/src/test/recovery/tmp_check/results/alter_table.out	2024-05-03 06:50:48.205180967 +0000
@@ -3476,9 +3476,20 @@
 WHERE relkind IN ('r', 'i', 'S', 't', 'm') AND mapped_oid IS DISTINCT FROM oid;
 SELECT m.* FROM filenode_mapping m LEFT JOIN pg_class c ON c.oid = m.oid
 WHERE c.oid IS NOT NULL OR m.mapped_oid IS NOT NULL;
- oid | mapped_oid | reltablespace | relfilenode | relname 
------+------------+---------------+-------------+---------
-(0 rows)
+  oid  | mapped_oid | reltablespace | relfilenode |       relname        
+-------+------------+---------------+-------------+----------------------
+ 37863 |            |             0 |       37863 | pktable_pkey
+ 37860 |            |             0 |       37860 | pktable
+ 37865 |            |             0 |       37865 | fktable
+ 38412 |            |             0 |       38417 | foo
+ 38422 |            |             0 |       38422 | pg_toast_38412_index
+ 38420 |            |             0 |       38420 | pg_toast_38412
+ 38639 |            |             0 |       38639 | old_oids
+ 38667 |            |             0 |       38667 | pg_toast_38664
...

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/alter_table.out /tmp/cirrus-ci-build/src/test/regress/results/al...
--- /tmp/cirrus-ci-build/src/test/regress/expected/alter_table.out	2024-05-03 06:45:40.773385309 +0000
+++ /tmp/cirrus-ci-build/src/test/regress/results/alter_table.out	2024-05-03 06:48:06.273358616 +0000
@@ -3476,9 +3476,20 @@
 WHERE relkind IN ('r', 'i', 'S', 't', 'm') AND mapped_oid IS DISTINCT FROM oid;
 SELECT m.* FROM filenode_mapping m LEFT JOIN pg_class c ON c.oid = m.oid
 WHERE c.oid IS NOT NULL OR m.mapped_oid IS NOT NULL;
- oid | mapped_oid | reltablespace | relfilenode | relname 
------+------------+---------------+-------------+---------
-(0 rows)
+  oid  | mapped_oid | reltablespace | relfilenode |       relname        
+-------+------------+---------------+-------------+----------------------
+ 37970 |            |             0 |       37970 | pktable_pkey
+ 37967 |            |             0 |       37967 | pktable
+ 37972 |            |             0 |       37972 | fktable
+ 38476 |            |             0 |       38481 | foo
+ 38485 |            |             0 |       38485 | pg_toast_38476_index
+ 38484 |            |             0 |       38484 | pg_toast_38476
+ 38685 |            |             0 |       38685 | old_oids
+ 38702 |            |             0 |       38702 | pg_toast_38699
...

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/alter_table.out /tmp/cirrus-ci-build/build/testrun/pg_upgrade/00...
--- /tmp/cirrus-ci-build/src/test/regress/expected/alter_table.out	2024-05-03 06:45:41.361178110 +0000
+++ /tmp/cirrus-ci-build/build/testrun/pg_upgrade/002_pg_upgrade/data/results/alter_table.out	2024-05-03 06:47:51.709161...
@@ -3476,9 +3476,29 @@
 WHERE relkind IN ('r', 'i', 'S', 't', 'm') AND mapped_oid IS DISTINCT FROM oid;
 SELECT m.* FROM filenode_mapping m LEFT JOIN pg_class c ON c.oid = m.oid
 WHERE c.oid IS NOT NULL OR m.mapped_oid IS NOT NULL;
- oid | mapped_oid | reltablespace | relfilenode | relname 
------+------------+---------------+-------------+---------
-(0 rows)
+  oid  | mapped_oid | reltablespace | relfilenode |       relname        
+-------+------------+---------------+-------------+----------------------
+ 37986 |            |             0 |       37986 | users_id_seq
+ 37992 |            |             0 |       37992 | pg_toast_37987
+ 37993 |            |             0 |       37993 | pg_toast_37987_index
+ 37987 |            |             0 |       37987 | users
+ 38217 |            |             0 |       38217 | foo
+ 38567 |            |             0 |       38567 | forc_test
+ 38994 |            |             0 |       38994 | pg_toast_38991
+ 38995 |            |             0 |       38995 | pg_toast_38991_index
...

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/alter_table.out /tmp/cirrus-ci-build/build/testrun/recovery/027_...
--- /tmp/cirrus-ci-build/src/test/regress/expected/alter_table.out	2024-05-03 06:45:41.361178110 +0000
+++ /tmp/cirrus-ci-build/build/testrun/recovery/027_stream_regress/data/results/alter_table.out	2024-05-03 06:48:19.0451...
@@ -3476,9 +3476,29 @@
 WHERE relkind IN ('r', 'i', 'S', 't', 'm') AND mapped_oid IS DISTINCT FROM oid;
 SELECT m.* FROM filenode_mapping m LEFT JOIN pg_class c ON c.oid = m.oid
 WHERE c.oid IS NOT NULL OR m.mapped_oid IS NOT NULL;
- oid | mapped_oid | reltablespace | relfilenode | relname 
------+------------+---------------+-------------+---------
-(0 rows)
+  oid  | mapped_oid | reltablespace | relfilenode |       relname        
+-------+------------+---------------+-------------+----------------------
+ 37975 |            |             0 |       37975 | users_id_seq
+ 37985 |            |             0 |       37985 | pg_toast_37979
+ 37986 |            |             0 |       37986 | pg_toast_37979_index
+ 37979 |            |             0 |       37979 | users
+ 38316 |            |             0 |       38316 | foo
+ 38522 |            |             0 |       38522 | forc_test
+ 38940 |            |             0 |       38940 | pg_toast_38937
+ 38941 |            |             0 |       38941 | pg_toast_38937_index
...

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/alter_table.out /tmp/cirrus-ci-build/build/testrun/regress/regre...
--- /tmp/cirrus-ci-build/src/test/regress/expected/alter_table.out	2024-05-03 06:45:41.361178110 +0000
+++ /tmp/cirrus-ci-build/build/testrun/regress/regress/results/alter_table.out	2024-05-03 06:47:47.329166399 +0000
@@ -3476,9 +3476,29 @@
 WHERE relkind IN ('r', 'i', 'S', 't', 'm') AND mapped_oid IS DISTINCT FROM oid;
 SELECT m.* FROM filenode_mapping m LEFT JOIN pg_class c ON c.oid = m.oid
 WHERE c.oid IS NOT NULL OR m.mapped_oid IS NOT NULL;
- oid | mapped_oid | reltablespace | relfilenode | relname 
------+------------+---------------+-------------+---------
-(0 rows)
+  oid  | mapped_oid | reltablespace | relfilenode |       relname        
+-------+------------+---------------+-------------+----------------------
+ 37982 |            |             0 |       37982 | pg_toast_37976_index
+ 37976 |            |             0 |       37976 | users
+ 38202 |            |             0 |       38202 | foo
+ 37975 |            |             0 |       37975 | users_id_seq
+ 37981 |            |             0 |       37981 | pg_toast_37976
+ 38518 |            |             0 |       38518 | forc_test
+ 38916 |            |             0 |       38916 | pg_toast_38913
+ 38917 |            |             0 |       38917 | pg_toast_38913_index
...

diff -w -U3 C:/cirrus/src/test/regress/expected/alter_table.out C:/cirrus/build/testrun/pg_upgrade/002_pg_upgrade/data/r...
--- C:/cirrus/src/test/regress/expected/alter_table.out	2024-05-03 06:46:03.610184300 +0000
+++ C:/cirrus/build/testrun/pg_upgrade/002_pg_upgrade/data/results/alter_table.out	2024-05-03 06:49:55.473103200 +0000
@@ -3477,8 +3477,19 @@
 SELECT m.* FROM filenode_mapping m LEFT JOIN pg_class c ON c.oid = m.oid
 WHERE c.oid IS NOT NULL OR m.mapped_oid IS NOT NULL;
  oid | mapped_oid | reltablespace | relfilenode | relname 
------+------------+---------------+-------------+---------
-(0 rows)
+-------+------------+---------------+-------------+----------------------
+ 37391 |            |             0 |       37391 | pktable_pkey
+ 37386 |            |             0 |       37386 | pktable
+ 37399 |            |             0 |       37399 | fktable
+ 37975 |            |             0 |       37980 | foo
+ 37984 |            |             0 |       37984 | pg_toast_37975_index
+ 37983 |            |             0 |       37983 | pg_toast_37975
+ 38212 |            |             0 |       38212 | old_oids
+ 38229 |            |             0 |       38229 | pg_toast_38226
+ 38230 |            |             0 |       38230 | pg_toast_38226_index
+ 38226 |            |             0 |       38226 | recur2
...

diff -w -U3 C:/cirrus/src/test/regress/expected/alter_table.out C:/cirrus/build/testrun/recovery/027_stream_regress/data...
--- C:/cirrus/src/test/regress/expected/alter_table.out	2024-05-03 06:46:03.610184300 +0000
+++ C:/cirrus/build/testrun/recovery/027_stream_regress/data/results/alter_table.out	2024-05-03 06:52:02.806131500 +0000
@@ -3477,8 +3477,19 @@
 SELECT m.* FROM filenode_mapping m LEFT JOIN pg_class c ON c.oid = m.oid
 WHERE c.oid IS NOT NULL OR m.mapped_oid IS NOT NULL;
  oid | mapped_oid | reltablespace | relfilenode | relname 
------+------------+---------------+-------------+---------
-(0 rows)
+-------+------------+---------------+-------------+----------------------
+ 37302 |            |             0 |       37302 | pktable
+ 37327 |            |             0 |       37327 | fktable
+ 37316 |            |             0 |       37316 | pktable_pkey
+ 38126 |            |             0 |       38136 | foo
+ 38140 |            |             0 |       38140 | pg_toast_38126_index
+ 38139 |            |             0 |       38139 | pg_toast_38126
+ 38363 |            |             0 |       38363 | old_oids
+ 38380 |            |             0 |       38380 | pg_toast_38377
+ 38381 |            |             0 |       38381 | pg_toast_38377_index
+ 38377 |            |             0 |       38377 | recur2
...

diff -w -U3 C:/cirrus/src/test/regress/expected/alter_table.out C:/cirrus/build/testrun/regress/regress/results/alter_ta...
--- C:/cirrus/src/test/regress/expected/alter_table.out	2024-05-03 06:46:03.610184300 +0000
+++ C:/cirrus/build/testrun/regress/regress/results/alter_table.out	2024-05-03 06:49:42.743151300 +0000
@@ -3477,8 +3477,19 @@
 SELECT m.* FROM filenode_mapping m LEFT JOIN pg_class c ON c.oid = m.oid
 WHERE c.oid IS NOT NULL OR m.mapped_oid IS NOT NULL;
  oid | mapped_oid | reltablespace | relfilenode | relname 
------+------------+---------------+-------------+---------
-(0 rows)
+-------+------------+---------------+-------------+----------------------
+ 37205 |            |             0 |       37205 | pktable_pkey
+ 37202 |            |             0 |       37202 | pktable
+ 37207 |            |             0 |       37207 | fktable
+ 38066 |            |             0 |       38071 | foo
+ 38075 |            |             0 |       38075 | pg_toast_38066_index
+ 38074 |            |             0 |       38074 | pg_toast_38066
+ 38333 |            |             0 |       38333 | pg_toast_38330
+ 38334 |            |             0 |       38334 | pg_toast_38330_index
+ 38330 |            |             0 |       38330 | recur2
+ 38324 |            |             0 |       38324 | recur1
...

diff -U3 /Users/admin/pgsql/src/test/regress/expected/alter_table.out /Users/admin/pgsql/build/testrun/pg_upgrade/002_pg...
--- /Users/admin/pgsql/src/test/regress/expected/alter_table.out	2024-05-03 06:45:37
+++ /Users/admin/pgsql/build/testrun/pg_upgrade/002_pg_upgrade/data/results/alter_table.out	2024-05-03 06:47:56
@@ -3476,9 +3476,20 @@
 WHERE relkind IN ('r', 'i', 'S', 't', 'm') AND mapped_oid IS DISTINCT FROM oid;
 SELECT m.* FROM filenode_mapping m LEFT JOIN pg_class c ON c.oid = m.oid
 WHERE c.oid IS NOT NULL OR m.mapped_oid IS NOT NULL;
- oid | mapped_oid | reltablespace | relfilenode | relname 
------+------------+---------------+-------------+---------
-(0 rows)
+  oid  | mapped_oid | reltablespace | relfilenode |       relname        
+-------+------------+---------------+-------------+----------------------
+ 37819 |            |             0 |       37819 | pktable_pkey
+ 37816 |            |             0 |       37816 | pktable
+ 37821 |            |             0 |       37821 | fktable
+ 38397 |            |             0 |       38402 | foo
+ 38406 |            |             0 |       38406 | pg_toast_38397_index
+ 38405 |            |             0 |       38405 | pg_toast_38397
+ 38709 |            |             0 |       38709 | old_oids
+ 38726 |            |             0 |       38726 | pg_toast_38723
...

diff -U3 /Users/admin/pgsql/src/test/regress/expected/alter_table.out /Users/admin/pgsql/build/testrun/recovery/027_stre...
--- /Users/admin/pgsql/src/test/regress/expected/alter_table.out	2024-05-03 06:45:37
+++ /Users/admin/pgsql/build/testrun/recovery/027_stream_regress/data/results/alter_table.out	2024-05-03 06:49:38
@@ -3476,9 +3476,20 @@
 WHERE relkind IN ('r', 'i', 'S', 't', 'm') AND mapped_oid IS DISTINCT FROM oid;
 SELECT m.* FROM filenode_mapping m LEFT JOIN pg_class c ON c.oid = m.oid
 WHERE c.oid IS NOT NULL OR m.mapped_oid IS NOT NULL;
- oid | mapped_oid | reltablespace | relfilenode | relname 
------+------------+---------------+-------------+---------
-(0 rows)
+  oid  | mapped_oid | reltablespace | relfilenode |       relname        
+-------+------------+---------------+-------------+----------------------
+ 37642 |            |             0 |       37642 | pktable_pkey
+ 37639 |            |             0 |       37639 | pktable
+ 37644 |            |             0 |       37644 | fktable
+ 38327 |            |             0 |       38333 | foo
+ 38337 |            |             0 |       38337 | pg_toast_38327_index
+ 38336 |            |             0 |       38336 | pg_toast_38327
+ 38561 |            |             0 |       38561 | old_oids
+ 38600 |            |             0 |       38600 | pg_toast_38595
...

diff -U3 /Users/admin/pgsql/src/test/regress/expected/alter_table.out /Users/admin/pgsql/build/testrun/regress/regress/r...
--- /Users/admin/pgsql/src/test/regress/expected/alter_table.out	2024-05-03 06:45:37
+++ /Users/admin/pgsql/build/testrun/regress/regress/results/alter_table.out	2024-05-03 06:47:54
@@ -3476,9 +3476,20 @@
 WHERE relkind IN ('r', 'i', 'S', 't', 'm') AND mapped_oid IS DISTINCT FROM oid;
 SELECT m.* FROM filenode_mapping m LEFT JOIN pg_class c ON c.oid = m.oid
 WHERE c.oid IS NOT NULL OR m.mapped_oid IS NOT NULL;
- oid | mapped_oid | reltablespace | relfilenode | relname 
------+------------+---------------+-------------+---------
-(0 rows)
+  oid  | mapped_oid | reltablespace | relfilenode |       relname        
+-------+------------+---------------+-------------+----------------------
+ 37732 |            |             0 |       37732 | pktable_pkey
+ 37729 |            |             0 |       37729 | pktable
+ 37735 |            |             0 |       37735 | fktable
+ 38465 |            |             0 |       38465 | pg_toast_38456_index
+ 38464 |            |             0 |       38464 | pg_toast_38456
+ 38456 |            |             0 |       38461 | foo
+ 38688 |            |             0 |       38688 | old_oids
+ 38705 |            |             0 |       38705 | pg_toast_38702
...

diff -U3 /tmp/cirrus-ci-build/contrib/btree_gist/expected/without_overlaps.out /tmp/cirrus-ci-build/build/testrun/btree_...
--- /tmp/cirrus-ci-build/contrib/btree_gist/expected/without_overlaps.out	2024-05-02 14:50:56.118636000 +0000
+++ /tmp/cirrus-ci-build/build/testrun/btree_gist/regress/results/without_overlaps.out	2024-05-02 14:53:20.594504000 +00...
@@ -16,6 +16,8 @@
  valid_at | daterange |           | not null | 
 Indexes:
     "temporal_rng_pk" PRIMARY KEY (id, valid_at WITHOUT OVERLAPS)
+Check constraints:
+    "valid_at_not_empty" CHECK (NOT isempty(valid_at))
 
 SELECT pg_get_constraintdef(oid) FROM pg_constraint WHERE conname = 'temporal_rng_pk';
             pg_get_constraintdef             
@@ -60,6 +62,8 @@
  parent_id | integer   |           |          | 
 Indexes:
     "temporal_fk_rng2rng_pk" PRIMARY KEY (id, valid_at WITHOUT OVERLAPS)
+Check constraints:
+    "valid_at_not_empty" CHECK (NOT isempty(valid_at))
 Foreign-key constraints:
     "temporal_fk_rng2rng_fk" FOREIGN KEY (parent_id, PERIOD valid_at) REFERENCES temporal_rng(id, PERIOD valid_at)
...

diff -U3 /tmp/cirrus-ci-build/contrib/btree_gist/expected/without_overlaps.out /tmp/cirrus-ci-build/contrib/btree_gist/r...
--- /tmp/cirrus-ci-build/contrib/btree_gist/expected/without_overlaps.out	2024-05-02 14:50:47.072341588 +0000
+++ /tmp/cirrus-ci-build/contrib/btree_gist/results/without_overlaps.out	2024-05-02 14:54:15.696169329 +0000
@@ -16,6 +16,8 @@
  valid_at | daterange |           | not null | 
 Indexes:
     "temporal_rng_pk" PRIMARY KEY (id, valid_at WITHOUT OVERLAPS)
+Check constraints:
+    "valid_at_not_empty" CHECK (NOT isempty(valid_at))
 
 SELECT pg_get_constraintdef(oid) FROM pg_constraint WHERE conname = 'temporal_rng_pk';
             pg_get_constraintdef             
@@ -60,6 +62,8 @@
  parent_id | integer   |           |          | 
 Indexes:
     "temporal_fk_rng2rng_pk" PRIMARY KEY (id, valid_at WITHOUT OVERLAPS)
+Check constraints:
+    "valid_at_not_empty" CHECK (NOT isempty(valid_at))
 Foreign-key constraints:
     "temporal_fk_rng2rng_fk" FOREIGN KEY (parent_id, PERIOD valid_at) REFERENCES temporal_rng(id, PERIOD valid_at)
...

diff -U3 /tmp/cirrus-ci-build/contrib/btree_gist/expected/without_overlaps.out /tmp/cirrus-ci-build/build/testrun/btree_...
--- /tmp/cirrus-ci-build/contrib/btree_gist/expected/without_overlaps.out	2024-05-02 14:51:02.643057761 +0000
+++ /tmp/cirrus-ci-build/build/testrun/btree_gist/regress/results/without_overlaps.out	2024-05-02 14:55:15.134893733 +00...
@@ -16,6 +16,8 @@
  valid_at | daterange |           | not null | 
 Indexes:
     "temporal_rng_pk" PRIMARY KEY (id, valid_at WITHOUT OVERLAPS)
+Check constraints:
+    "valid_at_not_empty" CHECK (NOT isempty(valid_at))
 
 SELECT pg_get_constraintdef(oid) FROM pg_constraint WHERE conname = 'temporal_rng_pk';
             pg_get_constraintdef             
@@ -60,6 +62,8 @@
  parent_id | integer   |           |          | 
 Indexes:
     "temporal_fk_rng2rng_pk" PRIMARY KEY (id, valid_at WITHOUT OVERLAPS)
+Check constraints:
+    "valid_at_not_empty" CHECK (NOT isempty(valid_at))
 Foreign-key constraints:
     "temporal_fk_rng2rng_fk" FOREIGN KEY (parent_id, PERIOD valid_at) REFERENCES temporal_rng(id, PERIOD valid_at)
...

diff -w -U3 C:/cirrus/contrib/btree_gist/expected/without_overlaps.out C:/cirrus/build/testrun/btree_gist/regress/result...
--- C:/cirrus/contrib/btree_gist/expected/without_overlaps.out	2024-05-02 14:51:07.421909200 +0000
+++ C:/cirrus/build/testrun/btree_gist/regress/results/without_overlaps.out	2024-05-02 14:57:14.017885600 +0000
@@ -16,6 +16,8 @@
  valid_at | daterange |           | not null | 
 Indexes:
     "temporal_rng_pk" PRIMARY KEY (id, valid_at WITHOUT OVERLAPS)
+Check constraints:
+    "valid_at_not_empty" CHECK (NOT isempty(valid_at))
 
 SELECT pg_get_constraintdef(oid) FROM pg_constraint WHERE conname = 'temporal_rng_pk';
             pg_get_constraintdef             
@@ -60,6 +62,8 @@
  parent_id | integer   |           |          | 
 Indexes:
     "temporal_fk_rng2rng_pk" PRIMARY KEY (id, valid_at WITHOUT OVERLAPS)
+Check constraints:
+    "valid_at_not_empty" CHECK (NOT isempty(valid_at))
 Foreign-key constraints:
     "temporal_fk_rng2rng_fk" FOREIGN KEY (parent_id, PERIOD valid_at) REFERENCES temporal_rng(id, PERIOD valid_at)
...

diff -U3 /Users/admin/pgsql/contrib/btree_gist/expected/without_overlaps.out /Users/admin/pgsql/build/testrun/btree_gist...
--- /Users/admin/pgsql/contrib/btree_gist/expected/without_overlaps.out	2024-05-02 14:50:15
+++ /Users/admin/pgsql/build/testrun/btree_gist/regress/results/without_overlaps.out	2024-05-02 14:53:30
@@ -16,6 +16,8 @@
  valid_at | daterange |           | not null | 
 Indexes:
     "temporal_rng_pk" PRIMARY KEY (id, valid_at WITHOUT OVERLAPS)
+Check constraints:
+    "valid_at_not_empty" CHECK (NOT isempty(valid_at))
 
 SELECT pg_get_constraintdef(oid) FROM pg_constraint WHERE conname = 'temporal_rng_pk';
             pg_get_constraintdef             
@@ -60,6 +62,8 @@
  parent_id | integer   |           |          | 
 Indexes:
     "temporal_fk_rng2rng_pk" PRIMARY KEY (id, valid_at WITHOUT OVERLAPS)
+Check constraints:
+    "valid_at_not_empty" CHECK (NOT isempty(valid_at))
 Foreign-key constraints:
     "temporal_fk_rng2rng_fk" FOREIGN KEY (parent_id, PERIOD valid_at) REFERENCES temporal_rng(id, PERIOD valid_at)
...

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/sysviews.out /tmp/cirrus-ci-build/build/testrun/pg_upgrade/002_p...
--- /tmp/cirrus-ci-build/src/test/regress/expected/sysviews.out	2024-05-02 13:06:14.770502000 +0000
+++ /tmp/cirrus-ci-build/build/testrun/pg_upgrade/002_pg_upgrade/data/results/sysviews.out	2024-05-02 13:07:52.215687000...
@@ -157,7 +157,8 @@
  enable_seqscan                 | on
  enable_sort                    | on
  enable_tidscan                 | on
-(23 rows)
+ enable_toast_cache             | off
+(24 rows)
 
 -- There are always wait event descriptions for various types.
 select type, count(*) > 0 as ok FROM pg_wait_events

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/sysviews.out /tmp/cirrus-ci-build/build/testrun/recovery/027_str...
--- /tmp/cirrus-ci-build/src/test/regress/expected/sysviews.out	2024-05-02 13:06:14.770502000 +0000
+++ /tmp/cirrus-ci-build/build/testrun/recovery/027_stream_regress/data/results/sysviews.out	2024-05-02 13:08:25.2784890...
@@ -157,7 +157,8 @@
  enable_seqscan                 | on
  enable_sort                    | on
  enable_tidscan                 | on
-(23 rows)
+ enable_toast_cache             | off
+(24 rows)
 
 -- There are always wait event descriptions for various types.
 select type, count(*) > 0 as ok FROM pg_wait_events

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/sysviews.out /tmp/cirrus-ci-build/build/testrun/regress/regress/...
--- /tmp/cirrus-ci-build/src/test/regress/expected/sysviews.out	2024-05-02 13:06:14.770502000 +0000
+++ /tmp/cirrus-ci-build/build/testrun/regress/regress/results/sysviews.out	2024-05-02 13:07:49.426469000 +0000
@@ -157,7 +157,8 @@
  enable_seqscan                 | on
  enable_sort                    | on
  enable_tidscan                 | on
-(23 rows)
+ enable_toast_cache             | off
+(24 rows)
 
 -- There are always wait event descriptions for various types.
 select type, count(*) > 0 as ok FROM pg_wait_events

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/sysviews.out /tmp/cirrus-ci-build/src/bin/pg_upgrade/tmp_check/r...
--- /tmp/cirrus-ci-build/src/test/regress/expected/sysviews.out	2024-05-02 13:06:10.687394965 +0000
+++ /tmp/cirrus-ci-build/src/bin/pg_upgrade/tmp_check/results/sysviews.out	2024-05-02 13:10:49.547374843 +0000
@@ -157,7 +157,8 @@
  enable_seqscan                 | on
  enable_sort                    | on
  enable_tidscan                 | on
-(23 rows)
+ enable_toast_cache             | off
+(24 rows)
 
 -- There are always wait event descriptions for various types.
 select type, count(*) > 0 as ok FROM pg_wait_events

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/sysviews.out /tmp/cirrus-ci-build/src/test/regress/results/sysvi...
--- /tmp/cirrus-ci-build/src/test/regress/expected/sysviews.out	2024-05-02 13:06:10.687394965 +0000
+++ /tmp/cirrus-ci-build/src/test/regress/results/sysviews.out	2024-05-02 13:09:25.915392474 +0000
@@ -157,7 +157,8 @@
  enable_seqscan                 | on
  enable_sort                    | on
  enable_tidscan                 | on
-(23 rows)
+ enable_toast_cache             | off
+(24 rows)
 
 -- There are always wait event descriptions for various types.
 select type, count(*) > 0 as ok FROM pg_wait_events

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/sysviews.out /tmp/cirrus-ci-build/build/testrun/pg_upgrade/002_p...
--- /tmp/cirrus-ci-build/src/test/regress/expected/sysviews.out	2024-05-02 13:06:06.556345535 +0000
+++ /tmp/cirrus-ci-build/build/testrun/pg_upgrade/002_pg_upgrade/data/results/sysviews.out	2024-05-02 13:09:46.040169772...
@@ -157,7 +157,8 @@
  enable_seqscan                 | on
  enable_sort                    | on
  enable_tidscan                 | on
-(23 rows)
+ enable_toast_cache             | off
+(24 rows)
 
 -- There are always wait event descriptions for various types.
 select type, count(*) > 0 as ok FROM pg_wait_events

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/sysviews.out /tmp/cirrus-ci-build/build/testrun/recovery/027_str...
--- /tmp/cirrus-ci-build/src/test/regress/expected/sysviews.out	2024-05-02 13:06:06.556345535 +0000
+++ /tmp/cirrus-ci-build/build/testrun/recovery/027_stream_regress/data/results/sysviews.out	2024-05-02 13:10:23.1801270...
@@ -157,7 +157,8 @@
  enable_seqscan                 | on
  enable_sort                    | on
  enable_tidscan                 | on
-(23 rows)
+ enable_toast_cache             | off
+(24 rows)
 
 -- There are always wait event descriptions for various types.
 select type, count(*) > 0 as ok FROM pg_wait_events

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/sysviews.out /tmp/cirrus-ci-build/build/testrun/regress/regress/...
--- /tmp/cirrus-ci-build/src/test/regress/expected/sysviews.out	2024-05-02 13:06:06.556345535 +0000
+++ /tmp/cirrus-ci-build/build/testrun/regress/regress/results/sysviews.out	2024-05-02 13:09:44.068172003 +0000
@@ -157,7 +157,8 @@
  enable_seqscan                 | on
  enable_sort                    | on
  enable_tidscan                 | on
-(23 rows)
+ enable_toast_cache             | off
+(24 rows)
 
 -- There are always wait event descriptions for various types.
 select type, count(*) > 0 as ok FROM pg_wait_events

diff -w -U3 C:/cirrus/src/test/regress/expected/sysviews.out C:/cirrus/build/testrun/pg_upgrade/002_pg_upgrade/data/resu...
--- C:/cirrus/src/test/regress/expected/sysviews.out	2024-05-02 13:06:25.025111900 +0000
+++ C:/cirrus/build/testrun/pg_upgrade/002_pg_upgrade/data/results/sysviews.out	2024-05-02 13:09:34.338549500 +0000
@@ -157,7 +157,8 @@
  enable_seqscan                 | on
  enable_sort                    | on
  enable_tidscan                 | on
-(23 rows)
+ enable_toast_cache             | off
+(24 rows)
 
 -- There are always wait event descriptions for various types.
 select type, count(*) > 0 as ok FROM pg_wait_events

diff -w -U3 C:/cirrus/src/test/regress/expected/sysviews.out C:/cirrus/build/testrun/recovery/027_stream_regress/data/re...
--- C:/cirrus/src/test/regress/expected/sysviews.out	2024-05-02 13:06:25.025111900 +0000
+++ C:/cirrus/build/testrun/recovery/027_stream_regress/data/results/sysviews.out	2024-05-02 13:11:38.675422700 +0000
@@ -157,7 +157,8 @@
  enable_seqscan                 | on
  enable_sort                    | on
  enable_tidscan                 | on
-(23 rows)
+ enable_toast_cache             | off
+(24 rows)
 
 -- There are always wait event descriptions for various types.
 select type, count(*) > 0 as ok FROM pg_wait_events

diff -w -U3 C:/cirrus/src/test/regress/expected/sysviews.out C:/cirrus/build/testrun/regress/regress/results/sysviews.ou...
--- C:/cirrus/src/test/regress/expected/sysviews.out	2024-05-02 13:06:25.025111900 +0000
+++ C:/cirrus/build/testrun/regress/regress/results/sysviews.out	2024-05-02 13:09:30.100755100 +0000
@@ -157,7 +157,8 @@
  enable_seqscan                 | on
  enable_sort                    | on
  enable_tidscan                 | on
-(23 rows)
+ enable_toast_cache             | off
+(24 rows)
 
 -- There are always wait event descriptions for various types.
 select type, count(*) > 0 as ok FROM pg_wait_events

diff -U3 /Users/admin/pgsql/src/test/regress/expected/sysviews.out /Users/admin/pgsql/build/testrun/pg_upgrade/002_pg_up...
--- /Users/admin/pgsql/src/test/regress/expected/sysviews.out	2024-05-02 13:06:00
+++ /Users/admin/pgsql/build/testrun/pg_upgrade/002_pg_upgrade/data/results/sysviews.out	2024-05-02 13:08:51
@@ -157,7 +157,8 @@
  enable_seqscan                 | on
  enable_sort                    | on
  enable_tidscan                 | on
-(23 rows)
+ enable_toast_cache             | off
+(24 rows)
 
 -- There are always wait event descriptions for various types.
 select type, count(*) > 0 as ok FROM pg_wait_events

diff -U3 /Users/admin/pgsql/src/test/regress/expected/sysviews.out /Users/admin/pgsql/build/testrun/recovery/027_stream_...
--- /Users/admin/pgsql/src/test/regress/expected/sysviews.out	2024-05-02 13:06:00
+++ /Users/admin/pgsql/build/testrun/recovery/027_stream_regress/data/results/sysviews.out	2024-05-02 13:09:32
@@ -157,7 +157,8 @@
  enable_seqscan                 | on
  enable_sort                    | on
  enable_tidscan                 | on
-(23 rows)
+ enable_toast_cache             | off
+(24 rows)
 
 -- There are always wait event descriptions for various types.
 select type, count(*) > 0 as ok FROM pg_wait_events

diff -U3 /Users/admin/pgsql/src/test/regress/expected/sysviews.out /Users/admin/pgsql/build/testrun/regress/regress/resu...
--- /Users/admin/pgsql/src/test/regress/expected/sysviews.out	2024-05-02 13:06:00
+++ /Users/admin/pgsql/build/testrun/regress/regress/results/sysviews.out	2024-05-02 13:08:51
@@ -157,7 +157,8 @@
  enable_seqscan                 | on
  enable_sort                    | on
  enable_tidscan                 | on
-(23 rows)
+ enable_toast_cache             | off
+(24 rows)
 
 -- There are always wait event descriptions for various types.
 select type, count(*) > 0 as ok FROM pg_wait_events

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/create_index.out /tmp/cirrus-ci-build/build/testrun/pg_upgrade/0...
--- /tmp/cirrus-ci-build/src/test/regress/expected/create_index.out	2024-05-02 08:35:05.677693000 +0000
+++ /tmp/cirrus-ci-build/build/testrun/pg_upgrade/002_pg_upgrade/data/results/create_index.out	2024-05-02 08:36:08.85037...
@@ -2135,11 +2135,19 @@
 --
 explain (costs off)
 SELECT unique1 FROM tenk1 WHERE unique1 IN (1, 42, 7) and unique1 = ANY('{7, 8, 9}');
-                                             QUERY PLAN                                             
-----------------------------------------------------------------------------------------------------
- Index Only Scan using tenk1_unique1 on tenk1
-   Index Cond: ((unique1 = ANY ('{1,42,7}'::integer[])) AND (unique1 = ANY ('{7,8,9}'::integer[])))
-(2 rows)
+                            QUERY PLAN                             
+-------------------------------------------------------------------
+ Bitmap Heap Scan on tenk1
+   Recheck Cond: ((unique1 = 7) OR (unique1 = 8) OR (unique1 = 9))
+   Filter: (unique1 = ANY ('{1,42,7}'::integer[]))
+   ->  BitmapOr
+         ->  Bitmap Index Scan on tenk1_unique1
+               Index Cond: (unique1 = 7)
...

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/create_index.out /tmp/cirrus-ci-build/build/testrun/recovery/027...
--- /tmp/cirrus-ci-build/src/test/regress/expected/create_index.out	2024-05-02 08:35:05.677693000 +0000
+++ /tmp/cirrus-ci-build/build/testrun/recovery/027_stream_regress/data/results/create_index.out	2024-05-02 08:36:34.535...
@@ -2135,11 +2135,19 @@
 --
 explain (costs off)
 SELECT unique1 FROM tenk1 WHERE unique1 IN (1, 42, 7) and unique1 = ANY('{7, 8, 9}');
-                                             QUERY PLAN                                             
-----------------------------------------------------------------------------------------------------
- Index Only Scan using tenk1_unique1 on tenk1
-   Index Cond: ((unique1 = ANY ('{1,42,7}'::integer[])) AND (unique1 = ANY ('{7,8,9}'::integer[])))
-(2 rows)
+                            QUERY PLAN                             
+-------------------------------------------------------------------
+ Bitmap Heap Scan on tenk1
+   Recheck Cond: ((unique1 = 7) OR (unique1 = 8) OR (unique1 = 9))
+   Filter: (unique1 = ANY ('{1,42,7}'::integer[]))
+   ->  BitmapOr
+         ->  Bitmap Index Scan on tenk1_unique1
+               Index Cond: (unique1 = 7)
...

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/create_index.out /tmp/cirrus-ci-build/build/testrun/regress/regr...
--- /tmp/cirrus-ci-build/src/test/regress/expected/create_index.out	2024-05-02 08:35:05.677693000 +0000
+++ /tmp/cirrus-ci-build/build/testrun/regress/regress/results/create_index.out	2024-05-02 08:36:05.993128000 +0000
@@ -2135,11 +2135,19 @@
 --
 explain (costs off)
 SELECT unique1 FROM tenk1 WHERE unique1 IN (1, 42, 7) and unique1 = ANY('{7, 8, 9}');
-                                             QUERY PLAN                                             
-----------------------------------------------------------------------------------------------------
- Index Only Scan using tenk1_unique1 on tenk1
-   Index Cond: ((unique1 = ANY ('{1,42,7}'::integer[])) AND (unique1 = ANY ('{7,8,9}'::integer[])))
-(2 rows)
+                            QUERY PLAN                             
+-------------------------------------------------------------------
+ Bitmap Heap Scan on tenk1
+   Recheck Cond: ((unique1 = 7) OR (unique1 = 8) OR (unique1 = 9))
+   Filter: (unique1 = ANY ('{1,42,7}'::integer[]))
+   ->  BitmapOr
+         ->  Bitmap Index Scan on tenk1_unique1
+               Index Cond: (unique1 = 7)
...

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/create_index.out /tmp/cirrus-ci-build/src/bin/pg_upgrade/tmp_che...
--- /tmp/cirrus-ci-build/src/test/regress/expected/create_index.out	2024-05-02 08:35:00.517933986 +0000
+++ /tmp/cirrus-ci-build/src/bin/pg_upgrade/tmp_check/results/create_index.out	2024-05-02 08:38:42.893726035 +0000
@@ -2135,11 +2135,19 @@
 --
 explain (costs off)
 SELECT unique1 FROM tenk1 WHERE unique1 IN (1, 42, 7) and unique1 = ANY('{7, 8, 9}');
-                                             QUERY PLAN                                             
-----------------------------------------------------------------------------------------------------
- Index Only Scan using tenk1_unique1 on tenk1
-   Index Cond: ((unique1 = ANY ('{1,42,7}'::integer[])) AND (unique1 = ANY ('{7,8,9}'::integer[])))
-(2 rows)
+                            QUERY PLAN                             
+-------------------------------------------------------------------
+ Bitmap Heap Scan on tenk1
+   Recheck Cond: ((unique1 = 7) OR (unique1 = 8) OR (unique1 = 9))
+   Filter: (unique1 = ANY ('{1,42,7}'::integer[]))
+   ->  BitmapOr
+         ->  Bitmap Index Scan on tenk1_unique1
+               Index Cond: (unique1 = 7)
...

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/create_index.out /tmp/cirrus-ci-build/src/test/recovery/tmp_chec...
--- /tmp/cirrus-ci-build/src/test/regress/expected/create_index.out	2024-05-02 08:35:00.517933986 +0000
+++ /tmp/cirrus-ci-build/src/test/recovery/tmp_check/results/create_index.out	2024-05-02 08:40:12.065657790 +0000
@@ -2135,11 +2135,19 @@
 --
 explain (costs off)
 SELECT unique1 FROM tenk1 WHERE unique1 IN (1, 42, 7) and unique1 = ANY('{7, 8, 9}');
-                                             QUERY PLAN                                             
-----------------------------------------------------------------------------------------------------
- Index Only Scan using tenk1_unique1 on tenk1
-   Index Cond: ((unique1 = ANY ('{1,42,7}'::integer[])) AND (unique1 = ANY ('{7,8,9}'::integer[])))
-(2 rows)
+                            QUERY PLAN                             
+-------------------------------------------------------------------
+ Bitmap Heap Scan on tenk1
+   Recheck Cond: ((unique1 = 7) OR (unique1 = 8) OR (unique1 = 9))
+   Filter: (unique1 = ANY ('{1,42,7}'::integer[]))
+   ->  BitmapOr
+         ->  Bitmap Index Scan on tenk1_unique1
+               Index Cond: (unique1 = 7)
...

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/create_index.out /tmp/cirrus-ci-build/src/test/regress/results/c...
--- /tmp/cirrus-ci-build/src/test/regress/expected/create_index.out	2024-05-02 08:35:00.517933986 +0000
+++ /tmp/cirrus-ci-build/src/test/regress/results/create_index.out	2024-05-02 08:36:54.393948982 +0000
@@ -2135,11 +2135,19 @@
 --
 explain (costs off)
 SELECT unique1 FROM tenk1 WHERE unique1 IN (1, 42, 7) and unique1 = ANY('{7, 8, 9}');
-                                             QUERY PLAN                                             
-----------------------------------------------------------------------------------------------------
- Index Only Scan using tenk1_unique1 on tenk1
-   Index Cond: ((unique1 = ANY ('{1,42,7}'::integer[])) AND (unique1 = ANY ('{7,8,9}'::integer[])))
-(2 rows)
+                            QUERY PLAN                             
+-------------------------------------------------------------------
+ Bitmap Heap Scan on tenk1
+   Recheck Cond: ((unique1 = 7) OR (unique1 = 8) OR (unique1 = 9))
+   Filter: (unique1 = ANY ('{1,42,7}'::integer[]))
+   ->  BitmapOr
+         ->  Bitmap Index Scan on tenk1_unique1
+               Index Cond: (unique1 = 7)
...

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/create_index.out /tmp/cirrus-ci-build/build/testrun/pg_upgrade/0...
--- /tmp/cirrus-ci-build/src/test/regress/expected/create_index.out	2024-05-02 08:35:00.577866578 +0000
+++ /tmp/cirrus-ci-build/build/testrun/pg_upgrade/002_pg_upgrade/data/results/create_index.out	2024-05-02 08:36:59.89384...
@@ -2135,11 +2135,19 @@
 --
 explain (costs off)
 SELECT unique1 FROM tenk1 WHERE unique1 IN (1, 42, 7) and unique1 = ANY('{7, 8, 9}');
-                                             QUERY PLAN                                             
-----------------------------------------------------------------------------------------------------
- Index Only Scan using tenk1_unique1 on tenk1
-   Index Cond: ((unique1 = ANY ('{1,42,7}'::integer[])) AND (unique1 = ANY ('{7,8,9}'::integer[])))
-(2 rows)
+                            QUERY PLAN                             
+-------------------------------------------------------------------
+ Bitmap Heap Scan on tenk1
+   Recheck Cond: ((unique1 = 7) OR (unique1 = 8) OR (unique1 = 9))
+   Filter: (unique1 = ANY ('{1,42,7}'::integer[]))
+   ->  BitmapOr
+         ->  Bitmap Index Scan on tenk1_unique1
+               Index Cond: (unique1 = 7)
...

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/create_index.out /tmp/cirrus-ci-build/build/testrun/recovery/027...
--- /tmp/cirrus-ci-build/src/test/regress/expected/create_index.out	2024-05-02 08:35:00.577866578 +0000
+++ /tmp/cirrus-ci-build/build/testrun/recovery/027_stream_regress/data/results/create_index.out	2024-05-02 08:37:27.285...
@@ -2135,11 +2135,19 @@
 --
 explain (costs off)
 SELECT unique1 FROM tenk1 WHERE unique1 IN (1, 42, 7) and unique1 = ANY('{7, 8, 9}');
-                                             QUERY PLAN                                             
-----------------------------------------------------------------------------------------------------
- Index Only Scan using tenk1_unique1 on tenk1
-   Index Cond: ((unique1 = ANY ('{1,42,7}'::integer[])) AND (unique1 = ANY ('{7,8,9}'::integer[])))
-(2 rows)
+                            QUERY PLAN                             
+-------------------------------------------------------------------
+ Bitmap Heap Scan on tenk1
+   Recheck Cond: ((unique1 = 7) OR (unique1 = 8) OR (unique1 = 9))
+   Filter: (unique1 = ANY ('{1,42,7}'::integer[]))
+   ->  BitmapOr
+         ->  Bitmap Index Scan on tenk1_unique1
+               Index Cond: (unique1 = 7)
...

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/create_index.out /tmp/cirrus-ci-build/build/testrun/regress/regr...
--- /tmp/cirrus-ci-build/src/test/regress/expected/create_index.out	2024-05-02 08:35:00.577866578 +0000
+++ /tmp/cirrus-ci-build/build/testrun/regress/regress/results/create_index.out	2024-05-02 08:36:56.409842984 +0000
@@ -2135,11 +2135,19 @@
 --
 explain (costs off)
 SELECT unique1 FROM tenk1 WHERE unique1 IN (1, 42, 7) and unique1 = ANY('{7, 8, 9}');
-                                             QUERY PLAN                                             
-----------------------------------------------------------------------------------------------------
- Index Only Scan using tenk1_unique1 on tenk1
-   Index Cond: ((unique1 = ANY ('{1,42,7}'::integer[])) AND (unique1 = ANY ('{7,8,9}'::integer[])))
-(2 rows)
+                            QUERY PLAN                             
+-------------------------------------------------------------------
+ Bitmap Heap Scan on tenk1
+   Recheck Cond: ((unique1 = 7) OR (unique1 = 8) OR (unique1 = 9))
+   Filter: (unique1 = ANY ('{1,42,7}'::integer[]))
+   ->  BitmapOr
+         ->  Bitmap Index Scan on tenk1_unique1
+               Index Cond: (unique1 = 7)
...

diff -w -U3 C:/cirrus/src/test/regress/expected/create_index.out C:/cirrus/build/testrun/pg_upgrade/002_pg_upgrade/data/...
--- C:/cirrus/src/test/regress/expected/create_index.out	2024-05-02 08:35:21.696596400 +0000
+++ C:/cirrus/build/testrun/pg_upgrade/002_pg_upgrade/data/results/create_index.out	2024-05-02 08:37:44.784010300 +0000
@@ -2136,10 +2136,18 @@
 explain (costs off)
 SELECT unique1 FROM tenk1 WHERE unique1 IN (1, 42, 7) and unique1 = ANY('{7, 8, 9}');
                                              QUERY PLAN                                             
-----------------------------------------------------------------------------------------------------
- Index Only Scan using tenk1_unique1 on tenk1
-   Index Cond: ((unique1 = ANY ('{1,42,7}'::integer[])) AND (unique1 = ANY ('{7,8,9}'::integer[])))
-(2 rows)
+-------------------------------------------------------------------
+ Bitmap Heap Scan on tenk1
+   Recheck Cond: ((unique1 = 7) OR (unique1 = 8) OR (unique1 = 9))
+   Filter: (unique1 = ANY ('{1,42,7}'::integer[]))
+   ->  BitmapOr
+         ->  Bitmap Index Scan on tenk1_unique1
+               Index Cond: (unique1 = 7)
+         ->  Bitmap Index Scan on tenk1_unique1
+               Index Cond: (unique1 = 8)
...

diff -w -U3 C:/cirrus/src/test/regress/expected/create_index.out C:/cirrus/build/testrun/recovery/027_stream_regress/dat...
--- C:/cirrus/src/test/regress/expected/create_index.out	2024-05-02 08:35:21.696596400 +0000
+++ C:/cirrus/build/testrun/recovery/027_stream_regress/data/results/create_index.out	2024-05-02 08:39:46.574058900 +000...
@@ -2136,10 +2136,18 @@
 explain (costs off)
 SELECT unique1 FROM tenk1 WHERE unique1 IN (1, 42, 7) and unique1 = ANY('{7, 8, 9}');
                                              QUERY PLAN                                             
-----------------------------------------------------------------------------------------------------
- Index Only Scan using tenk1_unique1 on tenk1
-   Index Cond: ((unique1 = ANY ('{1,42,7}'::integer[])) AND (unique1 = ANY ('{7,8,9}'::integer[])))
-(2 rows)
+-------------------------------------------------------------------
+ Bitmap Heap Scan on tenk1
+   Recheck Cond: ((unique1 = 7) OR (unique1 = 8) OR (unique1 = 9))
+   Filter: (unique1 = ANY ('{1,42,7}'::integer[]))
+   ->  BitmapOr
+         ->  Bitmap Index Scan on tenk1_unique1
+               Index Cond: (unique1 = 7)
+         ->  Bitmap Index Scan on tenk1_unique1
+               Index Cond: (unique1 = 8)
...

diff -w -U3 C:/cirrus/src/test/regress/expected/create_index.out C:/cirrus/build/testrun/regress/regress/results/create_...
--- C:/cirrus/src/test/regress/expected/create_index.out	2024-05-02 08:35:21.696596400 +0000
+++ C:/cirrus/build/testrun/regress/regress/results/create_index.out	2024-05-02 08:37:32.726369300 +0000
@@ -2136,10 +2136,18 @@
 explain (costs off)
 SELECT unique1 FROM tenk1 WHERE unique1 IN (1, 42, 7) and unique1 = ANY('{7, 8, 9}');
                                              QUERY PLAN                                             
-----------------------------------------------------------------------------------------------------
- Index Only Scan using tenk1_unique1 on tenk1
-   Index Cond: ((unique1 = ANY ('{1,42,7}'::integer[])) AND (unique1 = ANY ('{7,8,9}'::integer[])))
-(2 rows)
+-------------------------------------------------------------------
+ Bitmap Heap Scan on tenk1
+   Recheck Cond: ((unique1 = 7) OR (unique1 = 8) OR (unique1 = 9))
+   Filter: (unique1 = ANY ('{1,42,7}'::integer[]))
+   ->  BitmapOr
+         ->  Bitmap Index Scan on tenk1_unique1
+               Index Cond: (unique1 = 7)
+         ->  Bitmap Index Scan on tenk1_unique1
+               Index Cond: (unique1 = 8)
...

diff -U3 /Users/admin/pgsql/src/test/regress/expected/create_index.out /Users/admin/pgsql/build/testrun/pg_upgrade/002_p...
--- /Users/admin/pgsql/src/test/regress/expected/create_index.out	2024-05-02 08:35:03
+++ /Users/admin/pgsql/build/testrun/pg_upgrade/002_pg_upgrade/data/results/create_index.out	2024-05-02 08:39:37
@@ -2135,11 +2135,19 @@
 --
 explain (costs off)
 SELECT unique1 FROM tenk1 WHERE unique1 IN (1, 42, 7) and unique1 = ANY('{7, 8, 9}');
-                                             QUERY PLAN                                             
-----------------------------------------------------------------------------------------------------
- Index Only Scan using tenk1_unique1 on tenk1
-   Index Cond: ((unique1 = ANY ('{1,42,7}'::integer[])) AND (unique1 = ANY ('{7,8,9}'::integer[])))
-(2 rows)
+                            QUERY PLAN                             
+-------------------------------------------------------------------
+ Bitmap Heap Scan on tenk1
+   Recheck Cond: ((unique1 = 7) OR (unique1 = 8) OR (unique1 = 9))
+   Filter: (unique1 = ANY ('{1,42,7}'::integer[]))
+   ->  BitmapOr
+         ->  Bitmap Index Scan on tenk1_unique1
+               Index Cond: (unique1 = 7)
...

diff -U3 /Users/admin/pgsql/src/test/regress/expected/create_index.out /Users/admin/pgsql/build/testrun/recovery/027_str...
--- /Users/admin/pgsql/src/test/regress/expected/create_index.out	2024-05-02 08:35:03
+++ /Users/admin/pgsql/build/testrun/recovery/027_stream_regress/data/results/create_index.out	2024-05-02 08:40:11
@@ -2135,11 +2135,19 @@
 --
 explain (costs off)
 SELECT unique1 FROM tenk1 WHERE unique1 IN (1, 42, 7) and unique1 = ANY('{7, 8, 9}');
-                                             QUERY PLAN                                             
-----------------------------------------------------------------------------------------------------
- Index Only Scan using tenk1_unique1 on tenk1
-   Index Cond: ((unique1 = ANY ('{1,42,7}'::integer[])) AND (unique1 = ANY ('{7,8,9}'::integer[])))
-(2 rows)
+                            QUERY PLAN                             
+-------------------------------------------------------------------
+ Bitmap Heap Scan on tenk1
+   Recheck Cond: ((unique1 = 7) OR (unique1 = 8) OR (unique1 = 9))
+   Filter: (unique1 = ANY ('{1,42,7}'::integer[]))
+   ->  BitmapOr
+         ->  Bitmap Index Scan on tenk1_unique1
+               Index Cond: (unique1 = 7)
...

diff -U3 /Users/admin/pgsql/src/test/regress/expected/create_index.out /Users/admin/pgsql/build/testrun/regress/regress/...
--- /Users/admin/pgsql/src/test/regress/expected/create_index.out	2024-05-02 08:35:03
+++ /Users/admin/pgsql/build/testrun/regress/regress/results/create_index.out	2024-05-02 08:39:34
@@ -2135,11 +2135,19 @@
 --
 explain (costs off)
 SELECT unique1 FROM tenk1 WHERE unique1 IN (1, 42, 7) and unique1 = ANY('{7, 8, 9}');
-                                             QUERY PLAN                                             
-----------------------------------------------------------------------------------------------------
- Index Only Scan using tenk1_unique1 on tenk1
-   Index Cond: ((unique1 = ANY ('{1,42,7}'::integer[])) AND (unique1 = ANY ('{7,8,9}'::integer[])))
-(2 rows)
+                            QUERY PLAN                             
+-------------------------------------------------------------------
+ Bitmap Heap Scan on tenk1
+   Recheck Cond: ((unique1 = 7) OR (unique1 = 8) OR (unique1 = 9))
+   Filter: (unique1 = ANY ('{1,42,7}'::integer[]))
+   ->  BitmapOr
+         ->  Bitmap Index Scan on tenk1_unique1
+               Index Cond: (unique1 = 7)
...

diff -U3 /tmp/cirrus-ci-build/contrib/pg_freespacemap/expected/pg_freespacemap.out /tmp/cirrus-ci-build/build/testrun/pg...
--- /tmp/cirrus-ci-build/contrib/pg_freespacemap/expected/pg_freespacemap.out	2024-05-02 08:29:23.472944000 +0000
+++ /tmp/cirrus-ci-build/build/testrun/pg_freespacemap/regress/results/pg_freespacemap.out	2024-05-02 08:31:18.589916000...
@@ -1,4 +1,5 @@
 CREATE EXTENSION pg_freespacemap;
+ERROR:  extension "pg_freespacemap" has no installation script nor update path for version "1.3"
 CREATE TABLE freespace_tab (c1 int) WITH (autovacuum_enabled = off);
 CREATE INDEX freespace_brin ON freespace_tab USING brin (c1);
 CREATE INDEX freespace_btree ON freespace_tab USING btree (c1);
@@ -8,78 +9,39 @@
   SELECT rel.id, fsm.blkno, (fsm.avail > 0) AS is_avail
     FROM rel, LATERAL pg_freespace(rel.id) AS fsm
     ORDER BY 1, 2;
-       id        | blkno | is_avail 
------------------+-------+----------
- freespace_brin  |     0 | f
- freespace_brin  |     1 | f
- freespace_brin  |     2 | t
- freespace_btree |     0 | f
- freespace_hash  |     0 | f
...

diff -U3 /tmp/cirrus-ci-build/contrib/pg_freespacemap/expected/pg_freespacemap.out /tmp/cirrus-ci-build/build/testrun/pg...
--- /tmp/cirrus-ci-build/contrib/pg_freespacemap/expected/pg_freespacemap.out	2024-05-02 08:28:54.402294685 +0000
+++ /tmp/cirrus-ci-build/build/testrun/pg_freespacemap/regress/results/pg_freespacemap.out	2024-05-02 08:32:11.514285747...
@@ -1,4 +1,5 @@
 CREATE EXTENSION pg_freespacemap;
+ERROR:  extension "pg_freespacemap" has no installation script nor update path for version "1.3"
 CREATE TABLE freespace_tab (c1 int) WITH (autovacuum_enabled = off);
 CREATE INDEX freespace_brin ON freespace_tab USING brin (c1);
 CREATE INDEX freespace_btree ON freespace_tab USING btree (c1);
@@ -8,78 +9,39 @@
   SELECT rel.id, fsm.blkno, (fsm.avail > 0) AS is_avail
     FROM rel, LATERAL pg_freespace(rel.id) AS fsm
     ORDER BY 1, 2;
-       id        | blkno | is_avail 
------------------+-------+----------
- freespace_brin  |     0 | f
- freespace_brin  |     1 | f
- freespace_brin  |     2 | t
- freespace_btree |     0 | f
- freespace_hash  |     0 | f
...

diff -w -U3 C:/cirrus/contrib/pg_freespacemap/expected/pg_freespacemap.out C:/cirrus/build/testrun/pg_freespacemap/regre...
--- C:/cirrus/contrib/pg_freespacemap/expected/pg_freespacemap.out	2024-05-02 08:30:05.035011900 +0000
+++ C:/cirrus/build/testrun/pg_freespacemap/regress/results/pg_freespacemap.out	2024-05-02 08:36:35.522683700 +0000
@@ -1,4 +1,5 @@
 CREATE EXTENSION pg_freespacemap;
+ERROR:  extension "pg_freespacemap" has no installation script nor update path for version "1.3"
 CREATE TABLE freespace_tab (c1 int) WITH (autovacuum_enabled = off);
 CREATE INDEX freespace_brin ON freespace_tab USING brin (c1);
 CREATE INDEX freespace_btree ON freespace_tab USING btree (c1);
@@ -8,78 +9,39 @@
   SELECT rel.id, fsm.blkno, (fsm.avail > 0) AS is_avail
     FROM rel, LATERAL pg_freespace(rel.id) AS fsm
     ORDER BY 1, 2;
-       id        | blkno | is_avail 
------------------+-------+----------
- freespace_brin  |     0 | f
- freespace_brin  |     1 | f
- freespace_brin  |     2 | t
- freespace_btree |     0 | f
- freespace_hash  |     0 | f
...

diff -U3 /Users/admin/pgsql/contrib/pg_freespacemap/expected/pg_freespacemap.out /Users/admin/pgsql/build/testrun/pg_fre...
--- /Users/admin/pgsql/contrib/pg_freespacemap/expected/pg_freespacemap.out	2024-05-02 08:28:50
+++ /Users/admin/pgsql/build/testrun/pg_freespacemap/regress/results/pg_freespacemap.out	2024-05-02 08:31:44
@@ -1,4 +1,5 @@
 CREATE EXTENSION pg_freespacemap;
+ERROR:  extension "pg_freespacemap" has no installation script nor update path for version "1.3"
 CREATE TABLE freespace_tab (c1 int) WITH (autovacuum_enabled = off);
 CREATE INDEX freespace_brin ON freespace_tab USING brin (c1);
 CREATE INDEX freespace_btree ON freespace_tab USING btree (c1);
@@ -8,78 +9,39 @@
   SELECT rel.id, fsm.blkno, (fsm.avail > 0) AS is_avail
     FROM rel, LATERAL pg_freespace(rel.id) AS fsm
     ORDER BY 1, 2;
-       id        | blkno | is_avail 
------------------+-------+----------
- freespace_brin  |     0 | f
- freespace_brin  |     1 | f
- freespace_brin  |     2 | t
- freespace_btree |     0 | f
- freespace_hash  |     0 | f
...

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/triggers.out /tmp/cirrus-ci-build/build/testrun/pg_upgrade/002_p...
--- /tmp/cirrus-ci-build/src/test/regress/expected/triggers.out	2024-05-02 06:03:11.730444000 +0000
+++ /tmp/cirrus-ci-build/build/testrun/pg_upgrade/002_pg_upgrade/data/results/triggers.out	2024-05-02 06:04:50.072396000...
@@ -3720,7 +3720,9 @@
 -- test who runs deferred trigger functions
 -- setup
 create role groot;
+WARNING:  roles created by regression test cases should have names starting with "regress_"
 create role outis;
+WARNING:  roles created by regression test cases should have names starting with "regress_"
 create function whoami() returns trigger language plpgsql
 as $$
 begin

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/triggers.out /tmp/cirrus-ci-build/build/testrun/recovery/027_str...
--- /tmp/cirrus-ci-build/src/test/regress/expected/triggers.out	2024-05-02 06:03:11.730444000 +0000
+++ /tmp/cirrus-ci-build/build/testrun/recovery/027_stream_regress/data/results/triggers.out	2024-05-02 06:05:19.3493520...
@@ -3720,7 +3720,9 @@
 -- test who runs deferred trigger functions
 -- setup
 create role groot;
+WARNING:  roles created by regression test cases should have names starting with "regress_"
 create role outis;
+WARNING:  roles created by regression test cases should have names starting with "regress_"
 create function whoami() returns trigger language plpgsql
 as $$
 begin

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/triggers.out /tmp/cirrus-ci-build/build/testrun/regress/regress/...
--- /tmp/cirrus-ci-build/src/test/regress/expected/triggers.out	2024-05-02 06:03:11.730444000 +0000
+++ /tmp/cirrus-ci-build/build/testrun/regress/regress/results/triggers.out	2024-05-02 06:04:46.338972000 +0000
@@ -3720,7 +3720,9 @@
 -- test who runs deferred trigger functions
 -- setup
 create role groot;
+WARNING:  roles created by regression test cases should have names starting with "regress_"
 create role outis;
+WARNING:  roles created by regression test cases should have names starting with "regress_"
 create function whoami() returns trigger language plpgsql
 as $$
 begin

diff -U3 /tmp/cirrus-ci-build/contrib/unaccent/expected/unaccent.out /tmp/cirrus-ci-build/build/testrun/unaccent/regress...
--- /tmp/cirrus-ci-build/contrib/unaccent/expected/unaccent.out	2024-05-02 03:53:42.756036000 +0000
+++ /tmp/cirrus-ci-build/build/testrun/unaccent/regress/results/unaccent.out	2024-05-02 03:55:27.685442000 +0000
@@ -8,8 +8,10 @@
 \quit
 \endif
 CREATE EXTENSION unaccent;
+WARNING:  duplicate source strings, first one will be used
 SET client_encoding TO 'UTF8';
 SELECT unaccent('foobar');
+WARNING:  duplicate source strings, first one will be used
  unaccent 
 ----------
  foobar

diff -U3 /tmp/cirrus-ci-build/contrib/unaccent/expected/unaccent.out /tmp/cirrus-ci-build/contrib/unaccent/results/unacc...
--- /tmp/cirrus-ci-build/contrib/unaccent/expected/unaccent.out	2024-05-02 03:53:33.373571304 +0000
+++ /tmp/cirrus-ci-build/contrib/unaccent/results/unaccent.out	2024-05-02 03:56:33.497233356 +0000
@@ -8,8 +8,10 @@
 \quit
 \endif
 CREATE EXTENSION unaccent;
+WARNING:  duplicate source strings, first one will be used
 SET client_encoding TO 'UTF8';
 SELECT unaccent('foobar');
+WARNING:  duplicate source strings, first one will be used
  unaccent 
 ----------
  foobar

diff -U3 /tmp/cirrus-ci-build/contrib/unaccent/expected/unaccent.out /tmp/cirrus-ci-build/build/testrun/unaccent/regress...
--- /tmp/cirrus-ci-build/contrib/unaccent/expected/unaccent.out	2024-05-02 03:53:33.971552725 +0000
+++ /tmp/cirrus-ci-build/build/testrun/unaccent/regress/results/unaccent.out	2024-05-02 03:56:00.607577821 +0000
@@ -8,8 +8,10 @@
 \quit
 \endif
 CREATE EXTENSION unaccent;
+WARNING:  duplicate source strings, first one will be used
 SET client_encoding TO 'UTF8';
 SELECT unaccent('foobar');
+WARNING:  duplicate source strings, first one will be used
  unaccent 
 ----------
  foobar

diff -U3 /Users/admin/pgsql/contrib/unaccent/expected/unaccent.out /Users/admin/pgsql/build/testrun/unaccent/regress/res...
--- /Users/admin/pgsql/contrib/unaccent/expected/unaccent.out	2024-05-02 03:53:28
+++ /Users/admin/pgsql/build/testrun/unaccent/regress/results/unaccent.out	2024-05-02 03:56:09
@@ -8,8 +8,10 @@
 \quit
 \endif
 CREATE EXTENSION unaccent;
+WARNING:  duplicate source strings, first one will be used
 SET client_encoding TO 'UTF8';
 SELECT unaccent('foobar');
+WARNING:  duplicate source strings, first one will be used
  unaccent 
 ----------
  foobar

diff -U3 /tmp/cirrus-ci-build/src/test/modules/injection_points/expected/injection_points.out /tmp/cirrus-ci-build/build...
--- /tmp/cirrus-ci-build/src/test/modules/injection_points/expected/injection_points.out	2024-05-01 22:44:18.896592000 +...
+++ /tmp/cirrus-ci-build/build/testrun/injection_points/regress/results/injection_points.out	2024-05-01 22:47:07.7388940...
@@ -169,44 +169,10 @@
 -- Wait for the previous backend process to exit, ensuring that its local
 -- injection points are cleaned up.
 SELECT wait_pid(:'oldpid');
- wait_pid 
-----------
- 
-(1 row)
-
-SELECT injection_points_run('TestConditionLocal1'); -- nothing
- injection_points_run 
-----------------------
- 
-(1 row)
-
-SELECT injection_points_run('TestConditionLocal2'); -- nothing
- injection_points_run 
...

diff -U3 /tmp/cirrus-ci-build/src/test/modules/injection_points/expected/injection_points.out /tmp/cirrus-ci-build/src/t...
--- /tmp/cirrus-ci-build/src/test/modules/injection_points/expected/injection_points.out	2024-05-01 22:44:14.342073105 +...
+++ /tmp/cirrus-ci-build/src/test/modules/injection_points/results/injection_points.out	2024-05-01 22:49:37.534075581 +0...
@@ -169,44 +169,10 @@
 -- Wait for the previous backend process to exit, ensuring that its local
 -- injection points are cleaned up.
 SELECT wait_pid(:'oldpid');
- wait_pid 
-----------
- 
-(1 row)
-
-SELECT injection_points_run('TestConditionLocal1'); -- nothing
- injection_points_run 
-----------------------
- 
-(1 row)
-
-SELECT injection_points_run('TestConditionLocal2'); -- nothing
- injection_points_run 
...

diff -U3 /tmp/cirrus-ci-build/src/test/modules/injection_points/expected/injection_points.out /tmp/cirrus-ci-build/build...
--- /tmp/cirrus-ci-build/src/test/modules/injection_points/expected/injection_points.out	2024-05-01 22:44:14.505261915 +...
+++ /tmp/cirrus-ci-build/build/testrun/injection_points/regress/results/injection_points.out	2024-05-01 22:49:21.3295608...
@@ -169,44 +169,10 @@
 -- Wait for the previous backend process to exit, ensuring that its local
 -- injection points are cleaned up.
 SELECT wait_pid(:'oldpid');
- wait_pid 
-----------
- 
-(1 row)
-
-SELECT injection_points_run('TestConditionLocal1'); -- nothing
- injection_points_run 
-----------------------
- 
-(1 row)
-
-SELECT injection_points_run('TestConditionLocal2'); -- nothing
- injection_points_run 
...

diff -w -U3 C:/cirrus/src/test/modules/injection_points/expected/injection_points.out C:/cirrus/build/testrun/injection_...
--- C:/cirrus/src/test/modules/injection_points/expected/injection_points.out	2024-05-01 22:44:33.478247100 +0000
+++ C:/cirrus/build/testrun/injection_points/regress/results/injection_points.out	2024-05-01 22:51:28.655554400 +0000
@@ -169,44 +169,10 @@
 -- Wait for the previous backend process to exit, ensuring that its local
 -- injection points are cleaned up.
 SELECT wait_pid(:'oldpid');
- wait_pid 
-----------
- 
-(1 row)
-
-SELECT injection_points_run('TestConditionLocal1'); -- nothing
- injection_points_run 
-----------------------
- 
-(1 row)
-
-SELECT injection_points_run('TestConditionLocal2'); -- nothing
- injection_points_run 
...

diff -U3 /Users/admin/pgsql/src/test/modules/injection_points/expected/injection_points.out /Users/admin/pgsql/build/tes...
--- /Users/admin/pgsql/src/test/modules/injection_points/expected/injection_points.out	2024-05-01 22:44:12
+++ /Users/admin/pgsql/build/testrun/injection_points/regress/results/injection_points.out	2024-05-01 22:49:53
@@ -174,39 +174,11 @@
  
 (1 row)
 
+WARNING:  terminating connection because of crash of another server process
+DETAIL:  The postmaster has commanded this server process to roll back the current transaction and exit, because anothe...
+HINT:  In a moment you should be able to reconnect to the database and repeat your command.
 SELECT injection_points_run('TestConditionLocal1'); -- nothing
- injection_points_run 
-----------------------
- 
-(1 row)
-
-SELECT injection_points_run('TestConditionLocal2'); -- nothing
- injection_points_run 
-----------------------
- 
...

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/select_parallel.out /tmp/cirrus-ci-build/build/testrun/pg_upgrad...
--- /tmp/cirrus-ci-build/src/test/regress/expected/select_parallel.out	2024-05-01 19:37:32.082776000 +0000
+++ /tmp/cirrus-ci-build/build/testrun/pg_upgrade/002_pg_upgrade/data/results/select_parallel.out	2024-05-01 19:39:06.62...
@@ -451,26 +451,36 @@
   join tenk1 t3 on t3.stringu1 = tenk1.stringu1
   where tenk1.four = t.four
 );
-                                                                                                                       ...
------------------------------------------------------------------------------------------------------------------------...
- Seq Scan on public.tenk1 t
+                                                                                                                       ...
+-----------------------------------------------------------------------------------------------------------------------...
+ Hash Join
    Output: t.unique1, t.unique2, t.two, t.four, t.ten, t.twenty, t.hundred, t.thousand, t.twothousand, t.fivethous, t.t...
-   Filter: (SubPlan 1)
-   SubPlan 1
-     ->  Hash Join
-           Output: t.two
-           Hash Cond: (tenk1.stringu1 = t3.stringu1)
-           ->  Seq Scan on public.tenk1
...

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/select_parallel.out /tmp/cirrus-ci-build/build/testrun/recovery/...
--- /tmp/cirrus-ci-build/src/test/regress/expected/select_parallel.out	2024-05-01 19:37:32.082776000 +0000
+++ /tmp/cirrus-ci-build/build/testrun/recovery/027_stream_regress/data/results/select_parallel.out	2024-05-01 19:39:42....
@@ -451,26 +451,36 @@
   join tenk1 t3 on t3.stringu1 = tenk1.stringu1
   where tenk1.four = t.four
 );
-                                                                                                                       ...
------------------------------------------------------------------------------------------------------------------------...
- Seq Scan on public.tenk1 t
+                                                                                                                       ...
+-----------------------------------------------------------------------------------------------------------------------...
+ Hash Join
    Output: t.unique1, t.unique2, t.two, t.four, t.ten, t.twenty, t.hundred, t.thousand, t.twothousand, t.fivethous, t.t...
-   Filter: (SubPlan 1)
-   SubPlan 1
-     ->  Hash Join
-           Output: t.two
-           Hash Cond: (tenk1.stringu1 = t3.stringu1)
-           ->  Seq Scan on public.tenk1
...

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/select_parallel.out /tmp/cirrus-ci-build/build/testrun/regress/r...
--- /tmp/cirrus-ci-build/src/test/regress/expected/select_parallel.out	2024-05-01 19:37:32.082776000 +0000
+++ /tmp/cirrus-ci-build/build/testrun/regress/regress/results/select_parallel.out	2024-05-01 19:39:05.203029000 +0000
@@ -451,26 +451,36 @@
   join tenk1 t3 on t3.stringu1 = tenk1.stringu1
   where tenk1.four = t.four
 );
-                                                                                                                       ...
------------------------------------------------------------------------------------------------------------------------...
- Seq Scan on public.tenk1 t
+                                                                                                                       ...
+-----------------------------------------------------------------------------------------------------------------------...
+ Hash Join
    Output: t.unique1, t.unique2, t.two, t.four, t.ten, t.twenty, t.hundred, t.thousand, t.twothousand, t.fivethous, t.t...
-   Filter: (SubPlan 1)
-   SubPlan 1
-     ->  Hash Join
-           Output: t.two
-           Hash Cond: (tenk1.stringu1 = t3.stringu1)
-           ->  Seq Scan on public.tenk1
...

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/select_parallel.out /tmp/cirrus-ci-build/src/bin/pg_upgrade/tmp_...
--- /tmp/cirrus-ci-build/src/test/regress/expected/select_parallel.out	2024-05-01 19:37:17.137907588 +0000
+++ /tmp/cirrus-ci-build/src/bin/pg_upgrade/tmp_check/results/select_parallel.out	2024-05-01 19:41:20.065856577 +0000
@@ -451,26 +451,36 @@
   join tenk1 t3 on t3.stringu1 = tenk1.stringu1
   where tenk1.four = t.four
 );
-                                                                                                                       ...
------------------------------------------------------------------------------------------------------------------------...
- Seq Scan on public.tenk1 t
+                                                                                                                       ...
+-----------------------------------------------------------------------------------------------------------------------...
+ Hash Join
    Output: t.unique1, t.unique2, t.two, t.four, t.ten, t.twenty, t.hundred, t.thousand, t.twothousand, t.fivethous, t.t...
-   Filter: (SubPlan 1)
-   SubPlan 1
-     ->  Hash Join
-           Output: t.two
-           Hash Cond: (tenk1.stringu1 = t3.stringu1)
-           ->  Seq Scan on public.tenk1
...

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/select_parallel.out /tmp/cirrus-ci-build/src/test/regress/result...
--- /tmp/cirrus-ci-build/src/test/regress/expected/select_parallel.out	2024-05-01 19:37:17.137907588 +0000
+++ /tmp/cirrus-ci-build/src/test/regress/results/select_parallel.out	2024-05-01 19:40:12.805862799 +0000
@@ -451,26 +451,36 @@
   join tenk1 t3 on t3.stringu1 = tenk1.stringu1
   where tenk1.four = t.four
 );
-                                                                                                                       ...
------------------------------------------------------------------------------------------------------------------------...
- Seq Scan on public.tenk1 t
+                                                                                                                       ...
+-----------------------------------------------------------------------------------------------------------------------...
+ Hash Join
    Output: t.unique1, t.unique2, t.two, t.four, t.ten, t.twenty, t.hundred, t.thousand, t.twothousand, t.fivethous, t.t...
-   Filter: (SubPlan 1)
-   SubPlan 1
-     ->  Hash Join
-           Output: t.two
-           Hash Cond: (tenk1.stringu1 = t3.stringu1)
-           ->  Seq Scan on public.tenk1
...

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/select_parallel.out /tmp/cirrus-ci-build/build/testrun/pg_upgrad...
--- /tmp/cirrus-ci-build/src/test/regress/expected/select_parallel.out	2024-05-01 19:37:12.915647045 +0000
+++ /tmp/cirrus-ci-build/build/testrun/pg_upgrade/002_pg_upgrade/data/results/select_parallel.out	2024-05-01 19:39:43.97...
@@ -451,26 +451,36 @@
   join tenk1 t3 on t3.stringu1 = tenk1.stringu1
   where tenk1.four = t.four
 );
-                                                                                                                       ...
------------------------------------------------------------------------------------------------------------------------...
- Seq Scan on public.tenk1 t
+                                                                                                                       ...
+-----------------------------------------------------------------------------------------------------------------------...
+ Hash Join
    Output: t.unique1, t.unique2, t.two, t.four, t.ten, t.twenty, t.hundred, t.thousand, t.twothousand, t.fivethous, t.t...
-   Filter: (SubPlan 1)
-   SubPlan 1
-     ->  Hash Join
-           Output: t.two
-           Hash Cond: (tenk1.stringu1 = t3.stringu1)
-           ->  Seq Scan on public.tenk1
...

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/select_parallel.out /tmp/cirrus-ci-build/build/testrun/recovery/...
--- /tmp/cirrus-ci-build/src/test/regress/expected/select_parallel.out	2024-05-01 19:37:12.915647045 +0000
+++ /tmp/cirrus-ci-build/build/testrun/recovery/027_stream_regress/data/results/select_parallel.out	2024-05-01 19:40:18....
@@ -451,26 +451,36 @@
   join tenk1 t3 on t3.stringu1 = tenk1.stringu1
   where tenk1.four = t.four
 );
-                                                                                                                       ...
------------------------------------------------------------------------------------------------------------------------...
- Seq Scan on public.tenk1 t
+                                                                                                                       ...
+-----------------------------------------------------------------------------------------------------------------------...
+ Hash Join
    Output: t.unique1, t.unique2, t.two, t.four, t.ten, t.twenty, t.hundred, t.thousand, t.twothousand, t.fivethous, t.t...
-   Filter: (SubPlan 1)
-   SubPlan 1
-     ->  Hash Join
-           Output: t.two
-           Hash Cond: (tenk1.stringu1 = t3.stringu1)
-           ->  Seq Scan on public.tenk1
...

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/select_parallel.out /tmp/cirrus-ci-build/build/testrun/regress/r...
--- /tmp/cirrus-ci-build/src/test/regress/expected/select_parallel.out	2024-05-01 19:37:12.915647045 +0000
+++ /tmp/cirrus-ci-build/build/testrun/regress/regress/results/select_parallel.out	2024-05-01 19:39:40.503701730 +0000
@@ -451,26 +451,36 @@
   join tenk1 t3 on t3.stringu1 = tenk1.stringu1
   where tenk1.four = t.four
 );
-                                                                                                                       ...
------------------------------------------------------------------------------------------------------------------------...
- Seq Scan on public.tenk1 t
+                                                                                                                       ...
+-----------------------------------------------------------------------------------------------------------------------...
+ Hash Join
    Output: t.unique1, t.unique2, t.two, t.four, t.ten, t.twenty, t.hundred, t.thousand, t.twothousand, t.fivethous, t.t...
-   Filter: (SubPlan 1)
-   SubPlan 1
-     ->  Hash Join
-           Output: t.two
-           Hash Cond: (tenk1.stringu1 = t3.stringu1)
-           ->  Seq Scan on public.tenk1
...

diff -w -U3 C:/cirrus/src/test/regress/expected/select_parallel.out C:/cirrus/build/testrun/pg_upgrade/002_pg_upgrade/da...
--- C:/cirrus/src/test/regress/expected/select_parallel.out	2024-05-01 19:38:09.658647500 +0000
+++ C:/cirrus/build/testrun/pg_upgrade/002_pg_upgrade/data/results/select_parallel.out	2024-05-01 19:41:40.013829600 +00...
@@ -452,25 +452,35 @@
   where tenk1.four = t.four
 );
                                                                                                                        ...
------------------------------------------------------------------------------------------------------------------------...
- Seq Scan on public.tenk1 t
+-----------------------------------------------------------------------------------------------------------------------...
+ Hash Join
    Output: t.unique1, t.unique2, t.two, t.four, t.ten, t.twenty, t.hundred, t.thousand, t.twothousand, t.fivethous, t.t...
-   Filter: (SubPlan 1)
-   SubPlan 1
-     ->  Hash Join
-           Output: t.two
-           Hash Cond: (tenk1.stringu1 = t3.stringu1)
-           ->  Seq Scan on public.tenk1
-                 Output: tenk1.unique1, tenk1.unique2, tenk1.two, tenk1.four, tenk1.ten, tenk1.twenty, tenk1.hundred, t...
-                 Filter: (tenk1.four = t.four)
...

diff -w -U3 C:/cirrus/src/test/regress/expected/select_parallel.out C:/cirrus/build/testrun/recovery/027_stream_regress/...
--- C:/cirrus/src/test/regress/expected/select_parallel.out	2024-05-01 19:38:09.658647500 +0000
+++ C:/cirrus/build/testrun/recovery/027_stream_regress/data/results/select_parallel.out	2024-05-01 19:43:52.424406000 +...
@@ -452,25 +452,35 @@
   where tenk1.four = t.four
 );
                                                                                                                        ...
------------------------------------------------------------------------------------------------------------------------...
- Seq Scan on public.tenk1 t
+-----------------------------------------------------------------------------------------------------------------------...
+ Hash Join
    Output: t.unique1, t.unique2, t.two, t.four, t.ten, t.twenty, t.hundred, t.thousand, t.twothousand, t.fivethous, t.t...
-   Filter: (SubPlan 1)
-   SubPlan 1
-     ->  Hash Join
-           Output: t.two
-           Hash Cond: (tenk1.stringu1 = t3.stringu1)
-           ->  Seq Scan on public.tenk1
-                 Output: tenk1.unique1, tenk1.unique2, tenk1.two, tenk1.four, tenk1.ten, tenk1.twenty, tenk1.hundred, t...
-                 Filter: (tenk1.four = t.four)
...

diff -w -U3 C:/cirrus/src/test/regress/expected/select_parallel.out C:/cirrus/build/testrun/regress/regress/results/sele...
--- C:/cirrus/src/test/regress/expected/select_parallel.out	2024-05-01 19:38:09.658647500 +0000
+++ C:/cirrus/build/testrun/regress/regress/results/select_parallel.out	2024-05-01 19:41:29.955733000 +0000
@@ -452,25 +452,35 @@
   where tenk1.four = t.four
 );
                                                                                                                        ...
------------------------------------------------------------------------------------------------------------------------...
- Seq Scan on public.tenk1 t
+-----------------------------------------------------------------------------------------------------------------------...
+ Hash Join
    Output: t.unique1, t.unique2, t.two, t.four, t.ten, t.twenty, t.hundred, t.thousand, t.twothousand, t.fivethous, t.t...
-   Filter: (SubPlan 1)
-   SubPlan 1
-     ->  Hash Join
-           Output: t.two
-           Hash Cond: (tenk1.stringu1 = t3.stringu1)
-           ->  Seq Scan on public.tenk1
-                 Output: tenk1.unique1, tenk1.unique2, tenk1.two, tenk1.four, tenk1.ten, tenk1.twenty, tenk1.hundred, t...
-                 Filter: (tenk1.four = t.four)
...

diff -U3 /Users/admin/pgsql/src/test/regress/expected/select_parallel.out /Users/admin/pgsql/build/testrun/pg_upgrade/00...
--- /Users/admin/pgsql/src/test/regress/expected/select_parallel.out	2024-05-01 19:37:14
+++ /Users/admin/pgsql/build/testrun/pg_upgrade/002_pg_upgrade/data/results/select_parallel.out	2024-05-01 19:49:22
@@ -451,26 +451,36 @@
   join tenk1 t3 on t3.stringu1 = tenk1.stringu1
   where tenk1.four = t.four
 );
-                                                                                                                       ...
------------------------------------------------------------------------------------------------------------------------...
- Seq Scan on public.tenk1 t
+                                                                                                                       ...
+-----------------------------------------------------------------------------------------------------------------------...
+ Hash Join
    Output: t.unique1, t.unique2, t.two, t.four, t.ten, t.twenty, t.hundred, t.thousand, t.twothousand, t.fivethous, t.t...
-   Filter: (SubPlan 1)
-   SubPlan 1
-     ->  Hash Join
-           Output: t.two
-           Hash Cond: (tenk1.stringu1 = t3.stringu1)
-           ->  Seq Scan on public.tenk1
...

diff -U3 /Users/admin/pgsql/src/test/regress/expected/select_parallel.out /Users/admin/pgsql/build/testrun/recovery/027_...
--- /Users/admin/pgsql/src/test/regress/expected/select_parallel.out	2024-05-01 19:37:14
+++ /Users/admin/pgsql/build/testrun/recovery/027_stream_regress/data/results/select_parallel.out	2024-05-01 19:50:22
@@ -451,26 +451,36 @@
   join tenk1 t3 on t3.stringu1 = tenk1.stringu1
   where tenk1.four = t.four
 );
-                                                                                                                       ...
------------------------------------------------------------------------------------------------------------------------...
- Seq Scan on public.tenk1 t
+                                                                                                                       ...
+-----------------------------------------------------------------------------------------------------------------------...
+ Hash Join
    Output: t.unique1, t.unique2, t.two, t.four, t.ten, t.twenty, t.hundred, t.thousand, t.twothousand, t.fivethous, t.t...
-   Filter: (SubPlan 1)
-   SubPlan 1
-     ->  Hash Join
-           Output: t.two
-           Hash Cond: (tenk1.stringu1 = t3.stringu1)
-           ->  Seq Scan on public.tenk1
...

diff -U3 /Users/admin/pgsql/src/test/regress/expected/select_parallel.out /Users/admin/pgsql/build/testrun/regress/regre...
--- /Users/admin/pgsql/src/test/regress/expected/select_parallel.out	2024-05-01 19:37:14
+++ /Users/admin/pgsql/build/testrun/regress/regress/results/select_parallel.out	2024-05-01 19:49:23
@@ -451,26 +451,36 @@
   join tenk1 t3 on t3.stringu1 = tenk1.stringu1
   where tenk1.four = t.four
 );
-                                                                                                                       ...
------------------------------------------------------------------------------------------------------------------------...
- Seq Scan on public.tenk1 t
+                                                                                                                       ...
+-----------------------------------------------------------------------------------------------------------------------...
+ Hash Join
    Output: t.unique1, t.unique2, t.two, t.four, t.ten, t.twenty, t.hundred, t.thousand, t.twothousand, t.fivethous, t.t...
-   Filter: (SubPlan 1)
-   SubPlan 1
-     ->  Hash Join
-           Output: t.two
-           Hash Cond: (tenk1.stringu1 = t3.stringu1)
-           ->  Seq Scan on public.tenk1
...

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/partition_join.out /tmp/cirrus-ci-build/build/testrun/pg_upgrade...
--- /tmp/cirrus-ci-build/src/test/regress/expected/partition_join.out	2024-05-01 15:41:50.963972000 +0000
+++ /tmp/cirrus-ci-build/build/testrun/pg_upgrade/002_pg_upgrade/data/results/partition_join.out	2024-05-01 15:43:40.134...
@@ -5133,17 +5133,15 @@
                               QUERY PLAN                               
 -----------------------------------------------------------------------
  Limit
-   ->  Merge Append
-         Sort Key: x.id
-         ->  Merge Left Join
-               Merge Cond: (x_1.id = y_1.id)
+   ->  Merge Left Join
+         Merge Cond: (x.id = y.id)
+         ->  Append
                ->  Index Only Scan using fract_t0_pkey on fract_t0 x_1
-               ->  Index Only Scan using fract_t0_pkey on fract_t0 y_1
-         ->  Merge Left Join
-               Merge Cond: (x_2.id = y_2.id)
                ->  Index Only Scan using fract_t1_pkey on fract_t1 x_2
+         ->  Append
...

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/partition_join.out /tmp/cirrus-ci-build/build/testrun/recovery/0...
--- /tmp/cirrus-ci-build/src/test/regress/expected/partition_join.out	2024-05-01 15:41:50.963972000 +0000
+++ /tmp/cirrus-ci-build/build/testrun/recovery/027_stream_regress/data/results/partition_join.out	2024-05-01 15:44:09.9...
@@ -5133,17 +5133,15 @@
                               QUERY PLAN                               
 -----------------------------------------------------------------------
  Limit
-   ->  Merge Append
-         Sort Key: x.id
-         ->  Merge Left Join
-               Merge Cond: (x_1.id = y_1.id)
+   ->  Merge Left Join
+         Merge Cond: (x.id = y.id)
+         ->  Append
                ->  Index Only Scan using fract_t0_pkey on fract_t0 x_1
-               ->  Index Only Scan using fract_t0_pkey on fract_t0 y_1
-         ->  Merge Left Join
-               Merge Cond: (x_2.id = y_2.id)
                ->  Index Only Scan using fract_t1_pkey on fract_t1 x_2
+         ->  Append
...

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/partition_join.out /tmp/cirrus-ci-build/build/testrun/regress/re...
--- /tmp/cirrus-ci-build/src/test/regress/expected/partition_join.out	2024-05-01 15:41:50.963972000 +0000
+++ /tmp/cirrus-ci-build/build/testrun/regress/regress/results/partition_join.out	2024-05-01 15:43:33.384762000 +0000
@@ -5133,17 +5133,15 @@
                               QUERY PLAN                               
 -----------------------------------------------------------------------
  Limit
-   ->  Merge Append
-         Sort Key: x.id
-         ->  Merge Left Join
-               Merge Cond: (x_1.id = y_1.id)
+   ->  Merge Left Join
+         Merge Cond: (x.id = y.id)
+         ->  Append
                ->  Index Only Scan using fract_t0_pkey on fract_t0 x_1
-               ->  Index Only Scan using fract_t0_pkey on fract_t0 y_1
-         ->  Merge Left Join
-               Merge Cond: (x_2.id = y_2.id)
                ->  Index Only Scan using fract_t1_pkey on fract_t1 x_2
+         ->  Append
...

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/partition_join.out /tmp/cirrus-ci-build/src/bin/pg_upgrade/tmp_c...
--- /tmp/cirrus-ci-build/src/test/regress/expected/partition_join.out	2024-05-01 15:41:39.909614714 +0000
+++ /tmp/cirrus-ci-build/src/bin/pg_upgrade/tmp_check/results/partition_join.out	2024-05-01 15:45:16.801443181 +0000
@@ -5133,17 +5133,15 @@
                               QUERY PLAN                               
 -----------------------------------------------------------------------
  Limit
-   ->  Merge Append
-         Sort Key: x.id
-         ->  Merge Left Join
-               Merge Cond: (x_1.id = y_1.id)
+   ->  Merge Left Join
+         Merge Cond: (x.id = y.id)
+         ->  Append
                ->  Index Only Scan using fract_t0_pkey on fract_t0 x_1
-               ->  Index Only Scan using fract_t0_pkey on fract_t0 y_1
-         ->  Merge Left Join
-               Merge Cond: (x_2.id = y_2.id)
                ->  Index Only Scan using fract_t1_pkey on fract_t1 x_2
+         ->  Append
...

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/partition_join.out /tmp/cirrus-ci-build/src/test/recovery/tmp_ch...
--- /tmp/cirrus-ci-build/src/test/regress/expected/partition_join.out	2024-05-01 15:41:39.909614714 +0000
+++ /tmp/cirrus-ci-build/src/test/recovery/tmp_check/results/partition_join.out	2024-05-01 15:46:28.413373377 +0000
@@ -5133,17 +5133,15 @@
                               QUERY PLAN                               
 -----------------------------------------------------------------------
  Limit
-   ->  Merge Append
-         Sort Key: x.id
-         ->  Merge Left Join
-               Merge Cond: (x_1.id = y_1.id)
+   ->  Merge Left Join
+         Merge Cond: (x.id = y.id)
+         ->  Append
                ->  Index Only Scan using fract_t0_pkey on fract_t0 x_1
-               ->  Index Only Scan using fract_t0_pkey on fract_t0 y_1
-         ->  Merge Left Join
-               Merge Cond: (x_2.id = y_2.id)
                ->  Index Only Scan using fract_t1_pkey on fract_t1 x_2
+         ->  Append
...

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/partition_join.out /tmp/cirrus-ci-build/src/test/regress/results...
--- /tmp/cirrus-ci-build/src/test/regress/expected/partition_join.out	2024-05-01 15:41:39.909614714 +0000
+++ /tmp/cirrus-ci-build/src/test/regress/results/partition_join.out	2024-05-01 15:44:02.413527806 +0000
@@ -5133,17 +5133,15 @@
                               QUERY PLAN                               
 -----------------------------------------------------------------------
  Limit
-   ->  Merge Append
-         Sort Key: x.id
-         ->  Merge Left Join
-               Merge Cond: (x_1.id = y_1.id)
+   ->  Merge Left Join
+         Merge Cond: (x.id = y.id)
+         ->  Append
                ->  Index Only Scan using fract_t0_pkey on fract_t0 x_1
-               ->  Index Only Scan using fract_t0_pkey on fract_t0 y_1
-         ->  Merge Left Join
-               Merge Cond: (x_2.id = y_2.id)
                ->  Index Only Scan using fract_t1_pkey on fract_t1 x_2
+         ->  Append
...

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/partition_join.out /tmp/cirrus-ci-build/build/testrun/pg_upgrade...
--- /tmp/cirrus-ci-build/src/test/regress/expected/partition_join.out	2024-05-01 15:41:45.393300531 +0000
+++ /tmp/cirrus-ci-build/build/testrun/pg_upgrade/002_pg_upgrade/data/results/partition_join.out	2024-05-01 15:43:56.773...
@@ -5133,17 +5133,15 @@
                               QUERY PLAN                               
 -----------------------------------------------------------------------
  Limit
-   ->  Merge Append
-         Sort Key: x.id
-         ->  Merge Left Join
-               Merge Cond: (x_1.id = y_1.id)
+   ->  Merge Left Join
+         Merge Cond: (x.id = y.id)
+         ->  Append
                ->  Index Only Scan using fract_t0_pkey on fract_t0 x_1
-               ->  Index Only Scan using fract_t0_pkey on fract_t0 y_1
-         ->  Merge Left Join
-               Merge Cond: (x_2.id = y_2.id)
                ->  Index Only Scan using fract_t1_pkey on fract_t1 x_2
+         ->  Append
...

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/partition_join.out /tmp/cirrus-ci-build/build/testrun/recovery/0...
--- /tmp/cirrus-ci-build/src/test/regress/expected/partition_join.out	2024-05-01 15:41:45.393300531 +0000
+++ /tmp/cirrus-ci-build/build/testrun/recovery/027_stream_regress/data/results/partition_join.out	2024-05-01 15:44:22.5...
@@ -5133,17 +5133,15 @@
                               QUERY PLAN                               
 -----------------------------------------------------------------------
  Limit
-   ->  Merge Append
-         Sort Key: x.id
-         ->  Merge Left Join
-               Merge Cond: (x_1.id = y_1.id)
+   ->  Merge Left Join
+         Merge Cond: (x.id = y.id)
+         ->  Append
                ->  Index Only Scan using fract_t0_pkey on fract_t0 x_1
-               ->  Index Only Scan using fract_t0_pkey on fract_t0 y_1
-         ->  Merge Left Join
-               Merge Cond: (x_2.id = y_2.id)
                ->  Index Only Scan using fract_t1_pkey on fract_t1 x_2
+         ->  Append
...

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/partition_join.out /tmp/cirrus-ci-build/build/testrun/regress/re...
--- /tmp/cirrus-ci-build/src/test/regress/expected/partition_join.out	2024-05-01 15:41:45.393300531 +0000
+++ /tmp/cirrus-ci-build/build/testrun/regress/regress/results/partition_join.out	2024-05-01 15:43:50.925159072 +0000
@@ -5133,17 +5133,15 @@
                               QUERY PLAN                               
 -----------------------------------------------------------------------
  Limit
-   ->  Merge Append
-         Sort Key: x.id
-         ->  Merge Left Join
-               Merge Cond: (x_1.id = y_1.id)
+   ->  Merge Left Join
+         Merge Cond: (x.id = y.id)
+         ->  Append
                ->  Index Only Scan using fract_t0_pkey on fract_t0 x_1
-               ->  Index Only Scan using fract_t0_pkey on fract_t0 y_1
-         ->  Merge Left Join
-               Merge Cond: (x_2.id = y_2.id)
                ->  Index Only Scan using fract_t1_pkey on fract_t1 x_2
+         ->  Append
...

diff -w -U3 C:/cirrus/src/test/regress/expected/partition_join.out C:/cirrus/build/testrun/pg_upgrade/002_pg_upgrade/dat...
--- C:/cirrus/src/test/regress/expected/partition_join.out	2024-05-01 15:42:03.045331300 +0000
+++ C:/cirrus/build/testrun/pg_upgrade/002_pg_upgrade/data/results/partition_join.out	2024-05-01 15:45:36.024199300 +000...
@@ -5133,17 +5133,15 @@
                               QUERY PLAN                               
 -----------------------------------------------------------------------
  Limit
-   ->  Merge Append
-         Sort Key: x.id
          ->  Merge Left Join
-               Merge Cond: (x_1.id = y_1.id)
+         Merge Cond: (x.id = y.id)
+         ->  Append
                ->  Index Only Scan using fract_t0_pkey on fract_t0 x_1
-               ->  Index Only Scan using fract_t0_pkey on fract_t0 y_1
-         ->  Merge Left Join
-               Merge Cond: (x_2.id = y_2.id)
                ->  Index Only Scan using fract_t1_pkey on fract_t1 x_2
+         ->  Append
+               ->  Index Only Scan using fract_t0_pkey on fract_t0 y_1
...

diff -w -U3 C:/cirrus/src/test/regress/expected/partition_join.out C:/cirrus/build/testrun/recovery/027_stream_regress/d...
--- C:/cirrus/src/test/regress/expected/partition_join.out	2024-05-01 15:42:03.045331300 +0000
+++ C:/cirrus/build/testrun/recovery/027_stream_regress/data/results/partition_join.out	2024-05-01 15:47:47.096340400 +0...
@@ -5133,17 +5133,15 @@
                               QUERY PLAN                               
 -----------------------------------------------------------------------
  Limit
-   ->  Merge Append
-         Sort Key: x.id
          ->  Merge Left Join
-               Merge Cond: (x_1.id = y_1.id)
+         Merge Cond: (x.id = y.id)
+         ->  Append
                ->  Index Only Scan using fract_t0_pkey on fract_t0 x_1
-               ->  Index Only Scan using fract_t0_pkey on fract_t0 y_1
-         ->  Merge Left Join
-               Merge Cond: (x_2.id = y_2.id)
                ->  Index Only Scan using fract_t1_pkey on fract_t1 x_2
+         ->  Append
+               ->  Index Only Scan using fract_t0_pkey on fract_t0 y_1
...

diff -w -U3 C:/cirrus/src/test/regress/expected/partition_join.out C:/cirrus/build/testrun/regress/regress/results/parti...
--- C:/cirrus/src/test/regress/expected/partition_join.out	2024-05-01 15:42:03.045331300 +0000
+++ C:/cirrus/build/testrun/regress/regress/results/partition_join.out	2024-05-01 15:45:28.920693800 +0000
@@ -5133,17 +5133,15 @@
                               QUERY PLAN                               
 -----------------------------------------------------------------------
  Limit
-   ->  Merge Append
-         Sort Key: x.id
          ->  Merge Left Join
-               Merge Cond: (x_1.id = y_1.id)
+         Merge Cond: (x.id = y.id)
+         ->  Append
                ->  Index Only Scan using fract_t0_pkey on fract_t0 x_1
-               ->  Index Only Scan using fract_t0_pkey on fract_t0 y_1
-         ->  Merge Left Join
-               Merge Cond: (x_2.id = y_2.id)
                ->  Index Only Scan using fract_t1_pkey on fract_t1 x_2
+         ->  Append
+               ->  Index Only Scan using fract_t0_pkey on fract_t0 y_1
...

diff -U3 /Users/admin/pgsql/src/test/regress/expected/partition_join.out /Users/admin/pgsql/build/testrun/pg_upgrade/002...
--- /Users/admin/pgsql/src/test/regress/expected/partition_join.out	2024-05-01 15:40:12
+++ /Users/admin/pgsql/build/testrun/pg_upgrade/002_pg_upgrade/data/results/partition_join.out	2024-05-01 15:43:01
@@ -5133,17 +5133,15 @@
                               QUERY PLAN                               
 -----------------------------------------------------------------------
  Limit
-   ->  Merge Append
-         Sort Key: x.id
-         ->  Merge Left Join
-               Merge Cond: (x_1.id = y_1.id)
+   ->  Merge Left Join
+         Merge Cond: (x.id = y.id)
+         ->  Append
                ->  Index Only Scan using fract_t0_pkey on fract_t0 x_1
-               ->  Index Only Scan using fract_t0_pkey on fract_t0 y_1
-         ->  Merge Left Join
-               Merge Cond: (x_2.id = y_2.id)
                ->  Index Only Scan using fract_t1_pkey on fract_t1 x_2
+         ->  Append
...

diff -U3 /Users/admin/pgsql/src/test/regress/expected/partition_join.out /Users/admin/pgsql/build/testrun/recovery/027_s...
--- /Users/admin/pgsql/src/test/regress/expected/partition_join.out	2024-05-01 15:40:12
+++ /Users/admin/pgsql/build/testrun/recovery/027_stream_regress/data/results/partition_join.out	2024-05-01 15:45:00
@@ -5133,17 +5133,15 @@
                               QUERY PLAN                               
 -----------------------------------------------------------------------
  Limit
-   ->  Merge Append
-         Sort Key: x.id
-         ->  Merge Left Join
-               Merge Cond: (x_1.id = y_1.id)
+   ->  Merge Left Join
+         Merge Cond: (x.id = y.id)
+         ->  Append
                ->  Index Only Scan using fract_t0_pkey on fract_t0 x_1
-               ->  Index Only Scan using fract_t0_pkey on fract_t0 y_1
-         ->  Merge Left Join
-               Merge Cond: (x_2.id = y_2.id)
                ->  Index Only Scan using fract_t1_pkey on fract_t1 x_2
+         ->  Append
...

diff -U3 /Users/admin/pgsql/src/test/regress/expected/partition_join.out /Users/admin/pgsql/build/testrun/regress/regres...
--- /Users/admin/pgsql/src/test/regress/expected/partition_join.out	2024-05-01 15:40:12
+++ /Users/admin/pgsql/build/testrun/regress/regress/results/partition_join.out	2024-05-01 15:43:00
@@ -5133,17 +5133,15 @@
                               QUERY PLAN                               
 -----------------------------------------------------------------------
  Limit
-   ->  Merge Append
-         Sort Key: x.id
-         ->  Merge Left Join
-               Merge Cond: (x_1.id = y_1.id)
+   ->  Merge Left Join
+         Merge Cond: (x.id = y.id)
+         ->  Append
                ->  Index Only Scan using fract_t0_pkey on fract_t0 x_1
-               ->  Index Only Scan using fract_t0_pkey on fract_t0 y_1
-         ->  Merge Left Join
-               Merge Cond: (x_2.id = y_2.id)
                ->  Index Only Scan using fract_t1_pkey on fract_t1 x_2
+         ->  Append
...

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/alter_table.out /tmp/cirrus-ci-build/build/testrun/pg_upgrade/00...
--- /tmp/cirrus-ci-build/src/test/regress/expected/alter_table.out	2024-05-01 08:36:41.581986000 +0000
+++ /tmp/cirrus-ci-build/build/testrun/pg_upgrade/002_pg_upgrade/data/results/alter_table.out	2024-05-01 08:38:14.060541...
@@ -3476,9 +3476,20 @@
 WHERE relkind IN ('r', 'i', 'S', 't', 'm') AND mapped_oid IS DISTINCT FROM oid;
 SELECT m.* FROM filenode_mapping m LEFT JOIN pg_class c ON c.oid = m.oid
 WHERE c.oid IS NOT NULL OR m.mapped_oid IS NOT NULL;
- oid | mapped_oid | reltablespace | relfilenode | relname 
------+------------+---------------+-------------+---------
-(0 rows)
+  oid  | mapped_oid | reltablespace | relfilenode |       relname        
+-------+------------+---------------+-------------+----------------------
+ 37774 |            |             0 |       37774 | pktable_pkey
+ 37771 |            |             0 |       37771 | pktable
+ 37776 |            |             0 |       37776 | fktable
+ 38366 |            |             0 |       38372 | foo
+ 38376 |            |             0 |       38376 | pg_toast_38366_index
+ 38375 |            |             0 |       38375 | pg_toast_38366
+ 38639 |            |             0 |       38639 | old_oids
+ 38667 |            |             0 |       38667 | pg_toast_38664
...

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/alter_table.out /tmp/cirrus-ci-build/build/testrun/recovery/027_...
--- /tmp/cirrus-ci-build/src/test/regress/expected/alter_table.out	2024-05-01 08:36:41.581986000 +0000
+++ /tmp/cirrus-ci-build/build/testrun/recovery/027_stream_regress/data/results/alter_table.out	2024-05-01 08:38:42.5854...
@@ -3476,9 +3476,20 @@
 WHERE relkind IN ('r', 'i', 'S', 't', 'm') AND mapped_oid IS DISTINCT FROM oid;
 SELECT m.* FROM filenode_mapping m LEFT JOIN pg_class c ON c.oid = m.oid
 WHERE c.oid IS NOT NULL OR m.mapped_oid IS NOT NULL;
- oid | mapped_oid | reltablespace | relfilenode | relname 
------+------------+---------------+-------------+---------
-(0 rows)
+  oid  | mapped_oid | reltablespace | relfilenode |       relname        
+-------+------------+---------------+-------------+----------------------
+ 37793 |            |             0 |       37793 | pktable_pkey
+ 37790 |            |             0 |       37790 | pktable
+ 37795 |            |             0 |       37795 | fktable
+ 38299 |            |             0 |       38305 | foo
+ 38309 |            |             0 |       38309 | pg_toast_38299_index
+ 38308 |            |             0 |       38308 | pg_toast_38299
+ 38576 |            |             0 |       38576 | old_oids
+ 38597 |            |             0 |       38597 | pg_toast_38594
...

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/alter_table.out /tmp/cirrus-ci-build/build/testrun/regress/regre...
--- /tmp/cirrus-ci-build/src/test/regress/expected/alter_table.out	2024-05-01 08:36:41.581986000 +0000
+++ /tmp/cirrus-ci-build/build/testrun/regress/regress/results/alter_table.out	2024-05-01 08:38:10.503390000 +0000
@@ -3476,9 +3476,20 @@
 WHERE relkind IN ('r', 'i', 'S', 't', 'm') AND mapped_oid IS DISTINCT FROM oid;
 SELECT m.* FROM filenode_mapping m LEFT JOIN pg_class c ON c.oid = m.oid
 WHERE c.oid IS NOT NULL OR m.mapped_oid IS NOT NULL;
- oid | mapped_oid | reltablespace | relfilenode | relname 
------+------------+---------------+-------------+---------
-(0 rows)
+  oid  | mapped_oid | reltablespace | relfilenode |       relname        
+-------+------------+---------------+-------------+----------------------
+ 37763 |            |             0 |       37763 | pktable
+ 37768 |            |             0 |       37768 | fktable
+ 37766 |            |             0 |       37766 | pktable_pkey
+ 38363 |            |             0 |       38371 | foo
+ 38376 |            |             0 |       38376 | pg_toast_38363_index
+ 38375 |            |             0 |       38375 | pg_toast_38363
+ 38648 |            |             0 |       38648 | old_oids
+ 38671 |            |             0 |       38671 | pg_toast_38668
...

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/alter_table.out /tmp/cirrus-ci-build/src/bin/pg_upgrade/tmp_chec...
--- /tmp/cirrus-ci-build/src/test/regress/expected/alter_table.out	2024-05-01 08:36:41.704602306 +0000
+++ /tmp/cirrus-ci-build/src/bin/pg_upgrade/tmp_check/results/alter_table.out	2024-05-01 08:39:52.700476809 +0000
@@ -3476,9 +3476,20 @@
 WHERE relkind IN ('r', 'i', 'S', 't', 'm') AND mapped_oid IS DISTINCT FROM oid;
 SELECT m.* FROM filenode_mapping m LEFT JOIN pg_class c ON c.oid = m.oid
 WHERE c.oid IS NOT NULL OR m.mapped_oid IS NOT NULL;
- oid | mapped_oid | reltablespace | relfilenode | relname 
------+------------+---------------+-------------+---------
-(0 rows)
+  oid  | mapped_oid | reltablespace | relfilenode |       relname        
+-------+------------+---------------+-------------+----------------------
+ 37923 |            |             0 |       37923 | pktable_pkey
+ 37919 |            |             0 |       37919 | pktable
+ 37926 |            |             0 |       37926 | fktable
+ 38462 |            |             0 |       38468 | foo
+ 38472 |            |             0 |       38472 | pg_toast_38462_index
+ 38471 |            |             0 |       38471 | pg_toast_38462
+ 38697 |            |             0 |       38697 | old_oids
+ 38718 |            |             0 |       38718 | pg_toast_38715
...

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/alter_table.out /tmp/cirrus-ci-build/src/test/regress/results/al...
--- /tmp/cirrus-ci-build/src/test/regress/expected/alter_table.out	2024-05-01 08:36:41.704602306 +0000
+++ /tmp/cirrus-ci-build/src/test/regress/results/alter_table.out	2024-05-01 08:39:05.328527709 +0000
@@ -3476,9 +3476,29 @@
 WHERE relkind IN ('r', 'i', 'S', 't', 'm') AND mapped_oid IS DISTINCT FROM oid;
 SELECT m.* FROM filenode_mapping m LEFT JOIN pg_class c ON c.oid = m.oid
 WHERE c.oid IS NOT NULL OR m.mapped_oid IS NOT NULL;
- oid | mapped_oid | reltablespace | relfilenode | relname 
------+------------+---------------+-------------+---------
-(0 rows)
+  oid  | mapped_oid | reltablespace | relfilenode |       relname        
+-------+------------+---------------+-------------+----------------------
+ 37859 |            |             0 |       37859 | users_id_seq
+ 37865 |            |             0 |       37865 | pg_toast_37860
+ 37866 |            |             0 |       37866 | pg_toast_37860_index
+ 37860 |            |             0 |       37860 | users
+ 38211 |            |             0 |       38211 | foo
+ 37927 |            |             0 |       37927 | pktable_pkey
+ 37923 |            |             0 |       37923 | pktable
+ 37929 |            |             0 |       37929 | fktable
...

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/alter_table.out /tmp/cirrus-ci-build/build/testrun/pg_upgrade/00...
--- /tmp/cirrus-ci-build/src/test/regress/expected/alter_table.out	2024-05-01 08:36:41.713604503 +0000
+++ /tmp/cirrus-ci-build/build/testrun/pg_upgrade/002_pg_upgrade/data/results/alter_table.out	2024-05-01 08:38:48.385622...
@@ -3476,9 +3476,20 @@
 WHERE relkind IN ('r', 'i', 'S', 't', 'm') AND mapped_oid IS DISTINCT FROM oid;
 SELECT m.* FROM filenode_mapping m LEFT JOIN pg_class c ON c.oid = m.oid
 WHERE c.oid IS NOT NULL OR m.mapped_oid IS NOT NULL;
- oid | mapped_oid | reltablespace | relfilenode | relname 
------+------------+---------------+-------------+---------
-(0 rows)
+  oid  | mapped_oid | reltablespace | relfilenode |       relname        
+-------+------------+---------------+-------------+----------------------
+ 37806 |            |             0 |       37806 | pktable_pkey
+ 37803 |            |             0 |       37803 | pktable
+ 37808 |            |             0 |       37808 | fktable
+ 38334 |            |             0 |       38334 | pg_toast_38322
+ 38322 |            |             0 |       38331 | foo
+ 38335 |            |             0 |       38335 | pg_toast_38322_index
+ 38569 |            |             0 |       38569 | old_oids
+ 38587 |            |             0 |       38587 | pg_toast_38584
...

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/alter_table.out /tmp/cirrus-ci-build/build/testrun/recovery/027_...
--- /tmp/cirrus-ci-build/src/test/regress/expected/alter_table.out	2024-05-01 08:36:41.713604503 +0000
+++ /tmp/cirrus-ci-build/build/testrun/recovery/027_stream_regress/data/results/alter_table.out	2024-05-01 08:39:13.2256...
@@ -3476,9 +3476,29 @@
 WHERE relkind IN ('r', 'i', 'S', 't', 'm') AND mapped_oid IS DISTINCT FROM oid;
 SELECT m.* FROM filenode_mapping m LEFT JOIN pg_class c ON c.oid = m.oid
 WHERE c.oid IS NOT NULL OR m.mapped_oid IS NOT NULL;
- oid | mapped_oid | reltablespace | relfilenode | relname 
------+------------+---------------+-------------+---------
-(0 rows)
+  oid  | mapped_oid | reltablespace | relfilenode |       relname        
+-------+------------+---------------+-------------+----------------------
+ 38365 |            |             0 |       38365 | foo
+ 38030 |            |             0 |       38030 | users_id_seq
+ 38038 |            |             0 |       38038 | pg_toast_38031
+ 38039 |            |             0 |       38039 | pg_toast_38031_index
+ 38031 |            |             0 |       38031 | users
+ 38453 |            |             0 |       38453 | forc_test
+ 38789 |            |             0 |       38789 | pg_toast_38786
+ 38790 |            |             0 |       38790 | pg_toast_38786_index
...

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/alter_table.out /tmp/cirrus-ci-build/build/testrun/regress/regre...
--- /tmp/cirrus-ci-build/src/test/regress/expected/alter_table.out	2024-05-01 08:36:41.713604503 +0000
+++ /tmp/cirrus-ci-build/build/testrun/regress/regress/results/alter_table.out	2024-05-01 08:38:45.253622117 +0000
@@ -3476,9 +3476,29 @@
 WHERE relkind IN ('r', 'i', 'S', 't', 'm') AND mapped_oid IS DISTINCT FROM oid;
 SELECT m.* FROM filenode_mapping m LEFT JOIN pg_class c ON c.oid = m.oid
 WHERE c.oid IS NOT NULL OR m.mapped_oid IS NOT NULL;
- oid | mapped_oid | reltablespace | relfilenode | relname 
------+------------+---------------+-------------+---------
-(0 rows)
+  oid  | mapped_oid | reltablespace | relfilenode |       relname        
+-------+------------+---------------+-------------+----------------------
+ 37925 |            |             0 |       37925 | users_id_seq
+ 37931 |            |             0 |       37931 | pg_toast_37926
+ 37932 |            |             0 |       37932 | pg_toast_37926_index
+ 37926 |            |             0 |       37926 | users
+ 38101 |            |             0 |       38101 | foo
+ 38292 |            |             0 |       38292 | forc_test
+ 38809 |            |             0 |       38809 | pg_toast_38806
+ 38810 |            |             0 |       38810 | pg_toast_38806_index
...

diff -w -U3 C:/cirrus/src/test/regress/expected/alter_table.out C:/cirrus/build/testrun/pg_upgrade/002_pg_upgrade/data/r...
--- C:/cirrus/src/test/regress/expected/alter_table.out	2024-05-01 08:36:53.244543300 +0000
+++ C:/cirrus/build/testrun/pg_upgrade/002_pg_upgrade/data/results/alter_table.out	2024-05-01 08:40:33.373826700 +0000
@@ -3477,8 +3477,19 @@
 SELECT m.* FROM filenode_mapping m LEFT JOIN pg_class c ON c.oid = m.oid
 WHERE c.oid IS NOT NULL OR m.mapped_oid IS NOT NULL;
  oid | mapped_oid | reltablespace | relfilenode | relname 
------+------------+---------------+-------------+---------
-(0 rows)
+-------+------------+---------------+-------------+----------------------
+ 37589 |            |             0 |       37589 | pktable_pkey
+ 37586 |            |             0 |       37586 | pktable
+ 37591 |            |             0 |       37591 | fktable
+ 38084 |            |             0 |       38093 | foo
+ 38098 |            |             0 |       38098 | pg_toast_38084_index
+ 38097 |            |             0 |       38097 | pg_toast_38084
+ 38301 |            |             0 |       38301 | old_oids
+ 38318 |            |             0 |       38318 | pg_toast_38315
+ 38319 |            |             0 |       38319 | pg_toast_38315_index
+ 38315 |            |             0 |       38315 | recur2
...

diff -w -U3 C:/cirrus/src/test/regress/expected/alter_table.out C:/cirrus/build/testrun/recovery/027_stream_regress/data...
--- C:/cirrus/src/test/regress/expected/alter_table.out	2024-05-01 08:36:53.244543300 +0000
+++ C:/cirrus/build/testrun/recovery/027_stream_regress/data/results/alter_table.out	2024-05-01 08:42:49.897738300 +0000
@@ -3477,8 +3477,19 @@
 SELECT m.* FROM filenode_mapping m LEFT JOIN pg_class c ON c.oid = m.oid
 WHERE c.oid IS NOT NULL OR m.mapped_oid IS NOT NULL;
  oid | mapped_oid | reltablespace | relfilenode | relname 
------+------------+---------------+-------------+---------
-(0 rows)
+-------+------------+---------------+-------------+----------------------
+ 35955 |            |             0 |       35955 | pktable_pkey
+ 35952 |            |             0 |       35952 | pktable
+ 35957 |            |             0 |       35957 | fktable
+ 37930 |            |             0 |       37936 | foo
+ 37940 |            |             0 |       37940 | pg_toast_37930_index
+ 37939 |            |             0 |       37939 | pg_toast_37930
+ 38202 |            |             0 |       38202 | old_oids
+ 38219 |            |             0 |       38219 | pg_toast_38216
+ 38220 |            |             0 |       38220 | pg_toast_38216_index
+ 38216 |            |             0 |       38216 | recur2
...

diff -w -U3 C:/cirrus/src/test/regress/expected/alter_table.out C:/cirrus/build/testrun/regress/regress/results/alter_ta...
--- C:/cirrus/src/test/regress/expected/alter_table.out	2024-05-01 08:36:53.244543300 +0000
+++ C:/cirrus/build/testrun/regress/regress/results/alter_table.out	2024-05-01 08:40:29.415820500 +0000
@@ -3477,8 +3477,28 @@
 SELECT m.* FROM filenode_mapping m LEFT JOIN pg_class c ON c.oid = m.oid
 WHERE c.oid IS NOT NULL OR m.mapped_oid IS NOT NULL;
  oid | mapped_oid | reltablespace | relfilenode | relname 
------+------------+---------------+-------------+---------
-(0 rows)
+-------+------------+---------------+-------------+----------------------
+ 36641 |            |             0 |       36641 | pktable_pkey
+ 36637 |            |             0 |       36637 | pktable
+ 36648 |            |             0 |       36648 | fktable
+ 38316 |            |             0 |       38316 | forc_test
+ 38127 |            |             0 |       38127 | users_id_seq
+ 38135 |            |             0 |       38135 | pg_toast_38130
+ 38139 |            |             0 |       38139 | pg_toast_38130_index
+ 38130 |            |             0 |       38130 | users
+ 38208 |            |             0 |       38208 | foo
+ 38610 |            |             0 |       38610 | pg_toast_38607
...

diff -U3 /Users/admin/pgsql/src/test/regress/expected/alter_table.out /Users/admin/pgsql/build/testrun/pg_upgrade/002_pg...
--- /Users/admin/pgsql/src/test/regress/expected/alter_table.out	2024-05-01 08:36:50
+++ /Users/admin/pgsql/build/testrun/pg_upgrade/002_pg_upgrade/data/results/alter_table.out	2024-05-01 08:49:43
@@ -3476,9 +3476,20 @@
 WHERE relkind IN ('r', 'i', 'S', 't', 'm') AND mapped_oid IS DISTINCT FROM oid;
 SELECT m.* FROM filenode_mapping m LEFT JOIN pg_class c ON c.oid = m.oid
 WHERE c.oid IS NOT NULL OR m.mapped_oid IS NOT NULL;
- oid | mapped_oid | reltablespace | relfilenode | relname 
------+------------+---------------+-------------+---------
-(0 rows)
+  oid  | mapped_oid | reltablespace | relfilenode |       relname        
+-------+------------+---------------+-------------+----------------------
+ 37426 |            |             0 |       37426 | pktable_pkey
+ 37423 |            |             0 |       37423 | pktable
+ 37428 |            |             0 |       37428 | fktable
+ 38487 |            |             0 |       38492 | foo
+ 38496 |            |             0 |       38496 | pg_toast_38487_index
+ 38495 |            |             0 |       38495 | pg_toast_38487
+ 38683 |            |             0 |       38683 | old_oids
+ 38700 |            |             0 |       38700 | pg_toast_38697
...

diff -U3 /Users/admin/pgsql/src/test/regress/expected/alter_table.out /Users/admin/pgsql/build/testrun/recovery/027_stre...
--- /Users/admin/pgsql/src/test/regress/expected/alter_table.out	2024-05-01 08:36:50
+++ /Users/admin/pgsql/build/testrun/recovery/027_stream_regress/data/results/alter_table.out	2024-05-01 08:50:45
@@ -3476,9 +3476,20 @@
 WHERE relkind IN ('r', 'i', 'S', 't', 'm') AND mapped_oid IS DISTINCT FROM oid;
 SELECT m.* FROM filenode_mapping m LEFT JOIN pg_class c ON c.oid = m.oid
 WHERE c.oid IS NOT NULL OR m.mapped_oid IS NOT NULL;
- oid | mapped_oid | reltablespace | relfilenode | relname 
------+------------+---------------+-------------+---------
-(0 rows)
+  oid  | mapped_oid | reltablespace | relfilenode |       relname        
+-------+------------+---------------+-------------+----------------------
+ 37705 |            |             0 |       37705 | pktable_pkey
+ 37702 |            |             0 |       37702 | pktable
+ 37707 |            |             0 |       37707 | fktable
+ 38278 |            |             0 |       38283 | foo
+ 38287 |            |             0 |       38287 | pg_toast_38278_index
+ 38286 |            |             0 |       38286 | pg_toast_38278
+ 38531 |            |             0 |       38531 | old_oids
+ 38561 |            |             0 |       38561 | pg_toast_38557
...

diff -U3 /Users/admin/pgsql/src/test/regress/expected/alter_table.out /Users/admin/pgsql/build/testrun/regress/regress/r...
--- /Users/admin/pgsql/src/test/regress/expected/alter_table.out	2024-05-01 08:36:50
+++ /Users/admin/pgsql/build/testrun/regress/regress/results/alter_table.out	2024-05-01 08:49:43
@@ -3476,9 +3476,20 @@
 WHERE relkind IN ('r', 'i', 'S', 't', 'm') AND mapped_oid IS DISTINCT FROM oid;
 SELECT m.* FROM filenode_mapping m LEFT JOIN pg_class c ON c.oid = m.oid
 WHERE c.oid IS NOT NULL OR m.mapped_oid IS NOT NULL;
- oid | mapped_oid | reltablespace | relfilenode | relname 
------+------------+---------------+-------------+---------
-(0 rows)
+  oid  | mapped_oid | reltablespace | relfilenode |       relname        
+-------+------------+---------------+-------------+----------------------
+ 37488 |            |             0 |       37488 | pktable_pkey
+ 37479 |            |             0 |       37479 | pktable
+ 37496 |            |             0 |       37496 | fktable
+ 38425 |            |             0 |       38425 | pg_toast_38416_index
+ 38416 |            |             0 |       38421 | foo
+ 38424 |            |             0 |       38424 | pg_toast_38416
+ 38681 |            |             0 |       38681 | old_oids
+ 38698 |            |             0 |       38698 | pg_toast_38695
...

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/constraints.out /tmp/cirrus-ci-build/build/testrun/pg_upgrade/00...
--- /tmp/cirrus-ci-build/src/test/regress/expected/constraints.out	2024-05-01 05:36:37.274368000 +0000
+++ /tmp/cirrus-ci-build/build/testrun/pg_upgrade/002_pg_upgrade/data/results/constraints.out	2024-05-01 05:37:57.987776...
@@ -1212,91 +1212,7 @@
     "notnull_tbl4_lk2_pkey" PRIMARY KEY, btree (a) DEFERRABLE INITIALLY DEFERRED
 
 \d+ notnull_tbl4_lk3
-                             Table "public.notnull_tbl4_lk3"
- Column |  Type   | Collation | Nullable | Default | Storage | Stats target | Description 
---------+---------+-----------+----------+---------+---------+--------------+-------------
- a      | integer |           | not null |         | plain   |              | 
-Indexes:
-    "notnull_tbl4_lk3_pkey" PRIMARY KEY, btree (a) DEFERRABLE INITIALLY DEFERRED
-Not-null constraints:
-    "a_nn" NOT NULL "a"
-
-\d+ notnull_tbl4_cld
-                             Table "public.notnull_tbl4_cld"
- Column |  Type   | Collation | Nullable | Default | Storage | Stats target | Description 
---------+---------+-----------+----------+---------+---------+--------------+-------------
...

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/constraints.out /tmp/cirrus-ci-build/build/testrun/recovery/027_...
--- /tmp/cirrus-ci-build/src/test/regress/expected/constraints.out	2024-05-01 05:36:37.274368000 +0000
+++ /tmp/cirrus-ci-build/build/testrun/recovery/027_stream_regress/data/results/constraints.out	2024-05-01 05:38:19.4792...
@@ -1184,119 +1184,10 @@
 CREATE TABLE notnull_tbl4_cld () INHERITS (notnull_tbl4);
 CREATE TABLE notnull_tbl4_cld2 (PRIMARY KEY (a) DEFERRABLE) INHERITS (notnull_tbl4);
 CREATE TABLE notnull_tbl4_cld3 (PRIMARY KEY (a) DEFERRABLE, CONSTRAINT a_nn NOT NULL a) INHERITS (notnull_tbl4);
-\d+ notnull_tbl4
-                               Table "public.notnull_tbl4"
- Column |  Type   | Collation | Nullable | Default | Storage | Stats target | Description 
---------+---------+-----------+----------+---------+---------+--------------+-------------
- a      | integer |           | not null |         | plain   |              | 
-Indexes:
-    "notnull_tbl4_pkey" PRIMARY KEY, btree (a) DEFERRABLE INITIALLY DEFERRED
-Child tables: notnull_tbl4_cld,
-              notnull_tbl4_cld2,
-              notnull_tbl4_cld3
-
-\d+ notnull_tbl4_lk
-                              Table "public.notnull_tbl4_lk"
...

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/constraints.out /tmp/cirrus-ci-build/build/testrun/regress/regre...
--- /tmp/cirrus-ci-build/src/test/regress/expected/constraints.out	2024-05-01 05:36:37.274368000 +0000
+++ /tmp/cirrus-ci-build/build/testrun/regress/regress/results/constraints.out	2024-05-01 05:37:54.982730000 +0000
@@ -1231,72 +1231,10 @@
 Inherits: notnull_tbl4
 
 \d+ notnull_tbl4_cld2
-                             Table "public.notnull_tbl4_cld2"
- Column |  Type   | Collation | Nullable | Default | Storage | Stats target | Description 
---------+---------+-----------+----------+---------+---------+--------------+-------------
- a      | integer |           | not null |         | plain   |              | 
-Indexes:
-    "notnull_tbl4_cld2_pkey" PRIMARY KEY, btree (a) DEFERRABLE
-Not-null constraints:
-    "notnull_tbl4_cld2_a_not_null" NOT NULL "a" (inherited)
-Inherits: notnull_tbl4
-
-\d+ notnull_tbl4_cld3
-                             Table "public.notnull_tbl4_cld3"
- Column |  Type   | Collation | Nullable | Default | Storage | Stats target | Description 
...

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/triggers.out /tmp/cirrus-ci-build/src/bin/pg_upgrade/tmp_check/r...
--- /tmp/cirrus-ci-build/src/test/regress/expected/triggers.out	2024-05-01 05:36:36.425303423 +0000
+++ /tmp/cirrus-ci-build/src/bin/pg_upgrade/tmp_check/results/triggers.out	2024-05-01 05:39:37.917179121 +0000
@@ -2900,847 +2900,10 @@
 ERROR:  except
 CONTEXT:  PL/pgSQL function tgf() line 1 at RAISE
 DROP TABLE trgfire;
-DROP FUNCTION tgf();
---
--- Test the interaction between transition tables and both kinds of
--- inheritance.  We'll dump the contents of the transition tables in a
--- format that shows the attribute order, so that we can distinguish
--- tuple formats (though not dropped attributes).
---
-create or replace function dump_insert() returns trigger language plpgsql as
-$$
-  begin
-    raise notice 'trigger = %, new table = %',
-                 TG_NAME,
-                 (select string_agg(new_table::text, ', ' order by a) from new_table);
...

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/triggers.out /tmp/cirrus-ci-build/src/test/regress/results/trigg...
--- /tmp/cirrus-ci-build/src/test/regress/expected/triggers.out	2024-05-01 05:36:36.425303423 +0000
+++ /tmp/cirrus-ci-build/src/test/regress/results/triggers.out	2024-05-01 05:38:52.829215659 +0000
@@ -2960,787 +2960,10 @@
 create trigger parent_delete_trig
   after delete on parent referencing old table as old_table
   for each statement execute procedure dump_delete();
-create trigger child1_insert_trig
-  after insert on child1 referencing new table as new_table
-  for each statement execute procedure dump_insert();
-create trigger child1_update_trig
-  after update on child1 referencing old table as old_table new table as new_table
-  for each statement execute procedure dump_update();
-create trigger child1_delete_trig
-  after delete on child1 referencing old table as old_table
-  for each statement execute procedure dump_delete();
-create trigger child2_insert_trig
-  after insert on child2 referencing new table as new_table
-  for each statement execute procedure dump_insert();
-create trigger child2_update_trig
...

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/triggers.out /tmp/cirrus-ci-build/build/testrun/pg_upgrade/002_p...
--- /tmp/cirrus-ci-build/src/test/regress/expected/triggers.out	2024-05-01 05:36:37.182177527 +0000
+++ /tmp/cirrus-ci-build/build/testrun/pg_upgrade/002_pg_upgrade/data/results/triggers.out	2024-05-01 05:39:20.713960624...
@@ -2580,1167 +2580,10 @@
   partition by range (b);
 create table parted_constr (a int, b text)
   partition by range (b);
-alter table parted_constr_ancestor attach partition parted_constr
-  for values from ('aaaa') to ('zzzz');
-create table parted1_constr (a int, b text);
-alter table parted_constr attach partition parted1_constr
-  for values from ('aaaa') to ('bbbb');
-create constraint trigger parted_trig after insert on parted_constr_ancestor
-  deferrable
-  for each row execute procedure trigger_notice_ab();
-create constraint trigger parted_trig_two after insert on parted_constr
-  deferrable initially deferred
-  for each row when (bark(new.b) AND new.a % 2 = 1)
-  execute procedure trigger_notice_ab();
--- The immediate constraint is fired immediately; the WHEN clause of the
...

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/constraints.out /tmp/cirrus-ci-build/build/testrun/recovery/027_...
--- /tmp/cirrus-ci-build/src/test/regress/expected/constraints.out	2024-05-01 05:36:37.102177560 +0000
+++ /tmp/cirrus-ci-build/build/testrun/recovery/027_stream_regress/data/results/constraints.out	2024-05-01 05:39:38.1219...
@@ -934,369 +934,10 @@
 -- make sure attnotnull is reset correctly when a PK is dropped indirectly,
 -- or kept if there's a reason for that
 CREATE TABLE notnull_tbl1 (c0 int, c1 int, PRIMARY KEY (c0, c1));
-ALTER TABLE  notnull_tbl1 DROP c1;
-\d+ notnull_tbl1
-                               Table "public.notnull_tbl1"
- Column |  Type   | Collation | Nullable | Default | Storage | Stats target | Description 
---------+---------+-----------+----------+---------+---------+--------------+-------------
- c0     | integer |           |          |         | plain   |              | 
-
-DROP TABLE notnull_tbl1;
--- same, via dropping a domain
-CREATE DOMAIN notnull_dom1 AS INTEGER;
-CREATE TABLE notnull_tbl1 (c0 notnull_dom1, c1 int, PRIMARY KEY (c0, c1));
-DROP DOMAIN notnull_dom1 CASCADE;
-NOTICE:  drop cascades to column c0 of table notnull_tbl1
...

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/triggers.out /tmp/cirrus-ci-build/build/testrun/regress/regress/...
--- /tmp/cirrus-ci-build/src/test/regress/expected/triggers.out	2024-05-01 05:36:37.182177527 +0000
+++ /tmp/cirrus-ci-build/build/testrun/regress/regress/results/triggers.out	2024-05-01 05:39:17.161965019 +0000
@@ -2187,1560 +2187,10 @@
 create trigger samename after delete on trigpart execute function trigger_nothing();
 create trigger samename after delete on trigpart1 execute function trigger_nothing();
 \d trigpart1
-             Table "public.trigpart1"
- Column |  Type   | Collation | Nullable | Default 
---------+---------+-----------+----------+---------
- a      | integer |           |          | 
- b      | integer |           |          | 
-Partition of: trigpart FOR VALUES FROM (0) TO (1000)
-Triggers:
-    samename AFTER DELETE ON trigpart1 FOR EACH STATEMENT EXECUTE FUNCTION trigger_nothing()
-    trg1 AFTER INSERT ON trigpart1 FOR EACH ROW EXECUTE FUNCTION trigger_nothing(), ON TABLE trigpart
-
-drop table trigpart;
-drop function trigger_nothing();
---
...

diff -w -U3 C:/cirrus/src/test/regress/expected/updatable_views.out C:/cirrus/build/testrun/pg_upgrade/002_pg_upgrade/da...
--- C:/cirrus/src/test/regress/expected/updatable_views.out	2024-05-01 05:36:53.943774200 +0000
+++ C:/cirrus/build/testrun/pg_upgrade/002_pg_upgrade/data/results/updatable_views.out	2024-05-01 05:39:26.369445100 +00...
@@ -1155,2847 +1155,7 @@
   WHEN MATCHED THEN UPDATE SET b = s.b
   WHEN NOT MATCHED AND s.a > 0 THEN INSERT VALUES (s.a, s.b)
   RETURNING merge_action(), s.*, t.*;
- merge_action | a | b  | a |   b   
---------------+---+----+---+-------
- DELETE       | 1 | R1 | 1 | Row 1
- UPDATE       | 2 | R2 | 2 | R2
- INSERT       | 3 | R3 | 3 | R3
-(3 rows)
-
-SELECT * FROM base_tbl ORDER BY a;
- a  |   b    
-----+--------
- -2 | Row -2
- -1 | Row -1
-  0 | Row 0
...

diff -w -U3 C:/cirrus/src/test/regress/expected/updatable_views.out C:/cirrus/build/testrun/recovery/027_stream_regress/...
--- C:/cirrus/src/test/regress/expected/updatable_views.out	2024-05-01 05:36:53.943774200 +0000
+++ C:/cirrus/build/testrun/recovery/027_stream_regress/data/results/updatable_views.out	2024-05-01 05:41:19.779219200 +...
@@ -1155,2847 +1155,7 @@
   WHEN MATCHED THEN UPDATE SET b = s.b
   WHEN NOT MATCHED AND s.a > 0 THEN INSERT VALUES (s.a, s.b)
   RETURNING merge_action(), s.*, t.*;
- merge_action | a | b  | a |   b   
---------------+---+----+---+-------
- DELETE       | 1 | R1 | 1 | Row 1
- UPDATE       | 2 | R2 | 2 | R2
- INSERT       | 3 | R3 | 3 | R3
-(3 rows)
-
-SELECT * FROM base_tbl ORDER BY a;
- a  |   b    
-----+--------
- -2 | Row -2
- -1 | Row -1
-  0 | Row 0
...

diff -w -U3 C:/cirrus/src/test/regress/expected/updatable_views.out C:/cirrus/build/testrun/regress/regress/results/upda...
--- C:/cirrus/src/test/regress/expected/updatable_views.out	2024-05-01 05:36:53.943774200 +0000
+++ C:/cirrus/build/testrun/regress/regress/results/updatable_views.out	2024-05-01 05:39:25.663873700 +0000
@@ -1155,2847 +1155,7 @@
   WHEN MATCHED THEN UPDATE SET b = s.b
   WHEN NOT MATCHED AND s.a > 0 THEN INSERT VALUES (s.a, s.b)
   RETURNING merge_action(), s.*, t.*;
- merge_action | a | b  | a |   b   
---------------+---+----+---+-------
- DELETE       | 1 | R1 | 1 | Row 1
- UPDATE       | 2 | R2 | 2 | R2
- INSERT       | 3 | R3 | 3 | R3
-(3 rows)
-
-SELECT * FROM base_tbl ORDER BY a;
- a  |   b    
-----+--------
- -2 | Row -2
- -1 | Row -1
-  0 | Row 0
...

diff -U3 /Users/admin/pgsql/src/test/regress/expected/updatable_views.out /Users/admin/pgsql/build/testrun/pg_upgrade/00...
--- /Users/admin/pgsql/src/test/regress/expected/updatable_views.out	2024-05-01 05:35:51
+++ /Users/admin/pgsql/build/testrun/pg_upgrade/002_pg_upgrade/data/results/updatable_views.out	2024-05-01 05:42:35
@@ -1152,2850 +1152,10 @@
 MERGE INTO rw_view2 t
   USING (SELECT x, 'R'||x FROM generate_series(0,3) x) AS s(a,b) ON t.a = s.a
   WHEN MATCHED AND t.a <= 1 THEN DELETE
-  WHEN MATCHED THEN UPDATE SET b = s.b
-  WHEN NOT MATCHED AND s.a > 0 THEN INSERT VALUES (s.a, s.b)
-  RETURNING merge_action(), s.*, t.*;
- merge_action | a | b  | a |   b   
---------------+---+----+---+-------
- DELETE       | 1 | R1 | 1 | Row 1
- UPDATE       | 2 | R2 | 2 | R2
- INSERT       | 3 | R3 | 3 | R3
-(3 rows)
-
-SELECT * FROM base_tbl ORDER BY a;
- a  |   b    
-----+--------
...

diff -U3 /Users/admin/pgsql/src/test/regress/expected/constraints.out /Users/admin/pgsql/build/testrun/recovery/027_stre...
--- /Users/admin/pgsql/src/test/regress/expected/constraints.out	2024-05-01 05:35:51
+++ /Users/admin/pgsql/build/testrun/recovery/027_stream_regress/data/results/constraints.out	2024-05-01 05:42:55
@@ -1034,269 +1034,16 @@
 -- Primary keys in parent table cause NOT NULL constraint to spawn on their
 -- children.  Verify that they work correctly.
 CREATE TABLE cnn_parent (a int, b int);
-CREATE TABLE cnn_child () INHERITS (cnn_parent);
-CREATE TABLE cnn_grandchild (NOT NULL b) INHERITS (cnn_child);
-CREATE TABLE cnn_child2 (NOT NULL a NO INHERIT) INHERITS (cnn_parent);
-CREATE TABLE cnn_grandchild2 () INHERITS (cnn_grandchild, cnn_child2);
-NOTICE:  merging multiple inherited definitions of column "a"
-NOTICE:  merging multiple inherited definitions of column "b"
-ALTER TABLE cnn_parent ADD PRIMARY KEY (b);
-\d+ cnn_grandchild
-                              Table "public.cnn_grandchild"
- Column |  Type   | Collation | Nullable | Default | Storage | Stats target | Description 
---------+---------+-----------+----------+---------+---------+--------------+-------------
- a      | integer |           |          |         | plain   |              | 
- b      | integer |           | not null |         | plain   |              | 
...

diff -U3 /Users/admin/pgsql/src/test/regress/expected/updatable_views.out /Users/admin/pgsql/build/testrun/regress/regre...
--- /Users/admin/pgsql/src/test/regress/expected/updatable_views.out	2024-05-01 05:35:51
+++ /Users/admin/pgsql/build/testrun/regress/regress/results/updatable_views.out	2024-05-01 05:42:35
@@ -1152,2850 +1152,10 @@
 MERGE INTO rw_view2 t
   USING (SELECT x, 'R'||x FROM generate_series(0,3) x) AS s(a,b) ON t.a = s.a
   WHEN MATCHED AND t.a <= 1 THEN DELETE
-  WHEN MATCHED THEN UPDATE SET b = s.b
-  WHEN NOT MATCHED AND s.a > 0 THEN INSERT VALUES (s.a, s.b)
-  RETURNING merge_action(), s.*, t.*;
- merge_action | a | b  | a |   b   
---------------+---+----+---+-------
- DELETE       | 1 | R1 | 1 | Row 1
- UPDATE       | 2 | R2 | 2 | R2
- INSERT       | 3 | R3 | 3 | R3
-(3 rows)
-
-SELECT * FROM base_tbl ORDER BY a;
- a  |   b    
-----+--------
...

diff -U3 /tmp/cirrus-ci-build/contrib/postgres_fdw/expected/postgres_fdw.out /tmp/cirrus-ci-build/contrib/postgres_fdw/r...
--- /tmp/cirrus-ci-build/contrib/postgres_fdw/expected/postgres_fdw.out	2024-05-01 04:11:03.373386943 +0000
+++ /tmp/cirrus-ci-build/contrib/postgres_fdw/results/postgres_fdw.out	2024-05-01 04:18:09.213332069 +0000
@@ -2754,6 +2754,7 @@
 SET LOCAL statement_timeout = '10ms';
 select count(*) from ft1 CROSS JOIN ft2 CROSS JOIN ft4 CROSS JOIN ft5; -- this takes very long
 ERROR:  canceling statement due to statement timeout
+WARNING:  could not get result of cancel request due to timeout
 COMMIT;
 -- ====================================================================
 -- Check that userid to use when querying the remote table is correctly

diff -U3 /tmp/cirrus-ci-build/contrib/btree_gist/expected/without_overlaps.out /tmp/cirrus-ci-build/build/testrun/btree_...
--- /tmp/cirrus-ci-build/contrib/btree_gist/expected/without_overlaps.out	2024-04-30 17:05:00.055931000 +0000
+++ /tmp/cirrus-ci-build/build/testrun/btree_gist/regress/results/without_overlaps.out	2024-04-30 17:07:14.641835000 +00...
@@ -16,6 +16,8 @@
  valid_at | daterange |           | not null | 
 Indexes:
     "temporal_rng_pk" PRIMARY KEY (id, valid_at WITHOUT OVERLAPS)
+Check constraints:
+    "valid_at_not_empty" CHECK (NOT isempty(valid_at))
 
 SELECT pg_get_constraintdef(oid) FROM pg_constraint WHERE conname = 'temporal_rng_pk';
             pg_get_constraintdef             
@@ -60,6 +62,8 @@
  parent_id | integer   |           |          | 
 Indexes:
     "temporal_fk_rng2rng_pk" PRIMARY KEY (id, valid_at WITHOUT OVERLAPS)
+Check constraints:
+    "valid_at_not_empty" CHECK (NOT isempty(valid_at))
 Foreign-key constraints:
     "temporal_fk_rng2rng_fk" FOREIGN KEY (parent_id, PERIOD valid_at) REFERENCES temporal_rng(id, PERIOD valid_at)
...

diff -U3 /tmp/cirrus-ci-build/contrib/btree_gist/expected/without_overlaps.out /tmp/cirrus-ci-build/contrib/btree_gist/r...
--- /tmp/cirrus-ci-build/contrib/btree_gist/expected/without_overlaps.out	2024-04-30 17:04:53.439100325 +0000
+++ /tmp/cirrus-ci-build/contrib/btree_gist/results/without_overlaps.out	2024-04-30 17:08:22.962922380 +0000
@@ -16,6 +16,8 @@
  valid_at | daterange |           | not null | 
 Indexes:
     "temporal_rng_pk" PRIMARY KEY (id, valid_at WITHOUT OVERLAPS)
+Check constraints:
+    "valid_at_not_empty" CHECK (NOT isempty(valid_at))
 
 SELECT pg_get_constraintdef(oid) FROM pg_constraint WHERE conname = 'temporal_rng_pk';
             pg_get_constraintdef             
@@ -60,6 +62,8 @@
  parent_id | integer   |           |          | 
 Indexes:
     "temporal_fk_rng2rng_pk" PRIMARY KEY (id, valid_at WITHOUT OVERLAPS)
+Check constraints:
+    "valid_at_not_empty" CHECK (NOT isempty(valid_at))
 Foreign-key constraints:
     "temporal_fk_rng2rng_fk" FOREIGN KEY (parent_id, PERIOD valid_at) REFERENCES temporal_rng(id, PERIOD valid_at)
...

diff -U3 /tmp/cirrus-ci-build/contrib/btree_gist/expected/without_overlaps.out /tmp/cirrus-ci-build/build/testrun/btree_...
--- /tmp/cirrus-ci-build/contrib/btree_gist/expected/without_overlaps.out	2024-04-30 17:04:53.598216165 +0000
+++ /tmp/cirrus-ci-build/build/testrun/btree_gist/regress/results/without_overlaps.out	2024-04-30 17:09:07.910013970 +00...
@@ -16,6 +16,8 @@
  valid_at | daterange |           | not null | 
 Indexes:
     "temporal_rng_pk" PRIMARY KEY (id, valid_at WITHOUT OVERLAPS)
+Check constraints:
+    "valid_at_not_empty" CHECK (NOT isempty(valid_at))
 
 SELECT pg_get_constraintdef(oid) FROM pg_constraint WHERE conname = 'temporal_rng_pk';
             pg_get_constraintdef             
@@ -60,6 +62,8 @@
  parent_id | integer   |           |          | 
 Indexes:
     "temporal_fk_rng2rng_pk" PRIMARY KEY (id, valid_at WITHOUT OVERLAPS)
+Check constraints:
+    "valid_at_not_empty" CHECK (NOT isempty(valid_at))
 Foreign-key constraints:
     "temporal_fk_rng2rng_fk" FOREIGN KEY (parent_id, PERIOD valid_at) REFERENCES temporal_rng(id, PERIOD valid_at)
...

diff -w -U3 C:/cirrus/contrib/btree_gist/expected/without_overlaps.out C:/cirrus/build/testrun/btree_gist/regress/result...
--- C:/cirrus/contrib/btree_gist/expected/without_overlaps.out	2024-04-30 17:05:06.889670800 +0000
+++ C:/cirrus/build/testrun/btree_gist/regress/results/without_overlaps.out	2024-04-30 17:10:47.760962100 +0000
@@ -16,6 +16,8 @@
  valid_at | daterange |           | not null | 
 Indexes:
     "temporal_rng_pk" PRIMARY KEY (id, valid_at WITHOUT OVERLAPS)
+Check constraints:
+    "valid_at_not_empty" CHECK (NOT isempty(valid_at))
 
 SELECT pg_get_constraintdef(oid) FROM pg_constraint WHERE conname = 'temporal_rng_pk';
             pg_get_constraintdef             
@@ -60,6 +62,8 @@
  parent_id | integer   |           |          | 
 Indexes:
     "temporal_fk_rng2rng_pk" PRIMARY KEY (id, valid_at WITHOUT OVERLAPS)
+Check constraints:
+    "valid_at_not_empty" CHECK (NOT isempty(valid_at))
 Foreign-key constraints:
     "temporal_fk_rng2rng_fk" FOREIGN KEY (parent_id, PERIOD valid_at) REFERENCES temporal_rng(id, PERIOD valid_at)
...

diff -U3 /Users/admin/pgsql/contrib/btree_gist/expected/without_overlaps.out /Users/admin/pgsql/build/testrun/btree_gist...
--- /Users/admin/pgsql/contrib/btree_gist/expected/without_overlaps.out	2024-04-30 17:05:10
+++ /Users/admin/pgsql/build/testrun/btree_gist/regress/results/without_overlaps.out	2024-04-30 17:08:05
@@ -16,6 +16,8 @@
  valid_at | daterange |           | not null | 
 Indexes:
     "temporal_rng_pk" PRIMARY KEY (id, valid_at WITHOUT OVERLAPS)
+Check constraints:
+    "valid_at_not_empty" CHECK (NOT isempty(valid_at))
 
 SELECT pg_get_constraintdef(oid) FROM pg_constraint WHERE conname = 'temporal_rng_pk';
             pg_get_constraintdef             
@@ -60,6 +62,8 @@
  parent_id | integer   |           |          | 
 Indexes:
     "temporal_fk_rng2rng_pk" PRIMARY KEY (id, valid_at WITHOUT OVERLAPS)
+Check constraints:
+    "valid_at_not_empty" CHECK (NOT isempty(valid_at))
 Foreign-key constraints:
     "temporal_fk_rng2rng_fk" FOREIGN KEY (parent_id, PERIOD valid_at) REFERENCES temporal_rng(id, PERIOD valid_at)
...

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/sysviews.out /tmp/cirrus-ci-build/build/testrun/pg_upgrade/002_p...
--- /tmp/cirrus-ci-build/src/test/regress/expected/sysviews.out	2024-04-30 15:32:09.457000000 +0000
+++ /tmp/cirrus-ci-build/build/testrun/pg_upgrade/002_pg_upgrade/data/results/sysviews.out	2024-04-30 15:33:48.728155000...
@@ -157,7 +157,8 @@
  enable_seqscan                 | on
  enable_sort                    | on
  enable_tidscan                 | on
-(23 rows)
+ enable_toast_cache             | off
+(24 rows)
 
 -- There are always wait event descriptions for various types.
 select type, count(*) > 0 as ok FROM pg_wait_events

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/sysviews.out /tmp/cirrus-ci-build/build/testrun/recovery/027_str...
--- /tmp/cirrus-ci-build/src/test/regress/expected/sysviews.out	2024-04-30 15:32:09.457000000 +0000
+++ /tmp/cirrus-ci-build/build/testrun/recovery/027_stream_regress/data/results/sysviews.out	2024-04-30 15:34:23.3948060...
@@ -157,7 +157,8 @@
  enable_seqscan                 | on
  enable_sort                    | on
  enable_tidscan                 | on
-(23 rows)
+ enable_toast_cache             | off
+(24 rows)
 
 -- There are always wait event descriptions for various types.
 select type, count(*) > 0 as ok FROM pg_wait_events

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/sysviews.out /tmp/cirrus-ci-build/build/testrun/regress/regress/...
--- /tmp/cirrus-ci-build/src/test/regress/expected/sysviews.out	2024-04-30 15:32:09.457000000 +0000
+++ /tmp/cirrus-ci-build/build/testrun/regress/regress/results/sysviews.out	2024-04-30 15:33:45.031673000 +0000
@@ -157,7 +157,8 @@
  enable_seqscan                 | on
  enable_sort                    | on
  enable_tidscan                 | on
-(23 rows)
+ enable_toast_cache             | off
+(24 rows)
 
 -- There are always wait event descriptions for various types.
 select type, count(*) > 0 as ok FROM pg_wait_events

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/sysviews.out /tmp/cirrus-ci-build/src/bin/pg_upgrade/tmp_check/r...
--- /tmp/cirrus-ci-build/src/test/regress/expected/sysviews.out	2024-04-30 15:32:06.672170681 +0000
+++ /tmp/cirrus-ci-build/src/bin/pg_upgrade/tmp_check/results/sysviews.out	2024-04-30 15:36:53.027908172 +0000
@@ -157,7 +157,8 @@
  enable_seqscan                 | on
  enable_sort                    | on
  enable_tidscan                 | on
-(23 rows)
+ enable_toast_cache             | off
+(24 rows)
 
 -- There are always wait event descriptions for various types.
 select type, count(*) > 0 as ok FROM pg_wait_events

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/sysviews.out /tmp/cirrus-ci-build/src/test/recovery/tmp_check/re...
--- /tmp/cirrus-ci-build/src/test/regress/expected/sysviews.out	2024-04-30 15:32:06.672170681 +0000
+++ /tmp/cirrus-ci-build/src/test/recovery/tmp_check/results/sysviews.out	2024-04-30 15:38:18.607836904 +0000
@@ -157,7 +157,8 @@
  enable_seqscan                 | on
  enable_sort                    | on
  enable_tidscan                 | on
-(23 rows)
+ enable_toast_cache             | off
+(24 rows)
 
 -- There are always wait event descriptions for various types.
 select type, count(*) > 0 as ok FROM pg_wait_events

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/sysviews.out /tmp/cirrus-ci-build/src/test/regress/results/sysvi...
--- /tmp/cirrus-ci-build/src/test/regress/expected/sysviews.out	2024-04-30 15:32:06.672170681 +0000
+++ /tmp/cirrus-ci-build/src/test/regress/results/sysviews.out	2024-04-30 15:35:25.739982150 +0000
@@ -157,7 +157,8 @@
  enable_seqscan                 | on
  enable_sort                    | on
  enable_tidscan                 | on
-(23 rows)
+ enable_toast_cache             | off
+(24 rows)
 
 -- There are always wait event descriptions for various types.
 select type, count(*) > 0 as ok FROM pg_wait_events

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/sysviews.out /tmp/cirrus-ci-build/build/testrun/pg_upgrade/002_p...
--- /tmp/cirrus-ci-build/src/test/regress/expected/sysviews.out	2024-04-30 15:32:08.077058318 +0000
+++ /tmp/cirrus-ci-build/build/testrun/pg_upgrade/002_pg_upgrade/data/results/sysviews.out	2024-04-30 15:35:47.688520650...
@@ -157,7 +157,8 @@
  enable_seqscan                 | on
  enable_sort                    | on
  enable_tidscan                 | on
-(23 rows)
+ enable_toast_cache             | off
+(24 rows)
 
 -- There are always wait event descriptions for various types.
 select type, count(*) > 0 as ok FROM pg_wait_events

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/sysviews.out /tmp/cirrus-ci-build/build/testrun/recovery/027_str...
--- /tmp/cirrus-ci-build/src/test/regress/expected/sysviews.out	2024-04-30 15:32:08.077058318 +0000
+++ /tmp/cirrus-ci-build/build/testrun/recovery/027_stream_regress/data/results/sysviews.out	2024-04-30 15:36:22.2044160...
@@ -157,7 +157,8 @@
  enable_seqscan                 | on
  enable_sort                    | on
  enable_tidscan                 | on
-(23 rows)
+ enable_toast_cache             | off
+(24 rows)
 
 -- There are always wait event descriptions for various types.
 select type, count(*) > 0 as ok FROM pg_wait_events

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/sysviews.out /tmp/cirrus-ci-build/build/testrun/regress/regress/...
--- /tmp/cirrus-ci-build/src/test/regress/expected/sysviews.out	2024-04-30 15:32:08.077058318 +0000
+++ /tmp/cirrus-ci-build/build/testrun/regress/regress/results/sysviews.out	2024-04-30 15:35:43.780531281 +0000
@@ -157,7 +157,8 @@
  enable_seqscan                 | on
  enable_sort                    | on
  enable_tidscan                 | on
-(23 rows)
+ enable_toast_cache             | off
+(24 rows)
 
 -- There are always wait event descriptions for various types.
 select type, count(*) > 0 as ok FROM pg_wait_events

diff -w -U3 C:/cirrus/src/test/regress/expected/sysviews.out C:/cirrus/build/testrun/pg_upgrade/002_pg_upgrade/data/resu...
--- C:/cirrus/src/test/regress/expected/sysviews.out	2024-04-30 15:32:26.555544000 +0000
+++ C:/cirrus/build/testrun/pg_upgrade/002_pg_upgrade/data/results/sysviews.out	2024-04-30 15:35:24.574949300 +0000
@@ -157,7 +157,8 @@
  enable_seqscan                 | on
  enable_sort                    | on
  enable_tidscan                 | on
-(23 rows)
+ enable_toast_cache             | off
+(24 rows)
 
 -- There are always wait event descriptions for various types.
 select type, count(*) > 0 as ok FROM pg_wait_events

diff -w -U3 C:/cirrus/src/test/regress/expected/sysviews.out C:/cirrus/build/testrun/recovery/027_stream_regress/data/re...
--- C:/cirrus/src/test/regress/expected/sysviews.out	2024-04-30 15:32:26.555544000 +0000
+++ C:/cirrus/build/testrun/recovery/027_stream_regress/data/results/sysviews.out	2024-04-30 15:37:28.484327400 +0000
@@ -157,7 +157,8 @@
  enable_seqscan                 | on
  enable_sort                    | on
  enable_tidscan                 | on
-(23 rows)
+ enable_toast_cache             | off
+(24 rows)
 
 -- There are always wait event descriptions for various types.
 select type, count(*) > 0 as ok FROM pg_wait_events

diff -w -U3 C:/cirrus/src/test/regress/expected/sysviews.out C:/cirrus/build/testrun/regress/regress/results/sysviews.ou...
--- C:/cirrus/src/test/regress/expected/sysviews.out	2024-04-30 15:32:26.555544000 +0000
+++ C:/cirrus/build/testrun/regress/regress/results/sysviews.out	2024-04-30 15:35:16.971408800 +0000
@@ -157,7 +157,8 @@
  enable_seqscan                 | on
  enable_sort                    | on
  enable_tidscan                 | on
-(23 rows)
+ enable_toast_cache             | off
+(24 rows)
 
 -- There are always wait event descriptions for various types.
 select type, count(*) > 0 as ok FROM pg_wait_events

diff -U3 /Users/admin/pgsql/src/test/regress/expected/sysviews.out /Users/admin/pgsql/build/testrun/pg_upgrade/002_pg_up...
--- /Users/admin/pgsql/src/test/regress/expected/sysviews.out	2024-04-30 15:32:18
+++ /Users/admin/pgsql/build/testrun/pg_upgrade/002_pg_upgrade/data/results/sysviews.out	2024-04-30 15:33:34
@@ -157,7 +157,8 @@
  enable_seqscan                 | on
  enable_sort                    | on
  enable_tidscan                 | on
-(23 rows)
+ enable_toast_cache             | off
+(24 rows)
 
 -- There are always wait event descriptions for various types.
 select type, count(*) > 0 as ok FROM pg_wait_events

diff -U3 /Users/admin/pgsql/src/test/regress/expected/sysviews.out /Users/admin/pgsql/build/testrun/recovery/027_stream_...
--- /Users/admin/pgsql/src/test/regress/expected/sysviews.out	2024-04-30 15:32:18
+++ /Users/admin/pgsql/build/testrun/recovery/027_stream_regress/data/results/sysviews.out	2024-04-30 15:35:03
@@ -157,7 +157,8 @@
  enable_seqscan                 | on
  enable_sort                    | on
  enable_tidscan                 | on
-(23 rows)
+ enable_toast_cache             | off
+(24 rows)
 
 -- There are always wait event descriptions for various types.
 select type, count(*) > 0 as ok FROM pg_wait_events

diff -U3 /Users/admin/pgsql/src/test/regress/expected/sysviews.out /Users/admin/pgsql/build/testrun/regress/regress/resu...
--- /Users/admin/pgsql/src/test/regress/expected/sysviews.out	2024-04-30 15:32:18
+++ /Users/admin/pgsql/build/testrun/regress/regress/results/sysviews.out	2024-04-30 15:33:34
@@ -157,7 +157,8 @@
  enable_seqscan                 | on
  enable_sort                    | on
  enable_tidscan                 | on
-(23 rows)
+ enable_toast_cache             | off
+(24 rows)
 
 -- There are always wait event descriptions for various types.
 select type, count(*) > 0 as ok FROM pg_wait_events

diff -w -U3 C:/cirrus/src/test/modules/test_pg_dump/expected/test_pg_dump.out C:/cirrus/build/testrun/test_pg_dump/regre...
--- C:/cirrus/src/test/modules/test_pg_dump/expected/test_pg_dump.out	2024-04-30 14:31:11.978486600 +0000
+++ C:/cirrus/build/testrun/test_pg_dump/regress/results/test_pg_dump.out	2024-04-30 14:38:07.268427100 +0000
@@ -75,64 +75,64 @@
   aclexplode(s.initprivs) a;
                         obj                         | grantor  |        grantee         | privilege_type | is_grantable...
 ----------------------------------------------------+----------+------------------------+----------------+-------------...
- column col1 of table regress_pg_dump_table         | postgres | -                      | SELECT         | f
- function regress_pg_dump_schema.test_agg(smallint) | postgres | -                      | EXECUTE        | f
- function regress_pg_dump_schema.test_agg(smallint) | postgres | postgres               | EXECUTE        | f
- function regress_pg_dump_schema.test_agg(smallint) | postgres | regress_dump_test_role | EXECUTE        | f
- function regress_pg_dump_schema.test_func()        | postgres | -                      | EXECUTE        | f
- function regress_pg_dump_schema.test_func()        | postgres | postgres               | EXECUTE        | f
- function regress_pg_dump_schema.test_func()        | postgres | regress_dump_test_role | EXECUTE        | f
- function wgo_then_no_access()                      | postgres | -                      | EXECUTE        | f
- function wgo_then_no_access()                      | postgres | postgres               | EXECUTE        | f
- function wgo_then_no_access()                      | postgres | pg_signal_backend      | EXECUTE        | t
- sequence regress_pg_dump_schema.test_seq           | postgres | postgres               | SELECT         | f
- sequence regress_pg_dump_schema.test_seq           | postgres | postgres               | UPDATE         | f
- sequence regress_pg_dump_schema.test_seq           | postgres | postgres               | USAGE          | f
...

diff -w -U3 C:/cirrus/src/test/modules/test_pg_dump/expected/test_pg_dump.out C:/cirrus/build/testrun/test_pg_dump/regre...
--- C:/cirrus/src/test/modules/test_pg_dump/expected/test_pg_dump.out	2024-04-30 14:30:47.784983000 +0000
+++ C:/cirrus/build/testrun/test_pg_dump/regress/results/test_pg_dump.out	2024-04-30 14:37:53.184490300 +0000
@@ -75,64 +75,64 @@
   aclexplode(s.initprivs) a;
                         obj                         | grantor  |        grantee         | privilege_type | is_grantable...
 ----------------------------------------------------+----------+------------------------+----------------+-------------...
- column col1 of table regress_pg_dump_table         | postgres | -                      | SELECT         | f
- function regress_pg_dump_schema.test_agg(smallint) | postgres | -                      | EXECUTE        | f
- function regress_pg_dump_schema.test_agg(smallint) | postgres | postgres               | EXECUTE        | f
- function regress_pg_dump_schema.test_agg(smallint) | postgres | regress_dump_test_role | EXECUTE        | f
- function regress_pg_dump_schema.test_func()        | postgres | -                      | EXECUTE        | f
- function regress_pg_dump_schema.test_func()        | postgres | postgres               | EXECUTE        | f
- function regress_pg_dump_schema.test_func()        | postgres | regress_dump_test_role | EXECUTE        | f
- function wgo_then_no_access()                      | postgres | -                      | EXECUTE        | f
- function wgo_then_no_access()                      | postgres | postgres               | EXECUTE        | f
- function wgo_then_no_access()                      | postgres | pg_signal_backend      | EXECUTE        | t
- sequence regress_pg_dump_schema.test_seq           | postgres | postgres               | SELECT         | f
- sequence regress_pg_dump_schema.test_seq           | postgres | postgres               | UPDATE         | f
- sequence regress_pg_dump_schema.test_seq           | postgres | postgres               | USAGE          | f
...

diff -w -U3 C:/cirrus/src/test/modules/test_pg_dump/expected/test_pg_dump.out C:/cirrus/build/testrun/test_pg_dump/regre...
--- C:/cirrus/src/test/modules/test_pg_dump/expected/test_pg_dump.out	2024-04-30 14:25:36.282515900 +0000
+++ C:/cirrus/build/testrun/test_pg_dump/regress/results/test_pg_dump.out	2024-04-30 14:32:58.516637300 +0000
@@ -75,64 +75,64 @@
   aclexplode(s.initprivs) a;
                         obj                         | grantor  |        grantee         | privilege_type | is_grantable...
 ----------------------------------------------------+----------+------------------------+----------------+-------------...
- column col1 of table regress_pg_dump_table         | postgres | -                      | SELECT         | f
- function regress_pg_dump_schema.test_agg(smallint) | postgres | -                      | EXECUTE        | f
- function regress_pg_dump_schema.test_agg(smallint) | postgres | postgres               | EXECUTE        | f
- function regress_pg_dump_schema.test_agg(smallint) | postgres | regress_dump_test_role | EXECUTE        | f
- function regress_pg_dump_schema.test_func()        | postgres | -                      | EXECUTE        | f
- function regress_pg_dump_schema.test_func()        | postgres | postgres               | EXECUTE        | f
- function regress_pg_dump_schema.test_func()        | postgres | regress_dump_test_role | EXECUTE        | f
- function wgo_then_no_access()                      | postgres | -                      | EXECUTE        | f
- function wgo_then_no_access()                      | postgres | postgres               | EXECUTE        | f
- function wgo_then_no_access()                      | postgres | pg_signal_backend      | EXECUTE        | t
- sequence regress_pg_dump_schema.test_seq           | postgres | postgres               | SELECT         | f
- sequence regress_pg_dump_schema.test_seq           | postgres | postgres               | UPDATE         | f
- sequence regress_pg_dump_schema.test_seq           | postgres | postgres               | USAGE          | f
...

diff -w -U3 C:/cirrus/src/test/modules/test_pg_dump/expected/test_pg_dump.out C:/cirrus/build/testrun/test_pg_dump/regre...
--- C:/cirrus/src/test/modules/test_pg_dump/expected/test_pg_dump.out	2024-04-30 13:40:19.548553800 +0000
+++ C:/cirrus/build/testrun/test_pg_dump/regress/results/test_pg_dump.out	2024-04-30 13:46:49.892670100 +0000
@@ -75,64 +75,64 @@
   aclexplode(s.initprivs) a;
                         obj                         | grantor  |        grantee         | privilege_type | is_grantable...
 ----------------------------------------------------+----------+------------------------+----------------+-------------...
- column col1 of table regress_pg_dump_table         | postgres | -                      | SELECT         | f
- function regress_pg_dump_schema.test_agg(smallint) | postgres | -                      | EXECUTE        | f
- function regress_pg_dump_schema.test_agg(smallint) | postgres | postgres               | EXECUTE        | f
- function regress_pg_dump_schema.test_agg(smallint) | postgres | regress_dump_test_role | EXECUTE        | f
- function regress_pg_dump_schema.test_func()        | postgres | -                      | EXECUTE        | f
- function regress_pg_dump_schema.test_func()        | postgres | postgres               | EXECUTE        | f
- function regress_pg_dump_schema.test_func()        | postgres | regress_dump_test_role | EXECUTE        | f
- function wgo_then_no_access()                      | postgres | -                      | EXECUTE        | f
- function wgo_then_no_access()                      | postgres | postgres               | EXECUTE        | f
- function wgo_then_no_access()                      | postgres | pg_signal_backend      | EXECUTE        | t
- sequence regress_pg_dump_schema.test_seq           | postgres | postgres               | SELECT         | f
- sequence regress_pg_dump_schema.test_seq           | postgres | postgres               | UPDATE         | f
- sequence regress_pg_dump_schema.test_seq           | postgres | postgres               | USAGE          | f
...

diff -w -U3 C:/cirrus/src/test/modules/test_pg_dump/expected/test_pg_dump.out C:/cirrus/build/testrun/test_pg_dump/regre...
--- C:/cirrus/src/test/modules/test_pg_dump/expected/test_pg_dump.out	2024-04-30 13:32:50.715006500 +0000
+++ C:/cirrus/build/testrun/test_pg_dump/regress/results/test_pg_dump.out	2024-04-30 13:39:26.341089800 +0000
@@ -75,64 +75,64 @@
   aclexplode(s.initprivs) a;
                         obj                         | grantor  |        grantee         | privilege_type | is_grantable...
 ----------------------------------------------------+----------+------------------------+----------------+-------------...
- column col1 of table regress_pg_dump_table         | postgres | -                      | SELECT         | f
- function regress_pg_dump_schema.test_agg(smallint) | postgres | -                      | EXECUTE        | f
- function regress_pg_dump_schema.test_agg(smallint) | postgres | postgres               | EXECUTE        | f
- function regress_pg_dump_schema.test_agg(smallint) | postgres | regress_dump_test_role | EXECUTE        | f
- function regress_pg_dump_schema.test_func()        | postgres | -                      | EXECUTE        | f
- function regress_pg_dump_schema.test_func()        | postgres | postgres               | EXECUTE        | f
- function regress_pg_dump_schema.test_func()        | postgres | regress_dump_test_role | EXECUTE        | f
- function wgo_then_no_access()                      | postgres | -                      | EXECUTE        | f
- function wgo_then_no_access()                      | postgres | postgres               | EXECUTE        | f
- function wgo_then_no_access()                      | postgres | pg_signal_backend      | EXECUTE        | t
- sequence regress_pg_dump_schema.test_seq           | postgres | postgres               | SELECT         | f
- sequence regress_pg_dump_schema.test_seq           | postgres | postgres               | UPDATE         | f
- sequence regress_pg_dump_schema.test_seq           | postgres | postgres               | USAGE          | f
...

diff -w -U3 C:/cirrus/src/test/modules/test_pg_dump/expected/test_pg_dump.out C:/cirrus/build/testrun/test_pg_dump/regre...
--- C:/cirrus/src/test/modules/test_pg_dump/expected/test_pg_dump.out	2024-04-30 12:30:44.691686800 +0000
+++ C:/cirrus/build/testrun/test_pg_dump/regress/results/test_pg_dump.out	2024-04-30 12:37:39.902017100 +0000
@@ -75,64 +75,64 @@
   aclexplode(s.initprivs) a;
                         obj                         | grantor  |        grantee         | privilege_type | is_grantable...
 ----------------------------------------------------+----------+------------------------+----------------+-------------...
- column col1 of table regress_pg_dump_table         | postgres | -                      | SELECT         | f
- function regress_pg_dump_schema.test_agg(smallint) | postgres | -                      | EXECUTE        | f
- function regress_pg_dump_schema.test_agg(smallint) | postgres | postgres               | EXECUTE        | f
- function regress_pg_dump_schema.test_agg(smallint) | postgres | regress_dump_test_role | EXECUTE        | f
- function regress_pg_dump_schema.test_func()        | postgres | -                      | EXECUTE        | f
- function regress_pg_dump_schema.test_func()        | postgres | postgres               | EXECUTE        | f
- function regress_pg_dump_schema.test_func()        | postgres | regress_dump_test_role | EXECUTE        | f
- function wgo_then_no_access()                      | postgres | -                      | EXECUTE        | f
- function wgo_then_no_access()                      | postgres | postgres               | EXECUTE        | f
- function wgo_then_no_access()                      | postgres | pg_signal_backend      | EXECUTE        | t
- sequence regress_pg_dump_schema.test_seq           | postgres | postgres               | SELECT         | f
- sequence regress_pg_dump_schema.test_seq           | postgres | postgres               | UPDATE         | f
- sequence regress_pg_dump_schema.test_seq           | postgres | postgres               | USAGE          | f
...

diff -w -U3 C:/cirrus/src/test/modules/test_pg_dump/expected/test_pg_dump.out C:/cirrus/build/testrun/test_pg_dump/regre...
--- C:/cirrus/src/test/modules/test_pg_dump/expected/test_pg_dump.out	2024-04-30 12:24:19.057910700 +0000
+++ C:/cirrus/build/testrun/test_pg_dump/regress/results/test_pg_dump.out	2024-04-30 12:31:06.629789900 +0000
@@ -75,64 +75,64 @@
   aclexplode(s.initprivs) a;
                         obj                         | grantor  |        grantee         | privilege_type | is_grantable...
 ----------------------------------------------------+----------+------------------------+----------------+-------------...
- column col1 of table regress_pg_dump_table         | postgres | -                      | SELECT         | f
- function regress_pg_dump_schema.test_agg(smallint) | postgres | -                      | EXECUTE        | f
- function regress_pg_dump_schema.test_agg(smallint) | postgres | postgres               | EXECUTE        | f
- function regress_pg_dump_schema.test_agg(smallint) | postgres | regress_dump_test_role | EXECUTE        | f
- function regress_pg_dump_schema.test_func()        | postgres | -                      | EXECUTE        | f
- function regress_pg_dump_schema.test_func()        | postgres | postgres               | EXECUTE        | f
- function regress_pg_dump_schema.test_func()        | postgres | regress_dump_test_role | EXECUTE        | f
- function wgo_then_no_access()                      | postgres | -                      | EXECUTE        | f
- function wgo_then_no_access()                      | postgres | postgres               | EXECUTE        | f
- function wgo_then_no_access()                      | postgres | pg_signal_backend      | EXECUTE        | t
- sequence regress_pg_dump_schema.test_seq           | postgres | postgres               | SELECT         | f
- sequence regress_pg_dump_schema.test_seq           | postgres | postgres               | UPDATE         | f
- sequence regress_pg_dump_schema.test_seq           | postgres | postgres               | USAGE          | f
...

diff -w -U3 C:/cirrus/src/test/modules/test_pg_dump/expected/test_pg_dump.out C:/cirrus/build/testrun/test_pg_dump/regre...
--- C:/cirrus/src/test/modules/test_pg_dump/expected/test_pg_dump.out	2024-04-30 12:22:17.554312300 +0000
+++ C:/cirrus/build/testrun/test_pg_dump/regress/results/test_pg_dump.out	2024-04-30 12:29:40.141739900 +0000
@@ -75,64 +75,64 @@
   aclexplode(s.initprivs) a;
                         obj                         | grantor  |        grantee         | privilege_type | is_grantable...
 ----------------------------------------------------+----------+------------------------+----------------+-------------...
- column col1 of table regress_pg_dump_table         | postgres | -                      | SELECT         | f
- function regress_pg_dump_schema.test_agg(smallint) | postgres | -                      | EXECUTE        | f
- function regress_pg_dump_schema.test_agg(smallint) | postgres | postgres               | EXECUTE        | f
- function regress_pg_dump_schema.test_agg(smallint) | postgres | regress_dump_test_role | EXECUTE        | f
- function regress_pg_dump_schema.test_func()        | postgres | -                      | EXECUTE        | f
- function regress_pg_dump_schema.test_func()        | postgres | postgres               | EXECUTE        | f
- function regress_pg_dump_schema.test_func()        | postgres | regress_dump_test_role | EXECUTE        | f
- function wgo_then_no_access()                      | postgres | -                      | EXECUTE        | f
- function wgo_then_no_access()                      | postgres | postgres               | EXECUTE        | f
- function wgo_then_no_access()                      | postgres | pg_signal_backend      | EXECUTE        | t
- sequence regress_pg_dump_schema.test_seq           | postgres | postgres               | SELECT         | f
- sequence regress_pg_dump_schema.test_seq           | postgres | postgres               | UPDATE         | f
- sequence regress_pg_dump_schema.test_seq           | postgres | postgres               | USAGE          | f
...

diff -w -U3 C:/cirrus/src/test/modules/test_pg_dump/expected/test_pg_dump.out C:/cirrus/build/testrun/test_pg_dump/regre...
--- C:/cirrus/src/test/modules/test_pg_dump/expected/test_pg_dump.out	2024-04-30 11:28:25.554707400 +0000
+++ C:/cirrus/build/testrun/test_pg_dump/regress/results/test_pg_dump.out	2024-04-30 11:35:19.447887700 +0000
@@ -75,64 +75,64 @@
   aclexplode(s.initprivs) a;
                         obj                         | grantor  |        grantee         | privilege_type | is_grantable...
 ----------------------------------------------------+----------+------------------------+----------------+-------------...
- column col1 of table regress_pg_dump_table         | postgres | -                      | SELECT         | f
- function regress_pg_dump_schema.test_agg(smallint) | postgres | -                      | EXECUTE        | f
- function regress_pg_dump_schema.test_agg(smallint) | postgres | postgres               | EXECUTE        | f
- function regress_pg_dump_schema.test_agg(smallint) | postgres | regress_dump_test_role | EXECUTE        | f
- function regress_pg_dump_schema.test_func()        | postgres | -                      | EXECUTE        | f
- function regress_pg_dump_schema.test_func()        | postgres | postgres               | EXECUTE        | f
- function regress_pg_dump_schema.test_func()        | postgres | regress_dump_test_role | EXECUTE        | f
- function wgo_then_no_access()                      | postgres | -                      | EXECUTE        | f
- function wgo_then_no_access()                      | postgres | postgres               | EXECUTE        | f
- function wgo_then_no_access()                      | postgres | pg_signal_backend      | EXECUTE        | t
- sequence regress_pg_dump_schema.test_seq           | postgres | postgres               | SELECT         | f
- sequence regress_pg_dump_schema.test_seq           | postgres | postgres               | UPDATE         | f
- sequence regress_pg_dump_schema.test_seq           | postgres | postgres               | USAGE          | f
...

diff -w -U3 C:/cirrus/src/test/modules/test_pg_dump/expected/test_pg_dump.out C:/cirrus/build/testrun/test_pg_dump/regre...
--- C:/cirrus/src/test/modules/test_pg_dump/expected/test_pg_dump.out	2024-04-30 11:24:21.597051100 +0000
+++ C:/cirrus/build/testrun/test_pg_dump/regress/results/test_pg_dump.out	2024-04-30 11:30:51.906964100 +0000
@@ -75,64 +75,64 @@
   aclexplode(s.initprivs) a;
                         obj                         | grantor  |        grantee         | privilege_type | is_grantable...
 ----------------------------------------------------+----------+------------------------+----------------+-------------...
- column col1 of table regress_pg_dump_table         | postgres | -                      | SELECT         | f
- function regress_pg_dump_schema.test_agg(smallint) | postgres | -                      | EXECUTE        | f
- function regress_pg_dump_schema.test_agg(smallint) | postgres | postgres               | EXECUTE        | f
- function regress_pg_dump_schema.test_agg(smallint) | postgres | regress_dump_test_role | EXECUTE        | f
- function regress_pg_dump_schema.test_func()        | postgres | -                      | EXECUTE        | f
- function regress_pg_dump_schema.test_func()        | postgres | postgres               | EXECUTE        | f
- function regress_pg_dump_schema.test_func()        | postgres | regress_dump_test_role | EXECUTE        | f
- function wgo_then_no_access()                      | postgres | -                      | EXECUTE        | f
- function wgo_then_no_access()                      | postgres | postgres               | EXECUTE        | f
- function wgo_then_no_access()                      | postgres | pg_signal_backend      | EXECUTE        | t
- sequence regress_pg_dump_schema.test_seq           | postgres | postgres               | SELECT         | f
- sequence regress_pg_dump_schema.test_seq           | postgres | postgres               | UPDATE         | f
- sequence regress_pg_dump_schema.test_seq           | postgres | postgres               | USAGE          | f
...

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/create_index.out /tmp/cirrus-ci-build/build/testrun/pg_upgrade/0...
--- /tmp/cirrus-ci-build/src/test/regress/expected/create_index.out	2024-04-30 11:22:16.846682000 +0000
+++ /tmp/cirrus-ci-build/build/testrun/pg_upgrade/002_pg_upgrade/data/results/create_index.out	2024-04-30 11:23:21.39897...
@@ -2135,11 +2135,19 @@
 --
 explain (costs off)
 SELECT unique1 FROM tenk1 WHERE unique1 IN (1, 42, 7) and unique1 = ANY('{7, 8, 9}');
-                                             QUERY PLAN                                             
-----------------------------------------------------------------------------------------------------
- Index Only Scan using tenk1_unique1 on tenk1
-   Index Cond: ((unique1 = ANY ('{1,42,7}'::integer[])) AND (unique1 = ANY ('{7,8,9}'::integer[])))
-(2 rows)
+                            QUERY PLAN                             
+-------------------------------------------------------------------
+ Bitmap Heap Scan on tenk1
+   Recheck Cond: ((unique1 = 7) OR (unique1 = 8) OR (unique1 = 9))
+   Filter: (unique1 = ANY ('{1,42,7}'::integer[]))
+   ->  BitmapOr
+         ->  Bitmap Index Scan on tenk1_unique1
+               Index Cond: (unique1 = 7)
...

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/create_index.out /tmp/cirrus-ci-build/build/testrun/recovery/027...
--- /tmp/cirrus-ci-build/src/test/regress/expected/create_index.out	2024-04-30 11:22:16.846682000 +0000
+++ /tmp/cirrus-ci-build/build/testrun/recovery/027_stream_regress/data/results/create_index.out	2024-04-30 11:23:48.265...
@@ -2135,11 +2135,19 @@
 --
 explain (costs off)
 SELECT unique1 FROM tenk1 WHERE unique1 IN (1, 42, 7) and unique1 = ANY('{7, 8, 9}');
-                                             QUERY PLAN                                             
-----------------------------------------------------------------------------------------------------
- Index Only Scan using tenk1_unique1 on tenk1
-   Index Cond: ((unique1 = ANY ('{1,42,7}'::integer[])) AND (unique1 = ANY ('{7,8,9}'::integer[])))
-(2 rows)
+                            QUERY PLAN                             
+-------------------------------------------------------------------
+ Bitmap Heap Scan on tenk1
+   Recheck Cond: ((unique1 = 7) OR (unique1 = 8) OR (unique1 = 9))
+   Filter: (unique1 = ANY ('{1,42,7}'::integer[]))
+   ->  BitmapOr
+         ->  Bitmap Index Scan on tenk1_unique1
+               Index Cond: (unique1 = 7)
...

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/create_index.out /tmp/cirrus-ci-build/build/testrun/regress/regr...
--- /tmp/cirrus-ci-build/src/test/regress/expected/create_index.out	2024-04-30 11:22:16.846682000 +0000
+++ /tmp/cirrus-ci-build/build/testrun/regress/regress/results/create_index.out	2024-04-30 11:23:18.505030000 +0000
@@ -2135,11 +2135,19 @@
 --
 explain (costs off)
 SELECT unique1 FROM tenk1 WHERE unique1 IN (1, 42, 7) and unique1 = ANY('{7, 8, 9}');
-                                             QUERY PLAN                                             
-----------------------------------------------------------------------------------------------------
- Index Only Scan using tenk1_unique1 on tenk1
-   Index Cond: ((unique1 = ANY ('{1,42,7}'::integer[])) AND (unique1 = ANY ('{7,8,9}'::integer[])))
-(2 rows)
+                            QUERY PLAN                             
+-------------------------------------------------------------------
+ Bitmap Heap Scan on tenk1
+   Recheck Cond: ((unique1 = 7) OR (unique1 = 8) OR (unique1 = 9))
+   Filter: (unique1 = ANY ('{1,42,7}'::integer[]))
+   ->  BitmapOr
+         ->  Bitmap Index Scan on tenk1_unique1
+               Index Cond: (unique1 = 7)
...

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/create_index.out /tmp/cirrus-ci-build/src/bin/pg_upgrade/tmp_che...
--- /tmp/cirrus-ci-build/src/test/regress/expected/create_index.out	2024-04-30 11:22:02.107974661 +0000
+++ /tmp/cirrus-ci-build/src/bin/pg_upgrade/tmp_check/results/create_index.out	2024-04-30 11:24:50.559828365 +0000
@@ -2135,11 +2135,19 @@
 --
 explain (costs off)
 SELECT unique1 FROM tenk1 WHERE unique1 IN (1, 42, 7) and unique1 = ANY('{7, 8, 9}');
-                                             QUERY PLAN                                             
-----------------------------------------------------------------------------------------------------
- Index Only Scan using tenk1_unique1 on tenk1
-   Index Cond: ((unique1 = ANY ('{1,42,7}'::integer[])) AND (unique1 = ANY ('{7,8,9}'::integer[])))
-(2 rows)
+                            QUERY PLAN                             
+-------------------------------------------------------------------
+ Bitmap Heap Scan on tenk1
+   Recheck Cond: ((unique1 = 7) OR (unique1 = 8) OR (unique1 = 9))
+   Filter: (unique1 = ANY ('{1,42,7}'::integer[]))
+   ->  BitmapOr
+         ->  Bitmap Index Scan on tenk1_unique1
+               Index Cond: (unique1 = 7)
...

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/create_index.out /tmp/cirrus-ci-build/src/test/regress/results/c...
--- /tmp/cirrus-ci-build/src/test/regress/expected/create_index.out	2024-04-30 11:22:02.107974661 +0000
+++ /tmp/cirrus-ci-build/src/test/regress/results/create_index.out	2024-04-30 11:23:46.627915471 +0000
@@ -2135,11 +2135,19 @@
 --
 explain (costs off)
 SELECT unique1 FROM tenk1 WHERE unique1 IN (1, 42, 7) and unique1 = ANY('{7, 8, 9}');
-                                             QUERY PLAN                                             
-----------------------------------------------------------------------------------------------------
- Index Only Scan using tenk1_unique1 on tenk1
-   Index Cond: ((unique1 = ANY ('{1,42,7}'::integer[])) AND (unique1 = ANY ('{7,8,9}'::integer[])))
-(2 rows)
+                            QUERY PLAN                             
+-------------------------------------------------------------------
+ Bitmap Heap Scan on tenk1
+   Recheck Cond: ((unique1 = 7) OR (unique1 = 8) OR (unique1 = 9))
+   Filter: (unique1 = ANY ('{1,42,7}'::integer[]))
+   ->  BitmapOr
+         ->  Bitmap Index Scan on tenk1_unique1
+               Index Cond: (unique1 = 7)
...

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/create_index.out /tmp/cirrus-ci-build/build/testrun/pg_upgrade/0...
--- /tmp/cirrus-ci-build/src/test/regress/expected/create_index.out	2024-04-30 11:22:03.568644444 +0000
+++ /tmp/cirrus-ci-build/build/testrun/pg_upgrade/002_pg_upgrade/data/results/create_index.out	2024-04-30 11:24:23.08470...
@@ -2135,11 +2135,19 @@
 --
 explain (costs off)
 SELECT unique1 FROM tenk1 WHERE unique1 IN (1, 42, 7) and unique1 = ANY('{7, 8, 9}');
-                                             QUERY PLAN                                             
-----------------------------------------------------------------------------------------------------
- Index Only Scan using tenk1_unique1 on tenk1
-   Index Cond: ((unique1 = ANY ('{1,42,7}'::integer[])) AND (unique1 = ANY ('{7,8,9}'::integer[])))
-(2 rows)
+                            QUERY PLAN                             
+-------------------------------------------------------------------
+ Bitmap Heap Scan on tenk1
+   Recheck Cond: ((unique1 = 7) OR (unique1 = 8) OR (unique1 = 9))
+   Filter: (unique1 = ANY ('{1,42,7}'::integer[]))
+   ->  BitmapOr
+         ->  Bitmap Index Scan on tenk1_unique1
+               Index Cond: (unique1 = 7)
...

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/create_index.out /tmp/cirrus-ci-build/build/testrun/recovery/027...
--- /tmp/cirrus-ci-build/src/test/regress/expected/create_index.out	2024-04-30 11:22:03.568644444 +0000
+++ /tmp/cirrus-ci-build/build/testrun/recovery/027_stream_regress/data/results/create_index.out	2024-04-30 11:24:50.984...
@@ -2135,11 +2135,19 @@
 --
 explain (costs off)
 SELECT unique1 FROM tenk1 WHERE unique1 IN (1, 42, 7) and unique1 = ANY('{7, 8, 9}');
-                                             QUERY PLAN                                             
-----------------------------------------------------------------------------------------------------
- Index Only Scan using tenk1_unique1 on tenk1
-   Index Cond: ((unique1 = ANY ('{1,42,7}'::integer[])) AND (unique1 = ANY ('{7,8,9}'::integer[])))
-(2 rows)
+                            QUERY PLAN                             
+-------------------------------------------------------------------
+ Bitmap Heap Scan on tenk1
+   Recheck Cond: ((unique1 = 7) OR (unique1 = 8) OR (unique1 = 9))
+   Filter: (unique1 = ANY ('{1,42,7}'::integer[]))
+   ->  BitmapOr
+         ->  Bitmap Index Scan on tenk1_unique1
+               Index Cond: (unique1 = 7)
...

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/create_index.out /tmp/cirrus-ci-build/build/testrun/regress/regr...
--- /tmp/cirrus-ci-build/src/test/regress/expected/create_index.out	2024-04-30 11:22:03.568644444 +0000
+++ /tmp/cirrus-ci-build/build/testrun/regress/regress/results/create_index.out	2024-04-30 11:24:20.224701352 +0000
@@ -2135,11 +2135,19 @@
 --
 explain (costs off)
 SELECT unique1 FROM tenk1 WHERE unique1 IN (1, 42, 7) and unique1 = ANY('{7, 8, 9}');
-                                             QUERY PLAN                                             
-----------------------------------------------------------------------------------------------------
- Index Only Scan using tenk1_unique1 on tenk1
-   Index Cond: ((unique1 = ANY ('{1,42,7}'::integer[])) AND (unique1 = ANY ('{7,8,9}'::integer[])))
-(2 rows)
+                            QUERY PLAN                             
+-------------------------------------------------------------------
+ Bitmap Heap Scan on tenk1
+   Recheck Cond: ((unique1 = 7) OR (unique1 = 8) OR (unique1 = 9))
+   Filter: (unique1 = ANY ('{1,42,7}'::integer[]))
+   ->  BitmapOr
+         ->  Bitmap Index Scan on tenk1_unique1
+               Index Cond: (unique1 = 7)
...

diff -w -U3 C:/cirrus/src/test/regress/expected/create_index.out C:/cirrus/build/testrun/pg_upgrade/002_pg_upgrade/data/...
--- C:/cirrus/src/test/regress/expected/create_index.out	2024-04-30 11:22:47.118662000 +0000
+++ C:/cirrus/build/testrun/pg_upgrade/002_pg_upgrade/data/results/create_index.out	2024-04-30 11:25:18.311987400 +0000
@@ -2136,10 +2136,18 @@
 explain (costs off)
 SELECT unique1 FROM tenk1 WHERE unique1 IN (1, 42, 7) and unique1 = ANY('{7, 8, 9}');
                                              QUERY PLAN                                             
-----------------------------------------------------------------------------------------------------
- Index Only Scan using tenk1_unique1 on tenk1
-   Index Cond: ((unique1 = ANY ('{1,42,7}'::integer[])) AND (unique1 = ANY ('{7,8,9}'::integer[])))
-(2 rows)
+-------------------------------------------------------------------
+ Bitmap Heap Scan on tenk1
+   Recheck Cond: ((unique1 = 7) OR (unique1 = 8) OR (unique1 = 9))
+   Filter: (unique1 = ANY ('{1,42,7}'::integer[]))
+   ->  BitmapOr
+         ->  Bitmap Index Scan on tenk1_unique1
+               Index Cond: (unique1 = 7)
+         ->  Bitmap Index Scan on tenk1_unique1
+               Index Cond: (unique1 = 8)
...

diff -w -U3 C:/cirrus/src/test/regress/expected/create_index.out C:/cirrus/build/testrun/recovery/027_stream_regress/dat...
--- C:/cirrus/src/test/regress/expected/create_index.out	2024-04-30 11:22:47.118662000 +0000
+++ C:/cirrus/build/testrun/recovery/027_stream_regress/data/results/create_index.out	2024-04-30 11:27:46.083450300 +000...
@@ -2136,10 +2136,18 @@
 explain (costs off)
 SELECT unique1 FROM tenk1 WHERE unique1 IN (1, 42, 7) and unique1 = ANY('{7, 8, 9}');
                                              QUERY PLAN                                             
-----------------------------------------------------------------------------------------------------
- Index Only Scan using tenk1_unique1 on tenk1
-   Index Cond: ((unique1 = ANY ('{1,42,7}'::integer[])) AND (unique1 = ANY ('{7,8,9}'::integer[])))
-(2 rows)
+-------------------------------------------------------------------
+ Bitmap Heap Scan on tenk1
+   Recheck Cond: ((unique1 = 7) OR (unique1 = 8) OR (unique1 = 9))
+   Filter: (unique1 = ANY ('{1,42,7}'::integer[]))
+   ->  BitmapOr
+         ->  Bitmap Index Scan on tenk1_unique1
+               Index Cond: (unique1 = 7)
+         ->  Bitmap Index Scan on tenk1_unique1
+               Index Cond: (unique1 = 8)
...

diff -w -U3 C:/cirrus/src/test/regress/expected/create_index.out C:/cirrus/build/testrun/regress/regress/results/create_...
--- C:/cirrus/src/test/regress/expected/create_index.out	2024-04-30 11:22:47.118662000 +0000
+++ C:/cirrus/build/testrun/regress/regress/results/create_index.out	2024-04-30 11:25:09.289500200 +0000
@@ -2136,10 +2136,18 @@
 explain (costs off)
 SELECT unique1 FROM tenk1 WHERE unique1 IN (1, 42, 7) and unique1 = ANY('{7, 8, 9}');
                                              QUERY PLAN                                             
-----------------------------------------------------------------------------------------------------
- Index Only Scan using tenk1_unique1 on tenk1
-   Index Cond: ((unique1 = ANY ('{1,42,7}'::integer[])) AND (unique1 = ANY ('{7,8,9}'::integer[])))
-(2 rows)
+-------------------------------------------------------------------
+ Bitmap Heap Scan on tenk1
+   Recheck Cond: ((unique1 = 7) OR (unique1 = 8) OR (unique1 = 9))
+   Filter: (unique1 = ANY ('{1,42,7}'::integer[]))
+   ->  BitmapOr
+         ->  Bitmap Index Scan on tenk1_unique1
+               Index Cond: (unique1 = 7)
+         ->  Bitmap Index Scan on tenk1_unique1
+               Index Cond: (unique1 = 8)
...

diff -w -U3 C:/cirrus/src/test/modules/test_pg_dump/expected/test_pg_dump.out C:/cirrus/build/testrun/test_pg_dump/regre...
--- C:/cirrus/src/test/modules/test_pg_dump/expected/test_pg_dump.out	2024-04-30 11:22:46.928911500 +0000
+++ C:/cirrus/build/testrun/test_pg_dump/regress/results/test_pg_dump.out	2024-04-30 11:29:55.094620600 +0000
@@ -75,64 +75,64 @@
   aclexplode(s.initprivs) a;
                         obj                         | grantor  |        grantee         | privilege_type | is_grantable...
 ----------------------------------------------------+----------+------------------------+----------------+-------------...
- column col1 of table regress_pg_dump_table         | postgres | -                      | SELECT         | f
- function regress_pg_dump_schema.test_agg(smallint) | postgres | -                      | EXECUTE        | f
- function regress_pg_dump_schema.test_agg(smallint) | postgres | postgres               | EXECUTE        | f
- function regress_pg_dump_schema.test_agg(smallint) | postgres | regress_dump_test_role | EXECUTE        | f
- function regress_pg_dump_schema.test_func()        | postgres | -                      | EXECUTE        | f
- function regress_pg_dump_schema.test_func()        | postgres | postgres               | EXECUTE        | f
- function regress_pg_dump_schema.test_func()        | postgres | regress_dump_test_role | EXECUTE        | f
- function wgo_then_no_access()                      | postgres | -                      | EXECUTE        | f
- function wgo_then_no_access()                      | postgres | postgres               | EXECUTE        | f
- function wgo_then_no_access()                      | postgres | pg_signal_backend      | EXECUTE        | t
- sequence regress_pg_dump_schema.test_seq           | postgres | postgres               | SELECT         | f
- sequence regress_pg_dump_schema.test_seq           | postgres | postgres               | UPDATE         | f
- sequence regress_pg_dump_schema.test_seq           | postgres | postgres               | USAGE          | f
...

diff -U3 /Users/admin/pgsql/src/test/regress/expected/create_index.out /Users/admin/pgsql/build/testrun/pg_upgrade/002_p...
--- /Users/admin/pgsql/src/test/regress/expected/create_index.out	2024-04-30 11:21:54
+++ /Users/admin/pgsql/build/testrun/pg_upgrade/002_pg_upgrade/data/results/create_index.out	2024-04-30 11:23:12
@@ -2135,11 +2135,19 @@
 --
 explain (costs off)
 SELECT unique1 FROM tenk1 WHERE unique1 IN (1, 42, 7) and unique1 = ANY('{7, 8, 9}');
-                                             QUERY PLAN                                             
-----------------------------------------------------------------------------------------------------
- Index Only Scan using tenk1_unique1 on tenk1
-   Index Cond: ((unique1 = ANY ('{1,42,7}'::integer[])) AND (unique1 = ANY ('{7,8,9}'::integer[])))
-(2 rows)
+                            QUERY PLAN                             
+-------------------------------------------------------------------
+ Bitmap Heap Scan on tenk1
+   Recheck Cond: ((unique1 = 7) OR (unique1 = 8) OR (unique1 = 9))
+   Filter: (unique1 = ANY ('{1,42,7}'::integer[]))
+   ->  BitmapOr
+         ->  Bitmap Index Scan on tenk1_unique1
+               Index Cond: (unique1 = 7)
...

diff -U3 /Users/admin/pgsql/src/test/regress/expected/create_index.out /Users/admin/pgsql/build/testrun/recovery/027_str...
--- /Users/admin/pgsql/src/test/regress/expected/create_index.out	2024-04-30 11:21:54
+++ /Users/admin/pgsql/build/testrun/recovery/027_stream_regress/data/results/create_index.out	2024-04-30 11:24:25
@@ -2135,11 +2135,19 @@
 --
 explain (costs off)
 SELECT unique1 FROM tenk1 WHERE unique1 IN (1, 42, 7) and unique1 = ANY('{7, 8, 9}');
-                                             QUERY PLAN                                             
-----------------------------------------------------------------------------------------------------
- Index Only Scan using tenk1_unique1 on tenk1
-   Index Cond: ((unique1 = ANY ('{1,42,7}'::integer[])) AND (unique1 = ANY ('{7,8,9}'::integer[])))
-(2 rows)
+                            QUERY PLAN                             
+-------------------------------------------------------------------
+ Bitmap Heap Scan on tenk1
+   Recheck Cond: ((unique1 = 7) OR (unique1 = 8) OR (unique1 = 9))
+   Filter: (unique1 = ANY ('{1,42,7}'::integer[]))
+   ->  BitmapOr
+         ->  Bitmap Index Scan on tenk1_unique1
+               Index Cond: (unique1 = 7)
...

diff -U3 /Users/admin/pgsql/src/test/regress/expected/create_index.out /Users/admin/pgsql/build/testrun/regress/regress/...
--- /Users/admin/pgsql/src/test/regress/expected/create_index.out	2024-04-30 11:21:54
+++ /Users/admin/pgsql/build/testrun/regress/regress/results/create_index.out	2024-04-30 11:23:11
@@ -2135,11 +2135,19 @@
 --
 explain (costs off)
 SELECT unique1 FROM tenk1 WHERE unique1 IN (1, 42, 7) and unique1 = ANY('{7, 8, 9}');
-                                             QUERY PLAN                                             
-----------------------------------------------------------------------------------------------------
- Index Only Scan using tenk1_unique1 on tenk1
-   Index Cond: ((unique1 = ANY ('{1,42,7}'::integer[])) AND (unique1 = ANY ('{7,8,9}'::integer[])))
-(2 rows)
+                            QUERY PLAN                             
+-------------------------------------------------------------------
+ Bitmap Heap Scan on tenk1
+   Recheck Cond: ((unique1 = 7) OR (unique1 = 8) OR (unique1 = 9))
+   Filter: (unique1 = ANY ('{1,42,7}'::integer[]))
+   ->  BitmapOr
+         ->  Bitmap Index Scan on tenk1_unique1
+               Index Cond: (unique1 = 7)
...

diff -U3 /tmp/cirrus-ci-build/contrib/pg_freespacemap/expected/pg_freespacemap.out /tmp/cirrus-ci-build/build/testrun/pg...
--- /tmp/cirrus-ci-build/contrib/pg_freespacemap/expected/pg_freespacemap.out	2024-04-30 10:37:53.134541000 +0000
+++ /tmp/cirrus-ci-build/build/testrun/pg_freespacemap/regress/results/pg_freespacemap.out	2024-04-30 10:39:55.182467000...
@@ -1,4 +1,5 @@
 CREATE EXTENSION pg_freespacemap;
+ERROR:  extension "pg_freespacemap" has no installation script nor update path for version "1.3"
 CREATE TABLE freespace_tab (c1 int) WITH (autovacuum_enabled = off);
 CREATE INDEX freespace_brin ON freespace_tab USING brin (c1);
 CREATE INDEX freespace_btree ON freespace_tab USING btree (c1);
@@ -8,78 +9,39 @@
   SELECT rel.id, fsm.blkno, (fsm.avail > 0) AS is_avail
     FROM rel, LATERAL pg_freespace(rel.id) AS fsm
     ORDER BY 1, 2;
-       id        | blkno | is_avail 
------------------+-------+----------
- freespace_brin  |     0 | f
- freespace_brin  |     1 | f
- freespace_brin  |     2 | t
- freespace_btree |     0 | f
- freespace_hash  |     0 | f
...

diff -U3 /tmp/cirrus-ci-build/contrib/pg_freespacemap/expected/pg_freespacemap.out /tmp/cirrus-ci-build/build/testrun/pg...
--- /tmp/cirrus-ci-build/contrib/pg_freespacemap/expected/pg_freespacemap.out	2024-04-30 10:37:47.889619284 +0000
+++ /tmp/cirrus-ci-build/build/testrun/pg_freespacemap/regress/results/pg_freespacemap.out	2024-04-30 10:41:08.749617851...
@@ -1,4 +1,5 @@
 CREATE EXTENSION pg_freespacemap;
+ERROR:  extension "pg_freespacemap" has no installation script nor update path for version "1.3"
 CREATE TABLE freespace_tab (c1 int) WITH (autovacuum_enabled = off);
 CREATE INDEX freespace_brin ON freespace_tab USING brin (c1);
 CREATE INDEX freespace_btree ON freespace_tab USING btree (c1);
@@ -8,78 +9,39 @@
   SELECT rel.id, fsm.blkno, (fsm.avail > 0) AS is_avail
     FROM rel, LATERAL pg_freespace(rel.id) AS fsm
     ORDER BY 1, 2;
-       id        | blkno | is_avail 
------------------+-------+----------
- freespace_brin  |     0 | f
- freespace_brin  |     1 | f
- freespace_brin  |     2 | t
- freespace_btree |     0 | f
- freespace_hash  |     0 | f
...

diff -w -U3 C:/cirrus/contrib/pg_freespacemap/expected/pg_freespacemap.out C:/cirrus/build/testrun/pg_freespacemap/regre...
--- C:/cirrus/contrib/pg_freespacemap/expected/pg_freespacemap.out	2024-04-30 10:38:06.935574200 +0000
+++ C:/cirrus/build/testrun/pg_freespacemap/regress/results/pg_freespacemap.out	2024-04-30 10:44:23.361205500 +0000
@@ -1,4 +1,5 @@
 CREATE EXTENSION pg_freespacemap;
+ERROR:  extension "pg_freespacemap" has no installation script nor update path for version "1.3"
 CREATE TABLE freespace_tab (c1 int) WITH (autovacuum_enabled = off);
 CREATE INDEX freespace_brin ON freespace_tab USING brin (c1);
 CREATE INDEX freespace_btree ON freespace_tab USING btree (c1);
@@ -8,78 +9,39 @@
   SELECT rel.id, fsm.blkno, (fsm.avail > 0) AS is_avail
     FROM rel, LATERAL pg_freespace(rel.id) AS fsm
     ORDER BY 1, 2;
-       id        | blkno | is_avail 
------------------+-------+----------
- freespace_brin  |     0 | f
- freespace_brin  |     1 | f
- freespace_brin  |     2 | t
- freespace_btree |     0 | f
- freespace_hash  |     0 | f
...

diff -w -U3 C:/cirrus/src/test/modules/test_pg_dump/expected/test_pg_dump.out C:/cirrus/build/testrun/test_pg_dump/regre...
--- C:/cirrus/src/test/modules/test_pg_dump/expected/test_pg_dump.out	2024-04-30 10:38:10.891652700 +0000
+++ C:/cirrus/build/testrun/test_pg_dump/regress/results/test_pg_dump.out	2024-04-30 10:44:55.514017700 +0000
@@ -75,64 +75,64 @@
   aclexplode(s.initprivs) a;
                         obj                         | grantor  |        grantee         | privilege_type | is_grantable...
 ----------------------------------------------------+----------+------------------------+----------------+-------------...
- column col1 of table regress_pg_dump_table         | postgres | -                      | SELECT         | f
- function regress_pg_dump_schema.test_agg(smallint) | postgres | -                      | EXECUTE        | f
- function regress_pg_dump_schema.test_agg(smallint) | postgres | postgres               | EXECUTE        | f
- function regress_pg_dump_schema.test_agg(smallint) | postgres | regress_dump_test_role | EXECUTE        | f
- function regress_pg_dump_schema.test_func()        | postgres | -                      | EXECUTE        | f
- function regress_pg_dump_schema.test_func()        | postgres | postgres               | EXECUTE        | f
- function regress_pg_dump_schema.test_func()        | postgres | regress_dump_test_role | EXECUTE        | f
- function wgo_then_no_access()                      | postgres | -                      | EXECUTE        | f
- function wgo_then_no_access()                      | postgres | postgres               | EXECUTE        | f
- function wgo_then_no_access()                      | postgres | pg_signal_backend      | EXECUTE        | t
- sequence regress_pg_dump_schema.test_seq           | postgres | postgres               | SELECT         | f
- sequence regress_pg_dump_schema.test_seq           | postgres | postgres               | UPDATE         | f
- sequence regress_pg_dump_schema.test_seq           | postgres | postgres               | USAGE          | f
...

diff -U3 /Users/admin/pgsql/contrib/pg_freespacemap/expected/pg_freespacemap.out /Users/admin/pgsql/build/testrun/pg_fre...
--- /Users/admin/pgsql/contrib/pg_freespacemap/expected/pg_freespacemap.out	2024-04-30 10:38:12
+++ /Users/admin/pgsql/build/testrun/pg_freespacemap/regress/results/pg_freespacemap.out	2024-04-30 10:51:12
@@ -1,4 +1,5 @@
 CREATE EXTENSION pg_freespacemap;
+ERROR:  extension "pg_freespacemap" has no installation script nor update path for version "1.3"
 CREATE TABLE freespace_tab (c1 int) WITH (autovacuum_enabled = off);
 CREATE INDEX freespace_brin ON freespace_tab USING brin (c1);
 CREATE INDEX freespace_btree ON freespace_tab USING btree (c1);
@@ -8,78 +9,39 @@
   SELECT rel.id, fsm.blkno, (fsm.avail > 0) AS is_avail
     FROM rel, LATERAL pg_freespace(rel.id) AS fsm
     ORDER BY 1, 2;
-       id        | blkno | is_avail 
------------------+-------+----------
- freespace_brin  |     0 | f
- freespace_brin  |     1 | f
- freespace_brin  |     2 | t
- freespace_btree |     0 | f
- freespace_hash  |     0 | f
...

diff -w -U3 C:/cirrus/src/test/modules/test_pg_dump/expected/test_pg_dump.out C:/cirrus/build/testrun/test_pg_dump/regre...
--- C:/cirrus/src/test/modules/test_pg_dump/expected/test_pg_dump.out	2024-04-30 10:28:20.605563600 +0000
+++ C:/cirrus/build/testrun/test_pg_dump/regress/results/test_pg_dump.out	2024-04-30 10:35:36.879764800 +0000
@@ -75,64 +75,64 @@
   aclexplode(s.initprivs) a;
                         obj                         | grantor  |        grantee         | privilege_type | is_grantable...
 ----------------------------------------------------+----------+------------------------+----------------+-------------...
- column col1 of table regress_pg_dump_table         | postgres | -                      | SELECT         | f
- function regress_pg_dump_schema.test_agg(smallint) | postgres | -                      | EXECUTE        | f
- function regress_pg_dump_schema.test_agg(smallint) | postgres | postgres               | EXECUTE        | f
- function regress_pg_dump_schema.test_agg(smallint) | postgres | regress_dump_test_role | EXECUTE        | f
- function regress_pg_dump_schema.test_func()        | postgres | -                      | EXECUTE        | f
- function regress_pg_dump_schema.test_func()        | postgres | postgres               | EXECUTE        | f
- function regress_pg_dump_schema.test_func()        | postgres | regress_dump_test_role | EXECUTE        | f
- function wgo_then_no_access()                      | postgres | -                      | EXECUTE        | f
- function wgo_then_no_access()                      | postgres | postgres               | EXECUTE        | f
- function wgo_then_no_access()                      | postgres | pg_signal_backend      | EXECUTE        | t
- sequence regress_pg_dump_schema.test_seq           | postgres | postgres               | SELECT         | f
- sequence regress_pg_dump_schema.test_seq           | postgres | postgres               | UPDATE         | f
- sequence regress_pg_dump_schema.test_seq           | postgres | postgres               | USAGE          | f
...

diff -w -U3 C:/cirrus/src/test/modules/test_pg_dump/expected/test_pg_dump.out C:/cirrus/build/testrun/test_pg_dump/regre...
--- C:/cirrus/src/test/modules/test_pg_dump/expected/test_pg_dump.out	2024-04-30 09:28:07.096371400 +0000
+++ C:/cirrus/build/testrun/test_pg_dump/regress/results/test_pg_dump.out	2024-04-30 09:34:29.236256200 +0000
@@ -75,64 +75,64 @@
   aclexplode(s.initprivs) a;
                         obj                         | grantor  |        grantee         | privilege_type | is_grantable...
 ----------------------------------------------------+----------+------------------------+----------------+-------------...
- column col1 of table regress_pg_dump_table         | postgres | -                      | SELECT         | f
- function regress_pg_dump_schema.test_agg(smallint) | postgres | -                      | EXECUTE        | f
- function regress_pg_dump_schema.test_agg(smallint) | postgres | postgres               | EXECUTE        | f
- function regress_pg_dump_schema.test_agg(smallint) | postgres | regress_dump_test_role | EXECUTE        | f
- function regress_pg_dump_schema.test_func()        | postgres | -                      | EXECUTE        | f
- function regress_pg_dump_schema.test_func()        | postgres | postgres               | EXECUTE        | f
- function regress_pg_dump_schema.test_func()        | postgres | regress_dump_test_role | EXECUTE        | f
- function wgo_then_no_access()                      | postgres | -                      | EXECUTE        | f
- function wgo_then_no_access()                      | postgres | postgres               | EXECUTE        | f
- function wgo_then_no_access()                      | postgres | pg_signal_backend      | EXECUTE        | t
- sequence regress_pg_dump_schema.test_seq           | postgres | postgres               | SELECT         | f
- sequence regress_pg_dump_schema.test_seq           | postgres | postgres               | UPDATE         | f
- sequence regress_pg_dump_schema.test_seq           | postgres | postgres               | USAGE          | f
...

diff -w -U3 C:/cirrus/src/test/modules/test_pg_dump/expected/test_pg_dump.out C:/cirrus/build/testrun/test_pg_dump/regre...
--- C:/cirrus/src/test/modules/test_pg_dump/expected/test_pg_dump.out	2024-04-30 09:23:47.982861900 +0000
+++ C:/cirrus/build/testrun/test_pg_dump/regress/results/test_pg_dump.out	2024-04-30 09:30:36.938379300 +0000
@@ -75,64 +75,64 @@
   aclexplode(s.initprivs) a;
                         obj                         | grantor  |        grantee         | privilege_type | is_grantable...
 ----------------------------------------------------+----------+------------------------+----------------+-------------...
- column col1 of table regress_pg_dump_table         | postgres | -                      | SELECT         | f
- function regress_pg_dump_schema.test_agg(smallint) | postgres | -                      | EXECUTE        | f
- function regress_pg_dump_schema.test_agg(smallint) | postgres | postgres               | EXECUTE        | f
- function regress_pg_dump_schema.test_agg(smallint) | postgres | regress_dump_test_role | EXECUTE        | f
- function regress_pg_dump_schema.test_func()        | postgres | -                      | EXECUTE        | f
- function regress_pg_dump_schema.test_func()        | postgres | postgres               | EXECUTE        | f
- function regress_pg_dump_schema.test_func()        | postgres | regress_dump_test_role | EXECUTE        | f
- function wgo_then_no_access()                      | postgres | -                      | EXECUTE        | f
- function wgo_then_no_access()                      | postgres | postgres               | EXECUTE        | f
- function wgo_then_no_access()                      | postgres | pg_signal_backend      | EXECUTE        | t
- sequence regress_pg_dump_schema.test_seq           | postgres | postgres               | SELECT         | f
- sequence regress_pg_dump_schema.test_seq           | postgres | postgres               | UPDATE         | f
- sequence regress_pg_dump_schema.test_seq           | postgres | postgres               | USAGE          | f
...

diff -w -U3 C:/cirrus/src/test/modules/test_pg_dump/expected/test_pg_dump.out C:/cirrus/build/testrun/test_pg_dump/regre...
--- C:/cirrus/src/test/modules/test_pg_dump/expected/test_pg_dump.out	2024-04-30 09:20:00.984322400 +0000
+++ C:/cirrus/build/testrun/test_pg_dump/regress/results/test_pg_dump.out	2024-04-30 09:26:50.604826300 +0000
@@ -75,64 +75,64 @@
   aclexplode(s.initprivs) a;
                         obj                         | grantor  |        grantee         | privilege_type | is_grantable...
 ----------------------------------------------------+----------+------------------------+----------------+-------------...
- column col1 of table regress_pg_dump_table         | postgres | -                      | SELECT         | f
- function regress_pg_dump_schema.test_agg(smallint) | postgres | -                      | EXECUTE        | f
- function regress_pg_dump_schema.test_agg(smallint) | postgres | postgres               | EXECUTE        | f
- function regress_pg_dump_schema.test_agg(smallint) | postgres | regress_dump_test_role | EXECUTE        | f
- function regress_pg_dump_schema.test_func()        | postgres | -                      | EXECUTE        | f
- function regress_pg_dump_schema.test_func()        | postgres | postgres               | EXECUTE        | f
- function regress_pg_dump_schema.test_func()        | postgres | regress_dump_test_role | EXECUTE        | f
- function wgo_then_no_access()                      | postgres | -                      | EXECUTE        | f
- function wgo_then_no_access()                      | postgres | postgres               | EXECUTE        | f
- function wgo_then_no_access()                      | postgres | pg_signal_backend      | EXECUTE        | t
- sequence regress_pg_dump_schema.test_seq           | postgres | postgres               | SELECT         | f
- sequence regress_pg_dump_schema.test_seq           | postgres | postgres               | UPDATE         | f
- sequence regress_pg_dump_schema.test_seq           | postgres | postgres               | USAGE          | f
...

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/triggers.out /tmp/cirrus-ci-build/build/testrun/pg_upgrade/002_p...
--- /tmp/cirrus-ci-build/src/test/regress/expected/triggers.out	2024-04-30 08:37:12.498151000 +0000
+++ /tmp/cirrus-ci-build/build/testrun/pg_upgrade/002_pg_upgrade/data/results/triggers.out	2024-04-30 08:38:52.491995000...
@@ -3720,7 +3720,9 @@
 -- test who runs deferred trigger functions
 -- setup
 create role groot;
+WARNING:  roles created by regression test cases should have names starting with "regress_"
 create role outis;
+WARNING:  roles created by regression test cases should have names starting with "regress_"
 create function whoami() returns trigger language plpgsql
 as $$
 begin

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/triggers.out /tmp/cirrus-ci-build/build/testrun/recovery/027_str...
--- /tmp/cirrus-ci-build/src/test/regress/expected/triggers.out	2024-04-30 08:37:12.498151000 +0000
+++ /tmp/cirrus-ci-build/build/testrun/recovery/027_stream_regress/data/results/triggers.out	2024-04-30 08:39:26.5563420...
@@ -3720,7 +3720,9 @@
 -- test who runs deferred trigger functions
 -- setup
 create role groot;
+WARNING:  roles created by regression test cases should have names starting with "regress_"
 create role outis;
+WARNING:  roles created by regression test cases should have names starting with "regress_"
 create function whoami() returns trigger language plpgsql
 as $$
 begin

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/triggers.out /tmp/cirrus-ci-build/build/testrun/regress/regress/...
--- /tmp/cirrus-ci-build/src/test/regress/expected/triggers.out	2024-04-30 08:37:12.498151000 +0000
+++ /tmp/cirrus-ci-build/build/testrun/regress/regress/results/triggers.out	2024-04-30 08:38:50.117921000 +0000
@@ -3720,7 +3720,9 @@
 -- test who runs deferred trigger functions
 -- setup
 create role groot;
+WARNING:  roles created by regression test cases should have names starting with "regress_"
 create role outis;
+WARNING:  roles created by regression test cases should have names starting with "regress_"
 create function whoami() returns trigger language plpgsql
 as $$
 begin

diff -w -U3 C:/cirrus/src/test/modules/test_pg_dump/expected/test_pg_dump.out C:/cirrus/build/testrun/test_pg_dump/regre...
--- C:/cirrus/src/test/modules/test_pg_dump/expected/test_pg_dump.out	2024-04-30 08:37:21.548220100 +0000
+++ C:/cirrus/build/testrun/test_pg_dump/regress/results/test_pg_dump.out	2024-04-30 08:44:22.056347100 +0000
@@ -75,64 +75,64 @@
   aclexplode(s.initprivs) a;
                         obj                         | grantor  |        grantee         | privilege_type | is_grantable...
 ----------------------------------------------------+----------+------------------------+----------------+-------------...
- column col1 of table regress_pg_dump_table         | postgres | -                      | SELECT         | f
- function regress_pg_dump_schema.test_agg(smallint) | postgres | -                      | EXECUTE        | f
- function regress_pg_dump_schema.test_agg(smallint) | postgres | postgres               | EXECUTE        | f
- function regress_pg_dump_schema.test_agg(smallint) | postgres | regress_dump_test_role | EXECUTE        | f
- function regress_pg_dump_schema.test_func()        | postgres | -                      | EXECUTE        | f
- function regress_pg_dump_schema.test_func()        | postgres | postgres               | EXECUTE        | f
- function regress_pg_dump_schema.test_func()        | postgres | regress_dump_test_role | EXECUTE        | f
- function wgo_then_no_access()                      | postgres | -                      | EXECUTE        | f
- function wgo_then_no_access()                      | postgres | postgres               | EXECUTE        | f
- function wgo_then_no_access()                      | postgres | pg_signal_backend      | EXECUTE        | t
- sequence regress_pg_dump_schema.test_seq           | postgres | postgres               | SELECT         | f
- sequence regress_pg_dump_schema.test_seq           | postgres | postgres               | UPDATE         | f
- sequence regress_pg_dump_schema.test_seq           | postgres | postgres               | USAGE          | f
...

diff -w -U3 C:/cirrus/src/test/modules/test_pg_dump/expected/test_pg_dump.out C:/cirrus/build/testrun/test_pg_dump/regre...
--- C:/cirrus/src/test/modules/test_pg_dump/expected/test_pg_dump.out	2024-04-30 08:27:35.122192700 +0000
+++ C:/cirrus/build/testrun/test_pg_dump/regress/results/test_pg_dump.out	2024-04-30 08:34:53.451996100 +0000
@@ -75,64 +75,64 @@
   aclexplode(s.initprivs) a;
                         obj                         | grantor  |        grantee         | privilege_type | is_grantable...
 ----------------------------------------------------+----------+------------------------+----------------+-------------...
- column col1 of table regress_pg_dump_table         | postgres | -                      | SELECT         | f
- function regress_pg_dump_schema.test_agg(smallint) | postgres | -                      | EXECUTE        | f
- function regress_pg_dump_schema.test_agg(smallint) | postgres | postgres               | EXECUTE        | f
- function regress_pg_dump_schema.test_agg(smallint) | postgres | regress_dump_test_role | EXECUTE        | f
- function regress_pg_dump_schema.test_func()        | postgres | -                      | EXECUTE        | f
- function regress_pg_dump_schema.test_func()        | postgres | postgres               | EXECUTE        | f
- function regress_pg_dump_schema.test_func()        | postgres | regress_dump_test_role | EXECUTE        | f
- function wgo_then_no_access()                      | postgres | -                      | EXECUTE        | f
- function wgo_then_no_access()                      | postgres | postgres               | EXECUTE        | f
- function wgo_then_no_access()                      | postgres | pg_signal_backend      | EXECUTE        | t
- sequence regress_pg_dump_schema.test_seq           | postgres | postgres               | SELECT         | f
- sequence regress_pg_dump_schema.test_seq           | postgres | postgres               | UPDATE         | f
- sequence regress_pg_dump_schema.test_seq           | postgres | postgres               | USAGE          | f
...

diff -w -U3 C:/cirrus/src/test/modules/test_pg_dump/expected/test_pg_dump.out C:/cirrus/build/testrun/test_pg_dump/regre...
--- C:/cirrus/src/test/modules/test_pg_dump/expected/test_pg_dump.out	2024-04-30 08:19:18.926586300 +0000
+++ C:/cirrus/build/testrun/test_pg_dump/regress/results/test_pg_dump.out	2024-04-30 08:26:21.410030400 +0000
@@ -75,64 +75,64 @@
   aclexplode(s.initprivs) a;
                         obj                         | grantor  |        grantee         | privilege_type | is_grantable...
 ----------------------------------------------------+----------+------------------------+----------------+-------------...
- column col1 of table regress_pg_dump_table         | postgres | -                      | SELECT         | f
- function regress_pg_dump_schema.test_agg(smallint) | postgres | -                      | EXECUTE        | f
- function regress_pg_dump_schema.test_agg(smallint) | postgres | postgres               | EXECUTE        | f
- function regress_pg_dump_schema.test_agg(smallint) | postgres | regress_dump_test_role | EXECUTE        | f
- function regress_pg_dump_schema.test_func()        | postgres | -                      | EXECUTE        | f
- function regress_pg_dump_schema.test_func()        | postgres | postgres               | EXECUTE        | f
- function regress_pg_dump_schema.test_func()        | postgres | regress_dump_test_role | EXECUTE        | f
- function wgo_then_no_access()                      | postgres | -                      | EXECUTE        | f
- function wgo_then_no_access()                      | postgres | postgres               | EXECUTE        | f
- function wgo_then_no_access()                      | postgres | pg_signal_backend      | EXECUTE        | t
- sequence regress_pg_dump_schema.test_seq           | postgres | postgres               | SELECT         | f
- sequence regress_pg_dump_schema.test_seq           | postgres | postgres               | UPDATE         | f
- sequence regress_pg_dump_schema.test_seq           | postgres | postgres               | USAGE          | f
...

diff -w -U3 C:/cirrus/src/test/modules/test_pg_dump/expected/test_pg_dump.out C:/cirrus/build/testrun/test_pg_dump/regre...
--- C:/cirrus/src/test/modules/test_pg_dump/expected/test_pg_dump.out	2024-04-30 07:36:03.344972600 +0000
+++ C:/cirrus/build/testrun/test_pg_dump/regress/results/test_pg_dump.out	2024-04-30 07:43:18.940682300 +0000
@@ -75,64 +75,64 @@
   aclexplode(s.initprivs) a;
                         obj                         | grantor  |        grantee         | privilege_type | is_grantable...
 ----------------------------------------------------+----------+------------------------+----------------+-------------...
- column col1 of table regress_pg_dump_table         | postgres | -                      | SELECT         | f
- function regress_pg_dump_schema.test_agg(smallint) | postgres | -                      | EXECUTE        | f
- function regress_pg_dump_schema.test_agg(smallint) | postgres | postgres               | EXECUTE        | f
- function regress_pg_dump_schema.test_agg(smallint) | postgres | regress_dump_test_role | EXECUTE        | f
- function regress_pg_dump_schema.test_func()        | postgres | -                      | EXECUTE        | f
- function regress_pg_dump_schema.test_func()        | postgres | postgres               | EXECUTE        | f
- function regress_pg_dump_schema.test_func()        | postgres | regress_dump_test_role | EXECUTE        | f
- function wgo_then_no_access()                      | postgres | -                      | EXECUTE        | f
- function wgo_then_no_access()                      | postgres | postgres               | EXECUTE        | f
- function wgo_then_no_access()                      | postgres | pg_signal_backend      | EXECUTE        | t
- sequence regress_pg_dump_schema.test_seq           | postgres | postgres               | SELECT         | f
- sequence regress_pg_dump_schema.test_seq           | postgres | postgres               | UPDATE         | f
- sequence regress_pg_dump_schema.test_seq           | postgres | postgres               | USAGE          | f
...

diff -w -U3 C:/cirrus/src/test/modules/test_pg_dump/expected/test_pg_dump.out C:/cirrus/build/testrun/test_pg_dump/regre...
--- C:/cirrus/src/test/modules/test_pg_dump/expected/test_pg_dump.out	2024-04-30 07:27:52.975849600 +0000
+++ C:/cirrus/build/testrun/test_pg_dump/regress/results/test_pg_dump.out	2024-04-30 07:34:37.521080500 +0000
@@ -75,64 +75,64 @@
   aclexplode(s.initprivs) a;
                         obj                         | grantor  |        grantee         | privilege_type | is_grantable...
 ----------------------------------------------------+----------+------------------------+----------------+-------------...
- column col1 of table regress_pg_dump_table         | postgres | -                      | SELECT         | f
- function regress_pg_dump_schema.test_agg(smallint) | postgres | -                      | EXECUTE        | f
- function regress_pg_dump_schema.test_agg(smallint) | postgres | postgres               | EXECUTE        | f
- function regress_pg_dump_schema.test_agg(smallint) | postgres | regress_dump_test_role | EXECUTE        | f
- function regress_pg_dump_schema.test_func()        | postgres | -                      | EXECUTE        | f
- function regress_pg_dump_schema.test_func()        | postgres | postgres               | EXECUTE        | f
- function regress_pg_dump_schema.test_func()        | postgres | regress_dump_test_role | EXECUTE        | f
- function wgo_then_no_access()                      | postgres | -                      | EXECUTE        | f
- function wgo_then_no_access()                      | postgres | postgres               | EXECUTE        | f
- function wgo_then_no_access()                      | postgres | pg_signal_backend      | EXECUTE        | t
- sequence regress_pg_dump_schema.test_seq           | postgres | postgres               | SELECT         | f
- sequence regress_pg_dump_schema.test_seq           | postgres | postgres               | UPDATE         | f
- sequence regress_pg_dump_schema.test_seq           | postgres | postgres               | USAGE          | f
...

diff -w -U3 C:/cirrus/src/test/modules/test_pg_dump/expected/test_pg_dump.out C:/cirrus/build/testrun/test_pg_dump/regre...
--- C:/cirrus/src/test/modules/test_pg_dump/expected/test_pg_dump.out	2024-04-30 07:18:17.254666700 +0000
+++ C:/cirrus/build/testrun/test_pg_dump/regress/results/test_pg_dump.out	2024-04-30 07:25:14.653352900 +0000
@@ -75,64 +75,64 @@
   aclexplode(s.initprivs) a;
                         obj                         | grantor  |        grantee         | privilege_type | is_grantable...
 ----------------------------------------------------+----------+------------------------+----------------+-------------...
- column col1 of table regress_pg_dump_table         | postgres | -                      | SELECT         | f
- function regress_pg_dump_schema.test_agg(smallint) | postgres | -                      | EXECUTE        | f
- function regress_pg_dump_schema.test_agg(smallint) | postgres | postgres               | EXECUTE        | f
- function regress_pg_dump_schema.test_agg(smallint) | postgres | regress_dump_test_role | EXECUTE        | f
- function regress_pg_dump_schema.test_func()        | postgres | -                      | EXECUTE        | f
- function regress_pg_dump_schema.test_func()        | postgres | postgres               | EXECUTE        | f
- function regress_pg_dump_schema.test_func()        | postgres | regress_dump_test_role | EXECUTE        | f
- function wgo_then_no_access()                      | postgres | -                      | EXECUTE        | f
- function wgo_then_no_access()                      | postgres | postgres               | EXECUTE        | f
- function wgo_then_no_access()                      | postgres | pg_signal_backend      | EXECUTE        | t
- sequence regress_pg_dump_schema.test_seq           | postgres | postgres               | SELECT         | f
- sequence regress_pg_dump_schema.test_seq           | postgres | postgres               | UPDATE         | f
- sequence regress_pg_dump_schema.test_seq           | postgres | postgres               | USAGE          | f
...

diff -w -U3 C:/cirrus/src/test/modules/test_pg_dump/expected/test_pg_dump.out C:/cirrus/build/testrun/test_pg_dump/regre...
--- C:/cirrus/src/test/modules/test_pg_dump/expected/test_pg_dump.out	2024-04-30 06:36:17.730738200 +0000
+++ C:/cirrus/build/testrun/test_pg_dump/regress/results/test_pg_dump.out	2024-04-30 06:43:05.347363100 +0000
@@ -75,64 +75,64 @@
   aclexplode(s.initprivs) a;
                         obj                         | grantor  |        grantee         | privilege_type | is_grantable...
 ----------------------------------------------------+----------+------------------------+----------------+-------------...
- column col1 of table regress_pg_dump_table         | postgres | -                      | SELECT         | f
- function regress_pg_dump_schema.test_agg(smallint) | postgres | -                      | EXECUTE        | f
- function regress_pg_dump_schema.test_agg(smallint) | postgres | postgres               | EXECUTE        | f
- function regress_pg_dump_schema.test_agg(smallint) | postgres | regress_dump_test_role | EXECUTE        | f
- function regress_pg_dump_schema.test_func()        | postgres | -                      | EXECUTE        | f
- function regress_pg_dump_schema.test_func()        | postgres | postgres               | EXECUTE        | f
- function regress_pg_dump_schema.test_func()        | postgres | regress_dump_test_role | EXECUTE        | f
- function wgo_then_no_access()                      | postgres | -                      | EXECUTE        | f
- function wgo_then_no_access()                      | postgres | postgres               | EXECUTE        | f
- function wgo_then_no_access()                      | postgres | pg_signal_backend      | EXECUTE        | t
- sequence regress_pg_dump_schema.test_seq           | postgres | postgres               | SELECT         | f
- sequence regress_pg_dump_schema.test_seq           | postgres | postgres               | UPDATE         | f
- sequence regress_pg_dump_schema.test_seq           | postgres | postgres               | USAGE          | f
...

diff -U3 /tmp/cirrus-ci-build/contrib/unaccent/expected/unaccent.out /tmp/cirrus-ci-build/build/testrun/unaccent/regress...
--- /tmp/cirrus-ci-build/contrib/unaccent/expected/unaccent.out	2024-04-30 06:25:42.064725000 +0000
+++ /tmp/cirrus-ci-build/build/testrun/unaccent/regress/results/unaccent.out	2024-04-30 06:27:33.401925000 +0000
@@ -8,8 +8,10 @@
 \quit
 \endif
 CREATE EXTENSION unaccent;
+WARNING:  duplicate source strings, first one will be used
 SET client_encoding TO 'UTF8';
 SELECT unaccent('foobar');
+WARNING:  duplicate source strings, first one will be used
  unaccent 
 ----------
  foobar

diff -U3 /tmp/cirrus-ci-build/contrib/unaccent/expected/unaccent.out /tmp/cirrus-ci-build/contrib/unaccent/results/unacc...
--- /tmp/cirrus-ci-build/contrib/unaccent/expected/unaccent.out	2024-04-30 06:25:39.408382129 +0000
+++ /tmp/cirrus-ci-build/contrib/unaccent/results/unaccent.out	2024-04-30 06:29:19.336433689 +0000
@@ -8,8 +8,10 @@
 \quit
 \endif
 CREATE EXTENSION unaccent;
+WARNING:  duplicate source strings, first one will be used
 SET client_encoding TO 'UTF8';
 SELECT unaccent('foobar');
+WARNING:  duplicate source strings, first one will be used
  unaccent 
 ----------
  foobar

diff -U3 /tmp/cirrus-ci-build/contrib/unaccent/expected/unaccent.out /tmp/cirrus-ci-build/build/testrun/unaccent/regress...
--- /tmp/cirrus-ci-build/contrib/unaccent/expected/unaccent.out	2024-04-30 06:25:37.053091128 +0000
+++ /tmp/cirrus-ci-build/build/testrun/unaccent/regress/results/unaccent.out	2024-04-30 06:28:00.693103969 +0000
@@ -8,8 +8,10 @@
 \quit
 \endif
 CREATE EXTENSION unaccent;
+WARNING:  duplicate source strings, first one will be used
 SET client_encoding TO 'UTF8';
 SELECT unaccent('foobar');
+WARNING:  duplicate source strings, first one will be used
  unaccent 
 ----------
  foobar

diff -w -U3 C:/cirrus/src/test/modules/test_pg_dump/expected/test_pg_dump.out C:/cirrus/build/testrun/test_pg_dump/regre...
--- C:/cirrus/src/test/modules/test_pg_dump/expected/test_pg_dump.out	2024-04-30 06:25:58.458421200 +0000
+++ C:/cirrus/build/testrun/test_pg_dump/regress/results/test_pg_dump.out	2024-04-30 06:32:37.698177300 +0000
@@ -75,64 +75,64 @@
   aclexplode(s.initprivs) a;
                         obj                         | grantor  |        grantee         | privilege_type | is_grantable...
 ----------------------------------------------------+----------+------------------------+----------------+-------------...
- column col1 of table regress_pg_dump_table         | postgres | -                      | SELECT         | f
- function regress_pg_dump_schema.test_agg(smallint) | postgres | -                      | EXECUTE        | f
- function regress_pg_dump_schema.test_agg(smallint) | postgres | postgres               | EXECUTE        | f
- function regress_pg_dump_schema.test_agg(smallint) | postgres | regress_dump_test_role | EXECUTE        | f
- function regress_pg_dump_schema.test_func()        | postgres | -                      | EXECUTE        | f
- function regress_pg_dump_schema.test_func()        | postgres | postgres               | EXECUTE        | f
- function regress_pg_dump_schema.test_func()        | postgres | regress_dump_test_role | EXECUTE        | f
- function wgo_then_no_access()                      | postgres | -                      | EXECUTE        | f
- function wgo_then_no_access()                      | postgres | postgres               | EXECUTE        | f
- function wgo_then_no_access()                      | postgres | pg_signal_backend      | EXECUTE        | t
- sequence regress_pg_dump_schema.test_seq           | postgres | postgres               | SELECT         | f
- sequence regress_pg_dump_schema.test_seq           | postgres | postgres               | UPDATE         | f
- sequence regress_pg_dump_schema.test_seq           | postgres | postgres               | USAGE          | f
...

diff -U3 /Users/admin/pgsql/contrib/unaccent/expected/unaccent.out /Users/admin/pgsql/build/testrun/unaccent/regress/res...
--- /Users/admin/pgsql/contrib/unaccent/expected/unaccent.out	2024-04-30 06:25:42
+++ /Users/admin/pgsql/build/testrun/unaccent/regress/results/unaccent.out	2024-04-30 06:30:43
@@ -8,8 +8,10 @@
 \quit
 \endif
 CREATE EXTENSION unaccent;
+WARNING:  duplicate source strings, first one will be used
 SET client_encoding TO 'UTF8';
 SELECT unaccent('foobar');
+WARNING:  duplicate source strings, first one will be used
  unaccent 
 ----------
  foobar

diff -w -U3 C:/cirrus/src/test/modules/test_pg_dump/expected/test_pg_dump.out C:/cirrus/build/testrun/test_pg_dump/regre...
--- C:/cirrus/src/test/modules/test_pg_dump/expected/test_pg_dump.out	2024-04-30 06:24:03.145701300 +0000
+++ C:/cirrus/build/testrun/test_pg_dump/regress/results/test_pg_dump.out	2024-04-30 06:30:57.823082600 +0000
@@ -75,64 +75,64 @@
   aclexplode(s.initprivs) a;
                         obj                         | grantor  |        grantee         | privilege_type | is_grantable...
 ----------------------------------------------------+----------+------------------------+----------------+-------------...
- column col1 of table regress_pg_dump_table         | postgres | -                      | SELECT         | f
- function regress_pg_dump_schema.test_agg(smallint) | postgres | -                      | EXECUTE        | f
- function regress_pg_dump_schema.test_agg(smallint) | postgres | postgres               | EXECUTE        | f
- function regress_pg_dump_schema.test_agg(smallint) | postgres | regress_dump_test_role | EXECUTE        | f
- function regress_pg_dump_schema.test_func()        | postgres | -                      | EXECUTE        | f
- function regress_pg_dump_schema.test_func()        | postgres | postgres               | EXECUTE        | f
- function regress_pg_dump_schema.test_func()        | postgres | regress_dump_test_role | EXECUTE        | f
- function wgo_then_no_access()                      | postgres | -                      | EXECUTE        | f
- function wgo_then_no_access()                      | postgres | postgres               | EXECUTE        | f
- function wgo_then_no_access()                      | postgres | pg_signal_backend      | EXECUTE        | t
- sequence regress_pg_dump_schema.test_seq           | postgres | postgres               | SELECT         | f
- sequence regress_pg_dump_schema.test_seq           | postgres | postgres               | UPDATE         | f
- sequence regress_pg_dump_schema.test_seq           | postgres | postgres               | USAGE          | f
...

diff -w -U3 C:/cirrus/src/test/modules/test_pg_dump/expected/test_pg_dump.out C:/cirrus/build/testrun/test_pg_dump/regre...
--- C:/cirrus/src/test/modules/test_pg_dump/expected/test_pg_dump.out	2024-04-30 06:20:05.360305800 +0000
+++ C:/cirrus/build/testrun/test_pg_dump/regress/results/test_pg_dump.out	2024-04-30 06:27:16.524061000 +0000
@@ -75,64 +75,64 @@
   aclexplode(s.initprivs) a;
                         obj                         | grantor  |        grantee         | privilege_type | is_grantable...
 ----------------------------------------------------+----------+------------------------+----------------+-------------...
- column col1 of table regress_pg_dump_table         | postgres | -                      | SELECT         | f
- function regress_pg_dump_schema.test_agg(smallint) | postgres | -                      | EXECUTE        | f
- function regress_pg_dump_schema.test_agg(smallint) | postgres | postgres               | EXECUTE        | f
- function regress_pg_dump_schema.test_agg(smallint) | postgres | regress_dump_test_role | EXECUTE        | f
- function regress_pg_dump_schema.test_func()        | postgres | -                      | EXECUTE        | f
- function regress_pg_dump_schema.test_func()        | postgres | postgres               | EXECUTE        | f
- function regress_pg_dump_schema.test_func()        | postgres | regress_dump_test_role | EXECUTE        | f
- function wgo_then_no_access()                      | postgres | -                      | EXECUTE        | f
- function wgo_then_no_access()                      | postgres | postgres               | EXECUTE        | f
- function wgo_then_no_access()                      | postgres | pg_signal_backend      | EXECUTE        | t
- sequence regress_pg_dump_schema.test_seq           | postgres | postgres               | SELECT         | f
- sequence regress_pg_dump_schema.test_seq           | postgres | postgres               | UPDATE         | f
- sequence regress_pg_dump_schema.test_seq           | postgres | postgres               | USAGE          | f
...

diff -w -U3 C:/cirrus/src/test/modules/test_pg_dump/expected/test_pg_dump.out C:/cirrus/build/testrun/test_pg_dump/regre...
--- C:/cirrus/src/test/modules/test_pg_dump/expected/test_pg_dump.out	2024-04-30 06:16:56.555839700 +0000
+++ C:/cirrus/build/testrun/test_pg_dump/regress/results/test_pg_dump.out	2024-04-30 06:23:32.456421100 +0000
@@ -75,64 +75,64 @@
   aclexplode(s.initprivs) a;
                         obj                         | grantor  |        grantee         | privilege_type | is_grantable...
 ----------------------------------------------------+----------+------------------------+----------------+-------------...
- column col1 of table regress_pg_dump_table         | postgres | -                      | SELECT         | f
- function regress_pg_dump_schema.test_agg(smallint) | postgres | -                      | EXECUTE        | f
- function regress_pg_dump_schema.test_agg(smallint) | postgres | postgres               | EXECUTE        | f
- function regress_pg_dump_schema.test_agg(smallint) | postgres | regress_dump_test_role | EXECUTE        | f
- function regress_pg_dump_schema.test_func()        | postgres | -                      | EXECUTE        | f
- function regress_pg_dump_schema.test_func()        | postgres | postgres               | EXECUTE        | f
- function regress_pg_dump_schema.test_func()        | postgres | regress_dump_test_role | EXECUTE        | f
- function wgo_then_no_access()                      | postgres | -                      | EXECUTE        | f
- function wgo_then_no_access()                      | postgres | postgres               | EXECUTE        | f
- function wgo_then_no_access()                      | postgres | pg_signal_backend      | EXECUTE        | t
- sequence regress_pg_dump_schema.test_seq           | postgres | postgres               | SELECT         | f
- sequence regress_pg_dump_schema.test_seq           | postgres | postgres               | UPDATE         | f
- sequence regress_pg_dump_schema.test_seq           | postgres | postgres               | USAGE          | f
...

diff -w -U3 C:/cirrus/src/test/modules/test_pg_dump/expected/test_pg_dump.out C:/cirrus/build/testrun/test_pg_dump/regre...
--- C:/cirrus/src/test/modules/test_pg_dump/expected/test_pg_dump.out	2024-04-30 06:07:05.877875400 +0000
+++ C:/cirrus/build/testrun/test_pg_dump/regress/results/test_pg_dump.out	2024-04-30 06:14:00.014321200 +0000
@@ -75,64 +75,64 @@
   aclexplode(s.initprivs) a;
                         obj                         | grantor  |        grantee         | privilege_type | is_grantable...
 ----------------------------------------------------+----------+------------------------+----------------+-------------...
- column col1 of table regress_pg_dump_table         | postgres | -                      | SELECT         | f
- function regress_pg_dump_schema.test_agg(smallint) | postgres | -                      | EXECUTE        | f
- function regress_pg_dump_schema.test_agg(smallint) | postgres | postgres               | EXECUTE        | f
- function regress_pg_dump_schema.test_agg(smallint) | postgres | regress_dump_test_role | EXECUTE        | f
- function regress_pg_dump_schema.test_func()        | postgres | -                      | EXECUTE        | f
- function regress_pg_dump_schema.test_func()        | postgres | postgres               | EXECUTE        | f
- function regress_pg_dump_schema.test_func()        | postgres | regress_dump_test_role | EXECUTE        | f
- function wgo_then_no_access()                      | postgres | -                      | EXECUTE        | f
- function wgo_then_no_access()                      | postgres | postgres               | EXECUTE        | f
- function wgo_then_no_access()                      | postgres | pg_signal_backend      | EXECUTE        | t
- sequence regress_pg_dump_schema.test_seq           | postgres | postgres               | SELECT         | f
- sequence regress_pg_dump_schema.test_seq           | postgres | postgres               | UPDATE         | f
- sequence regress_pg_dump_schema.test_seq           | postgres | postgres               | USAGE          | f
...

diff -w -U3 C:/cirrus/src/test/modules/test_pg_dump/expected/test_pg_dump.out C:/cirrus/build/testrun/test_pg_dump/regre...
--- C:/cirrus/src/test/modules/test_pg_dump/expected/test_pg_dump.out	2024-04-30 05:35:16.448714300 +0000
+++ C:/cirrus/build/testrun/test_pg_dump/regress/results/test_pg_dump.out	2024-04-30 05:42:17.479762600 +0000
@@ -75,64 +75,64 @@
   aclexplode(s.initprivs) a;
                         obj                         | grantor  |        grantee         | privilege_type | is_grantable...
 ----------------------------------------------------+----------+------------------------+----------------+-------------...
- column col1 of table regress_pg_dump_table         | postgres | -                      | SELECT         | f
- function regress_pg_dump_schema.test_agg(smallint) | postgres | -                      | EXECUTE        | f
- function regress_pg_dump_schema.test_agg(smallint) | postgres | postgres               | EXECUTE        | f
- function regress_pg_dump_schema.test_agg(smallint) | postgres | regress_dump_test_role | EXECUTE        | f
- function regress_pg_dump_schema.test_func()        | postgres | -                      | EXECUTE        | f
- function regress_pg_dump_schema.test_func()        | postgres | postgres               | EXECUTE        | f
- function regress_pg_dump_schema.test_func()        | postgres | regress_dump_test_role | EXECUTE        | f
- function wgo_then_no_access()                      | postgres | -                      | EXECUTE        | f
- function wgo_then_no_access()                      | postgres | postgres               | EXECUTE        | f
- function wgo_then_no_access()                      | postgres | pg_signal_backend      | EXECUTE        | t
- sequence regress_pg_dump_schema.test_seq           | postgres | postgres               | SELECT         | f
- sequence regress_pg_dump_schema.test_seq           | postgres | postgres               | UPDATE         | f
- sequence regress_pg_dump_schema.test_seq           | postgres | postgres               | USAGE          | f
...

diff -w -U3 C:/cirrus/src/test/modules/test_pg_dump/expected/test_pg_dump.out C:/cirrus/build/testrun/test_pg_dump/regre...
--- C:/cirrus/src/test/modules/test_pg_dump/expected/test_pg_dump.out	2024-04-30 05:25:11.359351300 +0000
+++ C:/cirrus/build/testrun/test_pg_dump/regress/results/test_pg_dump.out	2024-04-30 05:31:52.884897500 +0000
@@ -75,64 +75,64 @@
   aclexplode(s.initprivs) a;
                         obj                         | grantor  |        grantee         | privilege_type | is_grantable...
 ----------------------------------------------------+----------+------------------------+----------------+-------------...
- column col1 of table regress_pg_dump_table         | postgres | -                      | SELECT         | f
- function regress_pg_dump_schema.test_agg(smallint) | postgres | -                      | EXECUTE        | f
- function regress_pg_dump_schema.test_agg(smallint) | postgres | postgres               | EXECUTE        | f
- function regress_pg_dump_schema.test_agg(smallint) | postgres | regress_dump_test_role | EXECUTE        | f
- function regress_pg_dump_schema.test_func()        | postgres | -                      | EXECUTE        | f
- function regress_pg_dump_schema.test_func()        | postgres | postgres               | EXECUTE        | f
- function regress_pg_dump_schema.test_func()        | postgres | regress_dump_test_role | EXECUTE        | f
- function wgo_then_no_access()                      | postgres | -                      | EXECUTE        | f
- function wgo_then_no_access()                      | postgres | postgres               | EXECUTE        | f
- function wgo_then_no_access()                      | postgres | pg_signal_backend      | EXECUTE        | t
- sequence regress_pg_dump_schema.test_seq           | postgres | postgres               | SELECT         | f
- sequence regress_pg_dump_schema.test_seq           | postgres | postgres               | UPDATE         | f
- sequence regress_pg_dump_schema.test_seq           | postgres | postgres               | USAGE          | f
...

diff -w -U3 C:/cirrus/src/test/modules/test_pg_dump/expected/test_pg_dump.out C:/cirrus/build/testrun/test_pg_dump/regre...
--- C:/cirrus/src/test/modules/test_pg_dump/expected/test_pg_dump.out	2024-04-30 05:18:42.141988400 +0000
+++ C:/cirrus/build/testrun/test_pg_dump/regress/results/test_pg_dump.out	2024-04-30 05:25:45.257659300 +0000
@@ -75,64 +75,64 @@
   aclexplode(s.initprivs) a;
                         obj                         | grantor  |        grantee         | privilege_type | is_grantable...
 ----------------------------------------------------+----------+------------------------+----------------+-------------...
- column col1 of table regress_pg_dump_table         | postgres | -                      | SELECT         | f
- function regress_pg_dump_schema.test_agg(smallint) | postgres | -                      | EXECUTE        | f
- function regress_pg_dump_schema.test_agg(smallint) | postgres | postgres               | EXECUTE        | f
- function regress_pg_dump_schema.test_agg(smallint) | postgres | regress_dump_test_role | EXECUTE        | f
- function regress_pg_dump_schema.test_func()        | postgres | -                      | EXECUTE        | f
- function regress_pg_dump_schema.test_func()        | postgres | postgres               | EXECUTE        | f
- function regress_pg_dump_schema.test_func()        | postgres | regress_dump_test_role | EXECUTE        | f
- function wgo_then_no_access()                      | postgres | -                      | EXECUTE        | f
- function wgo_then_no_access()                      | postgres | postgres               | EXECUTE        | f
- function wgo_then_no_access()                      | postgres | pg_signal_backend      | EXECUTE        | t
- sequence regress_pg_dump_schema.test_seq           | postgres | postgres               | SELECT         | f
- sequence regress_pg_dump_schema.test_seq           | postgres | postgres               | UPDATE         | f
- sequence regress_pg_dump_schema.test_seq           | postgres | postgres               | USAGE          | f
...

diff -w -U3 C:/cirrus/src/test/modules/test_pg_dump/expected/test_pg_dump.out C:/cirrus/build/testrun/test_pg_dump/regre...
--- C:/cirrus/src/test/modules/test_pg_dump/expected/test_pg_dump.out	2024-04-30 04:34:50.370566200 +0000
+++ C:/cirrus/build/testrun/test_pg_dump/regress/results/test_pg_dump.out	2024-04-30 04:41:06.991854500 +0000
@@ -75,64 +75,64 @@
   aclexplode(s.initprivs) a;
                         obj                         | grantor  |        grantee         | privilege_type | is_grantable...
 ----------------------------------------------------+----------+------------------------+----------------+-------------...
- column col1 of table regress_pg_dump_table         | postgres | -                      | SELECT         | f
- function regress_pg_dump_schema.test_agg(smallint) | postgres | -                      | EXECUTE        | f
- function regress_pg_dump_schema.test_agg(smallint) | postgres | postgres               | EXECUTE        | f
- function regress_pg_dump_schema.test_agg(smallint) | postgres | regress_dump_test_role | EXECUTE        | f
- function regress_pg_dump_schema.test_func()        | postgres | -                      | EXECUTE        | f
- function regress_pg_dump_schema.test_func()        | postgres | postgres               | EXECUTE        | f
- function regress_pg_dump_schema.test_func()        | postgres | regress_dump_test_role | EXECUTE        | f
- function wgo_then_no_access()                      | postgres | -                      | EXECUTE        | f
- function wgo_then_no_access()                      | postgres | postgres               | EXECUTE        | f
- function wgo_then_no_access()                      | postgres | pg_signal_backend      | EXECUTE        | t
- sequence regress_pg_dump_schema.test_seq           | postgres | postgres               | SELECT         | f
- sequence regress_pg_dump_schema.test_seq           | postgres | postgres               | UPDATE         | f
- sequence regress_pg_dump_schema.test_seq           | postgres | postgres               | USAGE          | f
...

diff -w -U3 C:/cirrus/src/test/modules/test_pg_dump/expected/test_pg_dump.out C:/cirrus/build/testrun/test_pg_dump/regre...
--- C:/cirrus/src/test/modules/test_pg_dump/expected/test_pg_dump.out	2024-04-30 04:20:24.253448300 +0000
+++ C:/cirrus/build/testrun/test_pg_dump/regress/results/test_pg_dump.out	2024-04-30 04:26:59.036275100 +0000
@@ -75,64 +75,64 @@
   aclexplode(s.initprivs) a;
                         obj                         | grantor  |        grantee         | privilege_type | is_grantable...
 ----------------------------------------------------+----------+------------------------+----------------+-------------...
- column col1 of table regress_pg_dump_table         | postgres | -                      | SELECT         | f
- function regress_pg_dump_schema.test_agg(smallint) | postgres | -                      | EXECUTE        | f
- function regress_pg_dump_schema.test_agg(smallint) | postgres | postgres               | EXECUTE        | f
- function regress_pg_dump_schema.test_agg(smallint) | postgres | regress_dump_test_role | EXECUTE        | f
- function regress_pg_dump_schema.test_func()        | postgres | -                      | EXECUTE        | f
- function regress_pg_dump_schema.test_func()        | postgres | postgres               | EXECUTE        | f
- function regress_pg_dump_schema.test_func()        | postgres | regress_dump_test_role | EXECUTE        | f
- function wgo_then_no_access()                      | postgres | -                      | EXECUTE        | f
- function wgo_then_no_access()                      | postgres | postgres               | EXECUTE        | f
- function wgo_then_no_access()                      | postgres | pg_signal_backend      | EXECUTE        | t
- sequence regress_pg_dump_schema.test_seq           | postgres | postgres               | SELECT         | f
- sequence regress_pg_dump_schema.test_seq           | postgres | postgres               | UPDATE         | f
- sequence regress_pg_dump_schema.test_seq           | postgres | postgres               | USAGE          | f
...

diff -w -U3 C:/cirrus/src/test/modules/test_pg_dump/expected/test_pg_dump.out C:/cirrus/build/testrun/test_pg_dump/regre...
--- C:/cirrus/src/test/modules/test_pg_dump/expected/test_pg_dump.out	2024-04-30 03:35:34.855298900 +0000
+++ C:/cirrus/build/testrun/test_pg_dump/regress/results/test_pg_dump.out	2024-04-30 03:42:45.255005400 +0000
@@ -75,64 +75,64 @@
   aclexplode(s.initprivs) a;
                         obj                         | grantor  |        grantee         | privilege_type | is_grantable...
 ----------------------------------------------------+----------+------------------------+----------------+-------------...
- column col1 of table regress_pg_dump_table         | postgres | -                      | SELECT         | f
- function regress_pg_dump_schema.test_agg(smallint) | postgres | -                      | EXECUTE        | f
- function regress_pg_dump_schema.test_agg(smallint) | postgres | postgres               | EXECUTE        | f
- function regress_pg_dump_schema.test_agg(smallint) | postgres | regress_dump_test_role | EXECUTE        | f
- function regress_pg_dump_schema.test_func()        | postgres | -                      | EXECUTE        | f
- function regress_pg_dump_schema.test_func()        | postgres | postgres               | EXECUTE        | f
- function regress_pg_dump_schema.test_func()        | postgres | regress_dump_test_role | EXECUTE        | f
- function wgo_then_no_access()                      | postgres | -                      | EXECUTE        | f
- function wgo_then_no_access()                      | postgres | postgres               | EXECUTE        | f
- function wgo_then_no_access()                      | postgres | pg_signal_backend      | EXECUTE        | t
- sequence regress_pg_dump_schema.test_seq           | postgres | postgres               | SELECT         | f
- sequence regress_pg_dump_schema.test_seq           | postgres | postgres               | UPDATE         | f
- sequence regress_pg_dump_schema.test_seq           | postgres | postgres               | USAGE          | f
...

diff -w -U3 C:/cirrus/src/test/modules/test_pg_dump/expected/test_pg_dump.out C:/cirrus/build/testrun/test_pg_dump/regre...
--- C:/cirrus/src/test/modules/test_pg_dump/expected/test_pg_dump.out	2024-04-30 03:23:49.021862800 +0000
+++ C:/cirrus/build/testrun/test_pg_dump/regress/results/test_pg_dump.out	2024-04-30 03:30:05.853934900 +0000
@@ -75,64 +75,64 @@
   aclexplode(s.initprivs) a;
                         obj                         | grantor  |        grantee         | privilege_type | is_grantable...
 ----------------------------------------------------+----------+------------------------+----------------+-------------...
- column col1 of table regress_pg_dump_table         | postgres | -                      | SELECT         | f
- function regress_pg_dump_schema.test_agg(smallint) | postgres | -                      | EXECUTE        | f
- function regress_pg_dump_schema.test_agg(smallint) | postgres | postgres               | EXECUTE        | f
- function regress_pg_dump_schema.test_agg(smallint) | postgres | regress_dump_test_role | EXECUTE        | f
- function regress_pg_dump_schema.test_func()        | postgres | -                      | EXECUTE        | f
- function regress_pg_dump_schema.test_func()        | postgres | postgres               | EXECUTE        | f
- function regress_pg_dump_schema.test_func()        | postgres | regress_dump_test_role | EXECUTE        | f
- function wgo_then_no_access()                      | postgres | -                      | EXECUTE        | f
- function wgo_then_no_access()                      | postgres | postgres               | EXECUTE        | f
- function wgo_then_no_access()                      | postgres | pg_signal_backend      | EXECUTE        | t
- sequence regress_pg_dump_schema.test_seq           | postgres | postgres               | SELECT         | f
- sequence regress_pg_dump_schema.test_seq           | postgres | postgres               | UPDATE         | f
- sequence regress_pg_dump_schema.test_seq           | postgres | postgres               | USAGE          | f
...

diff -w -U3 C:/cirrus/src/test/modules/test_pg_dump/expected/test_pg_dump.out C:/cirrus/build/testrun/test_pg_dump/regre...
--- C:/cirrus/src/test/modules/test_pg_dump/expected/test_pg_dump.out	2024-04-30 03:18:55.830463400 +0000
+++ C:/cirrus/build/testrun/test_pg_dump/regress/results/test_pg_dump.out	2024-04-30 03:25:29.205941500 +0000
@@ -75,64 +75,64 @@
   aclexplode(s.initprivs) a;
                         obj                         | grantor  |        grantee         | privilege_type | is_grantable...
 ----------------------------------------------------+----------+------------------------+----------------+-------------...
- column col1 of table regress_pg_dump_table         | postgres | -                      | SELECT         | f
- function regress_pg_dump_schema.test_agg(smallint) | postgres | -                      | EXECUTE        | f
- function regress_pg_dump_schema.test_agg(smallint) | postgres | postgres               | EXECUTE        | f
- function regress_pg_dump_schema.test_agg(smallint) | postgres | regress_dump_test_role | EXECUTE        | f
- function regress_pg_dump_schema.test_func()        | postgres | -                      | EXECUTE        | f
- function regress_pg_dump_schema.test_func()        | postgres | postgres               | EXECUTE        | f
- function regress_pg_dump_schema.test_func()        | postgres | regress_dump_test_role | EXECUTE        | f
- function wgo_then_no_access()                      | postgres | -                      | EXECUTE        | f
- function wgo_then_no_access()                      | postgres | postgres               | EXECUTE        | f
- function wgo_then_no_access()                      | postgres | pg_signal_backend      | EXECUTE        | t
- sequence regress_pg_dump_schema.test_seq           | postgres | postgres               | SELECT         | f
- sequence regress_pg_dump_schema.test_seq           | postgres | postgres               | UPDATE         | f
- sequence regress_pg_dump_schema.test_seq           | postgres | postgres               | USAGE          | f
...

diff -w -U3 C:/cirrus/src/test/modules/test_pg_dump/expected/test_pg_dump.out C:/cirrus/build/testrun/test_pg_dump/regre...
--- C:/cirrus/src/test/modules/test_pg_dump/expected/test_pg_dump.out	2024-04-30 03:17:17.967591600 +0000
+++ C:/cirrus/build/testrun/test_pg_dump/regress/results/test_pg_dump.out	2024-04-30 03:24:05.232361400 +0000
@@ -75,64 +75,64 @@
   aclexplode(s.initprivs) a;
                         obj                         | grantor  |        grantee         | privilege_type | is_grantable...
 ----------------------------------------------------+----------+------------------------+----------------+-------------...
- column col1 of table regress_pg_dump_table         | postgres | -                      | SELECT         | f
- function regress_pg_dump_schema.test_agg(smallint) | postgres | -                      | EXECUTE        | f
- function regress_pg_dump_schema.test_agg(smallint) | postgres | postgres               | EXECUTE        | f
- function regress_pg_dump_schema.test_agg(smallint) | postgres | regress_dump_test_role | EXECUTE        | f
- function regress_pg_dump_schema.test_func()        | postgres | -                      | EXECUTE        | f
- function regress_pg_dump_schema.test_func()        | postgres | postgres               | EXECUTE        | f
- function regress_pg_dump_schema.test_func()        | postgres | regress_dump_test_role | EXECUTE        | f
- function wgo_then_no_access()                      | postgres | -                      | EXECUTE        | f
- function wgo_then_no_access()                      | postgres | postgres               | EXECUTE        | f
- function wgo_then_no_access()                      | postgres | pg_signal_backend      | EXECUTE        | t
- sequence regress_pg_dump_schema.test_seq           | postgres | postgres               | SELECT         | f
- sequence regress_pg_dump_schema.test_seq           | postgres | postgres               | UPDATE         | f
- sequence regress_pg_dump_schema.test_seq           | postgres | postgres               | USAGE          | f
...

diff -w -U3 C:/cirrus/src/test/modules/test_pg_dump/expected/test_pg_dump.out C:/cirrus/build/testrun/test_pg_dump/regre...
--- C:/cirrus/src/test/modules/test_pg_dump/expected/test_pg_dump.out	2024-04-30 02:34:15.477132400 +0000
+++ C:/cirrus/build/testrun/test_pg_dump/regress/results/test_pg_dump.out	2024-04-30 02:40:46.400113000 +0000
@@ -75,64 +75,64 @@
   aclexplode(s.initprivs) a;
                         obj                         | grantor  |        grantee         | privilege_type | is_grantable...
 ----------------------------------------------------+----------+------------------------+----------------+-------------...
- column col1 of table regress_pg_dump_table         | postgres | -                      | SELECT         | f
- function regress_pg_dump_schema.test_agg(smallint) | postgres | -                      | EXECUTE        | f
- function regress_pg_dump_schema.test_agg(smallint) | postgres | postgres               | EXECUTE        | f
- function regress_pg_dump_schema.test_agg(smallint) | postgres | regress_dump_test_role | EXECUTE        | f
- function regress_pg_dump_schema.test_func()        | postgres | -                      | EXECUTE        | f
- function regress_pg_dump_schema.test_func()        | postgres | postgres               | EXECUTE        | f
- function regress_pg_dump_schema.test_func()        | postgres | regress_dump_test_role | EXECUTE        | f
- function wgo_then_no_access()                      | postgres | -                      | EXECUTE        | f
- function wgo_then_no_access()                      | postgres | postgres               | EXECUTE        | f
- function wgo_then_no_access()                      | postgres | pg_signal_backend      | EXECUTE        | t
- sequence regress_pg_dump_schema.test_seq           | postgres | postgres               | SELECT         | f
- sequence regress_pg_dump_schema.test_seq           | postgres | postgres               | UPDATE         | f
- sequence regress_pg_dump_schema.test_seq           | postgres | postgres               | USAGE          | f
...

diff -w -U3 C:/cirrus/src/test/modules/test_pg_dump/expected/test_pg_dump.out C:/cirrus/build/testrun/test_pg_dump/regre...
--- C:/cirrus/src/test/modules/test_pg_dump/expected/test_pg_dump.out	2024-04-30 02:21:02.042295800 +0000
+++ C:/cirrus/build/testrun/test_pg_dump/regress/results/test_pg_dump.out	2024-04-30 02:27:40.672990700 +0000
@@ -75,64 +75,64 @@
   aclexplode(s.initprivs) a;
                         obj                         | grantor  |        grantee         | privilege_type | is_grantable...
 ----------------------------------------------------+----------+------------------------+----------------+-------------...
- column col1 of table regress_pg_dump_table         | postgres | -                      | SELECT         | f
- function regress_pg_dump_schema.test_agg(smallint) | postgres | -                      | EXECUTE        | f
- function regress_pg_dump_schema.test_agg(smallint) | postgres | postgres               | EXECUTE        | f
- function regress_pg_dump_schema.test_agg(smallint) | postgres | regress_dump_test_role | EXECUTE        | f
- function regress_pg_dump_schema.test_func()        | postgres | -                      | EXECUTE        | f
- function regress_pg_dump_schema.test_func()        | postgres | postgres               | EXECUTE        | f
- function regress_pg_dump_schema.test_func()        | postgres | regress_dump_test_role | EXECUTE        | f
- function wgo_then_no_access()                      | postgres | -                      | EXECUTE        | f
- function wgo_then_no_access()                      | postgres | postgres               | EXECUTE        | f
- function wgo_then_no_access()                      | postgres | pg_signal_backend      | EXECUTE        | t
- sequence regress_pg_dump_schema.test_seq           | postgres | postgres               | SELECT         | f
- sequence regress_pg_dump_schema.test_seq           | postgres | postgres               | UPDATE         | f
- sequence regress_pg_dump_schema.test_seq           | postgres | postgres               | USAGE          | f
...

diff -w -U3 C:/cirrus/src/test/modules/test_pg_dump/expected/test_pg_dump.out C:/cirrus/build/testrun/test_pg_dump/regre...
--- C:/cirrus/src/test/modules/test_pg_dump/expected/test_pg_dump.out	2024-04-30 02:19:13.624263400 +0000
+++ C:/cirrus/build/testrun/test_pg_dump/regress/results/test_pg_dump.out	2024-04-30 02:26:18.162492500 +0000
@@ -75,64 +75,64 @@
   aclexplode(s.initprivs) a;
                         obj                         | grantor  |        grantee         | privilege_type | is_grantable...
 ----------------------------------------------------+----------+------------------------+----------------+-------------...
- column col1 of table regress_pg_dump_table         | postgres | -                      | SELECT         | f
- function regress_pg_dump_schema.test_agg(smallint) | postgres | -                      | EXECUTE        | f
- function regress_pg_dump_schema.test_agg(smallint) | postgres | postgres               | EXECUTE        | f
- function regress_pg_dump_schema.test_agg(smallint) | postgres | regress_dump_test_role | EXECUTE        | f
- function regress_pg_dump_schema.test_func()        | postgres | -                      | EXECUTE        | f
- function regress_pg_dump_schema.test_func()        | postgres | postgres               | EXECUTE        | f
- function regress_pg_dump_schema.test_func()        | postgres | regress_dump_test_role | EXECUTE        | f
- function wgo_then_no_access()                      | postgres | -                      | EXECUTE        | f
- function wgo_then_no_access()                      | postgres | postgres               | EXECUTE        | f
- function wgo_then_no_access()                      | postgres | pg_signal_backend      | EXECUTE        | t
- sequence regress_pg_dump_schema.test_seq           | postgres | postgres               | SELECT         | f
- sequence regress_pg_dump_schema.test_seq           | postgres | postgres               | UPDATE         | f
- sequence regress_pg_dump_schema.test_seq           | postgres | postgres               | USAGE          | f
...

diff -w -U3 C:/cirrus/src/test/modules/test_pg_dump/expected/test_pg_dump.out C:/cirrus/build/testrun/test_pg_dump/regre...
--- C:/cirrus/src/test/modules/test_pg_dump/expected/test_pg_dump.out	2024-04-30 02:16:07.515915400 +0000
+++ C:/cirrus/build/testrun/test_pg_dump/regress/results/test_pg_dump.out	2024-04-30 02:22:25.987252600 +0000
@@ -75,64 +75,64 @@
   aclexplode(s.initprivs) a;
                         obj                         | grantor  |        grantee         | privilege_type | is_grantable...
 ----------------------------------------------------+----------+------------------------+----------------+-------------...
- column col1 of table regress_pg_dump_table         | postgres | -                      | SELECT         | f
- function regress_pg_dump_schema.test_agg(smallint) | postgres | -                      | EXECUTE        | f
- function regress_pg_dump_schema.test_agg(smallint) | postgres | postgres               | EXECUTE        | f
- function regress_pg_dump_schema.test_agg(smallint) | postgres | regress_dump_test_role | EXECUTE        | f
- function regress_pg_dump_schema.test_func()        | postgres | -                      | EXECUTE        | f
- function regress_pg_dump_schema.test_func()        | postgres | postgres               | EXECUTE        | f
- function regress_pg_dump_schema.test_func()        | postgres | regress_dump_test_role | EXECUTE        | f
- function wgo_then_no_access()                      | postgres | -                      | EXECUTE        | f
- function wgo_then_no_access()                      | postgres | postgres               | EXECUTE        | f
- function wgo_then_no_access()                      | postgres | pg_signal_backend      | EXECUTE        | t
- sequence regress_pg_dump_schema.test_seq           | postgres | postgres               | SELECT         | f
- sequence regress_pg_dump_schema.test_seq           | postgres | postgres               | UPDATE         | f
- sequence regress_pg_dump_schema.test_seq           | postgres | postgres               | USAGE          | f
...

diff -w -U3 C:/cirrus/src/test/modules/test_pg_dump/expected/test_pg_dump.out C:/cirrus/build/testrun/test_pg_dump/regre...
--- C:/cirrus/src/test/modules/test_pg_dump/expected/test_pg_dump.out	2024-04-30 01:51:02.042009600 +0000
+++ C:/cirrus/build/testrun/test_pg_dump/regress/results/test_pg_dump.out	2024-04-30 01:57:09.244244300 +0000
@@ -75,64 +75,64 @@
   aclexplode(s.initprivs) a;
                         obj                         | grantor  |        grantee         | privilege_type | is_grantable...
 ----------------------------------------------------+----------+------------------------+----------------+-------------...
- column col1 of table regress_pg_dump_table         | postgres | -                      | SELECT         | f
- function regress_pg_dump_schema.test_agg(smallint) | postgres | -                      | EXECUTE        | f
- function regress_pg_dump_schema.test_agg(smallint) | postgres | postgres               | EXECUTE        | f
- function regress_pg_dump_schema.test_agg(smallint) | postgres | regress_dump_test_role | EXECUTE        | f
- function regress_pg_dump_schema.test_func()        | postgres | -                      | EXECUTE        | f
- function regress_pg_dump_schema.test_func()        | postgres | postgres               | EXECUTE        | f
- function regress_pg_dump_schema.test_func()        | postgres | regress_dump_test_role | EXECUTE        | f
- function wgo_then_no_access()                      | postgres | -                      | EXECUTE        | f
- function wgo_then_no_access()                      | postgres | postgres               | EXECUTE        | f
- function wgo_then_no_access()                      | postgres | pg_signal_backend      | EXECUTE        | t
- sequence regress_pg_dump_schema.test_seq           | postgres | postgres               | SELECT         | f
- sequence regress_pg_dump_schema.test_seq           | postgres | postgres               | UPDATE         | f
- sequence regress_pg_dump_schema.test_seq           | postgres | postgres               | USAGE          | f
...

diff -w -U3 C:/cirrus/src/test/modules/test_pg_dump/expected/test_pg_dump.out C:/cirrus/build/testrun/test_pg_dump/regre...
--- C:/cirrus/src/test/modules/test_pg_dump/expected/test_pg_dump.out	2024-04-30 01:24:40.987087400 +0000
+++ C:/cirrus/build/testrun/test_pg_dump/regress/results/test_pg_dump.out	2024-04-30 01:31:42.608168500 +0000
@@ -75,64 +75,64 @@
   aclexplode(s.initprivs) a;
                         obj                         | grantor  |        grantee         | privilege_type | is_grantable...
 ----------------------------------------------------+----------+------------------------+----------------+-------------...
- column col1 of table regress_pg_dump_table         | postgres | -                      | SELECT         | f
- function regress_pg_dump_schema.test_agg(smallint) | postgres | -                      | EXECUTE        | f
- function regress_pg_dump_schema.test_agg(smallint) | postgres | postgres               | EXECUTE        | f
- function regress_pg_dump_schema.test_agg(smallint) | postgres | regress_dump_test_role | EXECUTE        | f
- function regress_pg_dump_schema.test_func()        | postgres | -                      | EXECUTE        | f
- function regress_pg_dump_schema.test_func()        | postgres | postgres               | EXECUTE        | f
- function regress_pg_dump_schema.test_func()        | postgres | regress_dump_test_role | EXECUTE        | f
- function wgo_then_no_access()                      | postgres | -                      | EXECUTE        | f
- function wgo_then_no_access()                      | postgres | postgres               | EXECUTE        | f
- function wgo_then_no_access()                      | postgres | pg_signal_backend      | EXECUTE        | t
- sequence regress_pg_dump_schema.test_seq           | postgres | postgres               | SELECT         | f
- sequence regress_pg_dump_schema.test_seq           | postgres | postgres               | UPDATE         | f
- sequence regress_pg_dump_schema.test_seq           | postgres | postgres               | USAGE          | f
...

diff -w -U3 C:/cirrus/src/test/modules/test_pg_dump/expected/test_pg_dump.out C:/cirrus/build/testrun/test_pg_dump/regre...
--- C:/cirrus/src/test/modules/test_pg_dump/expected/test_pg_dump.out	2024-04-30 01:21:33.203788900 +0000
+++ C:/cirrus/build/testrun/test_pg_dump/regress/results/test_pg_dump.out	2024-04-30 01:27:58.440872800 +0000
@@ -75,64 +75,64 @@
   aclexplode(s.initprivs) a;
                         obj                         | grantor  |        grantee         | privilege_type | is_grantable...
 ----------------------------------------------------+----------+------------------------+----------------+-------------...
- column col1 of table regress_pg_dump_table         | postgres | -                      | SELECT         | f
- function regress_pg_dump_schema.test_agg(smallint) | postgres | -                      | EXECUTE        | f
- function regress_pg_dump_schema.test_agg(smallint) | postgres | postgres               | EXECUTE        | f
- function regress_pg_dump_schema.test_agg(smallint) | postgres | regress_dump_test_role | EXECUTE        | f
- function regress_pg_dump_schema.test_func()        | postgres | -                      | EXECUTE        | f
- function regress_pg_dump_schema.test_func()        | postgres | postgres               | EXECUTE        | f
- function regress_pg_dump_schema.test_func()        | postgres | regress_dump_test_role | EXECUTE        | f
- function wgo_then_no_access()                      | postgres | -                      | EXECUTE        | f
- function wgo_then_no_access()                      | postgres | postgres               | EXECUTE        | f
- function wgo_then_no_access()                      | postgres | pg_signal_backend      | EXECUTE        | t
- sequence regress_pg_dump_schema.test_seq           | postgres | postgres               | SELECT         | f
- sequence regress_pg_dump_schema.test_seq           | postgres | postgres               | UPDATE         | f
- sequence regress_pg_dump_schema.test_seq           | postgres | postgres               | USAGE          | f
...

diff -U3 /tmp/cirrus-ci-build/src/test/modules/injection_points/expected/injection_points.out /tmp/cirrus-ci-build/build...
--- /tmp/cirrus-ci-build/src/test/modules/injection_points/expected/injection_points.out	2024-04-30 01:15:19.655042000 +...
+++ /tmp/cirrus-ci-build/build/testrun/injection_points/regress/results/injection_points.out	2024-04-30 01:18:22.3337370...
@@ -169,44 +169,10 @@
 -- Wait for the previous backend process to exit, ensuring that its local
 -- injection points are cleaned up.
 SELECT wait_pid(:'oldpid');
- wait_pid 
-----------
- 
-(1 row)
-
-SELECT injection_points_run('TestConditionLocal1'); -- nothing
- injection_points_run 
-----------------------
- 
-(1 row)
-
-SELECT injection_points_run('TestConditionLocal2'); -- nothing
- injection_points_run 
...

diff -U3 /tmp/cirrus-ci-build/src/test/modules/injection_points/expected/injection_points.out /tmp/cirrus-ci-build/src/t...
--- /tmp/cirrus-ci-build/src/test/modules/injection_points/expected/injection_points.out	2024-04-30 01:15:12.768516037 +...
+++ /tmp/cirrus-ci-build/src/test/modules/injection_points/results/injection_points.out	2024-04-30 01:21:17.136495937 +0...
@@ -169,44 +169,10 @@
 -- Wait for the previous backend process to exit, ensuring that its local
 -- injection points are cleaned up.
 SELECT wait_pid(:'oldpid');
- wait_pid 
-----------
- 
-(1 row)
-
-SELECT injection_points_run('TestConditionLocal1'); -- nothing
- injection_points_run 
-----------------------
- 
-(1 row)
-
-SELECT injection_points_run('TestConditionLocal2'); -- nothing
- injection_points_run 
...

diff -U3 /tmp/cirrus-ci-build/src/test/modules/injection_points/expected/injection_points.out /tmp/cirrus-ci-build/build...
--- /tmp/cirrus-ci-build/src/test/modules/injection_points/expected/injection_points.out	2024-04-30 01:15:12.782968311 +...
+++ /tmp/cirrus-ci-build/build/testrun/injection_points/regress/results/injection_points.out	2024-04-30 01:20:11.2789904...
@@ -169,44 +169,10 @@
 -- Wait for the previous backend process to exit, ensuring that its local
 -- injection points are cleaned up.
 SELECT wait_pid(:'oldpid');
- wait_pid 
-----------
- 
-(1 row)
-
-SELECT injection_points_run('TestConditionLocal1'); -- nothing
- injection_points_run 
-----------------------
- 
-(1 row)
-
-SELECT injection_points_run('TestConditionLocal2'); -- nothing
- injection_points_run 
...

diff -w -U3 C:/cirrus/src/test/modules/injection_points/expected/injection_points.out C:/cirrus/build/testrun/injection_...
--- C:/cirrus/src/test/modules/injection_points/expected/injection_points.out	2024-04-30 01:15:27.968268300 +0000
+++ C:/cirrus/build/testrun/injection_points/regress/results/injection_points.out	2024-04-30 01:21:50.075153000 +0000
@@ -169,44 +169,10 @@
 -- Wait for the previous backend process to exit, ensuring that its local
 -- injection points are cleaned up.
 SELECT wait_pid(:'oldpid');
- wait_pid 
-----------
- 
-(1 row)
-
-SELECT injection_points_run('TestConditionLocal1'); -- nothing
- injection_points_run 
-----------------------
- 
-(1 row)
-
-SELECT injection_points_run('TestConditionLocal2'); -- nothing
- injection_points_run 
...

diff -w -U3 C:/cirrus/src/test/modules/test_pg_dump/expected/test_pg_dump.out C:/cirrus/build/testrun/test_pg_dump/regre...
--- C:/cirrus/src/test/modules/test_pg_dump/expected/test_pg_dump.out	2024-04-30 01:15:28.093262500 +0000
+++ C:/cirrus/build/testrun/test_pg_dump/regress/results/test_pg_dump.out	2024-04-30 01:21:53.103472700 +0000
@@ -75,64 +75,64 @@
   aclexplode(s.initprivs) a;
                         obj                         | grantor  |        grantee         | privilege_type | is_grantable...
 ----------------------------------------------------+----------+------------------------+----------------+-------------...
- column col1 of table regress_pg_dump_table         | postgres | -                      | SELECT         | f
- function regress_pg_dump_schema.test_agg(smallint) | postgres | -                      | EXECUTE        | f
- function regress_pg_dump_schema.test_agg(smallint) | postgres | postgres               | EXECUTE        | f
- function regress_pg_dump_schema.test_agg(smallint) | postgres | regress_dump_test_role | EXECUTE        | f
- function regress_pg_dump_schema.test_func()        | postgres | -                      | EXECUTE        | f
- function regress_pg_dump_schema.test_func()        | postgres | postgres               | EXECUTE        | f
- function regress_pg_dump_schema.test_func()        | postgres | regress_dump_test_role | EXECUTE        | f
- function wgo_then_no_access()                      | postgres | -                      | EXECUTE        | f
- function wgo_then_no_access()                      | postgres | postgres               | EXECUTE        | f
- function wgo_then_no_access()                      | postgres | pg_signal_backend      | EXECUTE        | t
- sequence regress_pg_dump_schema.test_seq           | postgres | postgres               | SELECT         | f
- sequence regress_pg_dump_schema.test_seq           | postgres | postgres               | UPDATE         | f
- sequence regress_pg_dump_schema.test_seq           | postgres | postgres               | USAGE          | f
...

diff -U3 /Users/admin/pgsql/src/test/modules/injection_points/expected/injection_points.out /Users/admin/pgsql/build/tes...
--- /Users/admin/pgsql/src/test/modules/injection_points/expected/injection_points.out	2024-04-30 01:15:17
+++ /Users/admin/pgsql/build/testrun/injection_points/regress/results/injection_points.out	2024-04-30 01:29:25
@@ -174,39 +174,11 @@
  
 (1 row)
 
+WARNING:  terminating connection because of crash of another server process
+DETAIL:  The postmaster has commanded this server process to roll back the current transaction and exit, because anothe...
+HINT:  In a moment you should be able to reconnect to the database and repeat your command.
 SELECT injection_points_run('TestConditionLocal1'); -- nothing
- injection_points_run 
-----------------------
- 
-(1 row)
-
-SELECT injection_points_run('TestConditionLocal2'); -- nothing
- injection_points_run 
-----------------------
- 
...

diff -w -U3 C:/cirrus/src/test/modules/test_pg_dump/expected/test_pg_dump.out C:/cirrus/build/testrun/test_pg_dump/regre...
--- C:/cirrus/src/test/modules/test_pg_dump/expected/test_pg_dump.out	2024-04-30 00:49:35.672176200 +0000
+++ C:/cirrus/build/testrun/test_pg_dump/regress/results/test_pg_dump.out	2024-04-30 00:56:26.628660700 +0000
@@ -75,64 +75,64 @@
   aclexplode(s.initprivs) a;
                         obj                         | grantor  |        grantee         | privilege_type | is_grantable...
 ----------------------------------------------------+----------+------------------------+----------------+-------------...
- column col1 of table regress_pg_dump_table         | postgres | -                      | SELECT         | f
- function regress_pg_dump_schema.test_agg(smallint) | postgres | -                      | EXECUTE        | f
- function regress_pg_dump_schema.test_agg(smallint) | postgres | postgres               | EXECUTE        | f
- function regress_pg_dump_schema.test_agg(smallint) | postgres | regress_dump_test_role | EXECUTE        | f
- function regress_pg_dump_schema.test_func()        | postgres | -                      | EXECUTE        | f
- function regress_pg_dump_schema.test_func()        | postgres | postgres               | EXECUTE        | f
- function regress_pg_dump_schema.test_func()        | postgres | regress_dump_test_role | EXECUTE        | f
- function wgo_then_no_access()                      | postgres | -                      | EXECUTE        | f
- function wgo_then_no_access()                      | postgres | postgres               | EXECUTE        | f
- function wgo_then_no_access()                      | postgres | pg_signal_backend      | EXECUTE        | t
- sequence regress_pg_dump_schema.test_seq           | postgres | postgres               | SELECT         | f
- sequence regress_pg_dump_schema.test_seq           | postgres | postgres               | UPDATE         | f
- sequence regress_pg_dump_schema.test_seq           | postgres | postgres               | USAGE          | f
...

diff -w -U3 C:/cirrus/src/test/modules/test_pg_dump/expected/test_pg_dump.out C:/cirrus/build/testrun/test_pg_dump/regre...
--- C:/cirrus/src/test/modules/test_pg_dump/expected/test_pg_dump.out	2024-04-30 00:21:59.626412600 +0000
+++ C:/cirrus/build/testrun/test_pg_dump/regress/results/test_pg_dump.out	2024-04-30 00:28:21.735201800 +0000
@@ -73,68 +73,9 @@
   (SELECT pg_describe_object(classoid,objoid,objsubid) AS obj, initprivs
    FROM pg_init_privs WHERE privtype = 'e' ORDER BY 1) s,
   aclexplode(s.initprivs) a;
-                        obj                         | grantor  |        grantee         | privilege_type | is_grantable...
-----------------------------------------------------+----------+------------------------+----------------+-------------...
- column col1 of table regress_pg_dump_table         | postgres | -                      | SELECT         | f
- function regress_pg_dump_schema.test_agg(smallint) | postgres | -                      | EXECUTE        | f
- function regress_pg_dump_schema.test_agg(smallint) | postgres | postgres               | EXECUTE        | f
- function regress_pg_dump_schema.test_agg(smallint) | postgres | regress_dump_test_role | EXECUTE        | f
- function regress_pg_dump_schema.test_func()        | postgres | -                      | EXECUTE        | f
- function regress_pg_dump_schema.test_func()        | postgres | postgres               | EXECUTE        | f
- function regress_pg_dump_schema.test_func()        | postgres | regress_dump_test_role | EXECUTE        | f
- function wgo_then_no_access()                      | postgres | -                      | EXECUTE        | f
- function wgo_then_no_access()                      | postgres | postgres               | EXECUTE        | f
- function wgo_then_no_access()                      | postgres | pg_signal_backend      | EXECUTE        | t
- sequence regress_pg_dump_schema.test_seq           | postgres | postgres               | SELECT         | f
...

diff -U3 /Users/admin/pgsql/src/test/modules/test_pg_dump/expected/test_pg_dump.out /Users/admin/pgsql/build/testrun/tes...
--- /Users/admin/pgsql/src/test/modules/test_pg_dump/expected/test_pg_dump.out	2024-04-30 00:21:44
+++ /Users/admin/pgsql/build/testrun/test_pg_dump/regress/results/test_pg_dump.out	2024-04-30 00:36:12
@@ -73,68 +73,9 @@
   (SELECT pg_describe_object(classoid,objoid,objsubid) AS obj, initprivs
    FROM pg_init_privs WHERE privtype = 'e' ORDER BY 1) s,
   aclexplode(s.initprivs) a;
-                        obj                         | grantor  |        grantee         | privilege_type | is_grantable...
-----------------------------------------------------+----------+------------------------+----------------+-------------...
- column col1 of table regress_pg_dump_table         | postgres | -                      | SELECT         | f
- function regress_pg_dump_schema.test_agg(smallint) | postgres | -                      | EXECUTE        | f
- function regress_pg_dump_schema.test_agg(smallint) | postgres | postgres               | EXECUTE        | f
- function regress_pg_dump_schema.test_agg(smallint) | postgres | regress_dump_test_role | EXECUTE        | f
- function regress_pg_dump_schema.test_func()        | postgres | -                      | EXECUTE        | f
- function regress_pg_dump_schema.test_func()        | postgres | postgres               | EXECUTE        | f
- function regress_pg_dump_schema.test_func()        | postgres | regress_dump_test_role | EXECUTE        | f
- function wgo_then_no_access()                      | postgres | -                      | EXECUTE        | f
- function wgo_then_no_access()                      | postgres | postgres               | EXECUTE        | f
- function wgo_then_no_access()                      | postgres | pg_signal_backend      | EXECUTE        | t
- sequence regress_pg_dump_schema.test_seq           | postgres | postgres               | SELECT         | f
...

diff -w -U3 C:/cirrus/src/test/modules/test_pg_dump/expected/test_pg_dump.out C:/cirrus/build/testrun/test_pg_dump/regre...
--- C:/cirrus/src/test/modules/test_pg_dump/expected/test_pg_dump.out	2024-04-30 00:17:03.799370900 +0000
+++ C:/cirrus/build/testrun/test_pg_dump/regress/results/test_pg_dump.out	2024-04-30 00:23:46.488548000 +0000
@@ -73,68 +73,9 @@
   (SELECT pg_describe_object(classoid,objoid,objsubid) AS obj, initprivs
    FROM pg_init_privs WHERE privtype = 'e' ORDER BY 1) s,
   aclexplode(s.initprivs) a;
-                        obj                         | grantor  |        grantee         | privilege_type | is_grantable...
-----------------------------------------------------+----------+------------------------+----------------+-------------...
- column col1 of table regress_pg_dump_table         | postgres | -                      | SELECT         | f
- function regress_pg_dump_schema.test_agg(smallint) | postgres | -                      | EXECUTE        | f
- function regress_pg_dump_schema.test_agg(smallint) | postgres | postgres               | EXECUTE        | f
- function regress_pg_dump_schema.test_agg(smallint) | postgres | regress_dump_test_role | EXECUTE        | f
- function regress_pg_dump_schema.test_func()        | postgres | -                      | EXECUTE        | f
- function regress_pg_dump_schema.test_func()        | postgres | postgres               | EXECUTE        | f
- function regress_pg_dump_schema.test_func()        | postgres | regress_dump_test_role | EXECUTE        | f
- function wgo_then_no_access()                      | postgres | -                      | EXECUTE        | f
- function wgo_then_no_access()                      | postgres | postgres               | EXECUTE        | f
- function wgo_then_no_access()                      | postgres | pg_signal_backend      | EXECUTE        | t
- sequence regress_pg_dump_schema.test_seq           | postgres | postgres               | SELECT         | f
...

diff -U3 /Users/admin/pgsql/src/test/modules/test_pg_dump/expected/test_pg_dump.out /Users/admin/pgsql/build/testrun/tes...
--- /Users/admin/pgsql/src/test/modules/test_pg_dump/expected/test_pg_dump.out	2024-04-30 00:16:51
+++ /Users/admin/pgsql/build/testrun/test_pg_dump/regress/results/test_pg_dump.out	2024-04-30 00:22:18
@@ -73,68 +73,9 @@
   (SELECT pg_describe_object(classoid,objoid,objsubid) AS obj, initprivs
    FROM pg_init_privs WHERE privtype = 'e' ORDER BY 1) s,
   aclexplode(s.initprivs) a;
-                        obj                         | grantor  |        grantee         | privilege_type | is_grantable...
-----------------------------------------------------+----------+------------------------+----------------+-------------...
- column col1 of table regress_pg_dump_table         | postgres | -                      | SELECT         | f
- function regress_pg_dump_schema.test_agg(smallint) | postgres | -                      | EXECUTE        | f
- function regress_pg_dump_schema.test_agg(smallint) | postgres | postgres               | EXECUTE        | f
- function regress_pg_dump_schema.test_agg(smallint) | postgres | regress_dump_test_role | EXECUTE        | f
- function regress_pg_dump_schema.test_func()        | postgres | -                      | EXECUTE        | f
- function regress_pg_dump_schema.test_func()        | postgres | postgres               | EXECUTE        | f
- function regress_pg_dump_schema.test_func()        | postgres | regress_dump_test_role | EXECUTE        | f
- function wgo_then_no_access()                      | postgres | -                      | EXECUTE        | f
- function wgo_then_no_access()                      | postgres | postgres               | EXECUTE        | f
- function wgo_then_no_access()                      | postgres | pg_signal_backend      | EXECUTE        | t
- sequence regress_pg_dump_schema.test_seq           | postgres | postgres               | SELECT         | f
...

diff -w -U3 C:/cirrus/src/test/modules/test_pg_dump/expected/test_pg_dump.out C:/cirrus/build/testrun/test_pg_dump/regre...
--- C:/cirrus/src/test/modules/test_pg_dump/expected/test_pg_dump.out	2024-04-30 00:15:29.129206400 +0000
+++ C:/cirrus/build/testrun/test_pg_dump/regress/results/test_pg_dump.out	2024-04-30 00:22:46.989832200 +0000
@@ -73,68 +73,9 @@
   (SELECT pg_describe_object(classoid,objoid,objsubid) AS obj, initprivs
    FROM pg_init_privs WHERE privtype = 'e' ORDER BY 1) s,
   aclexplode(s.initprivs) a;
-                        obj                         | grantor  |        grantee         | privilege_type | is_grantable...
-----------------------------------------------------+----------+------------------------+----------------+-------------...
- column col1 of table regress_pg_dump_table         | postgres | -                      | SELECT         | f
- function regress_pg_dump_schema.test_agg(smallint) | postgres | -                      | EXECUTE        | f
- function regress_pg_dump_schema.test_agg(smallint) | postgres | postgres               | EXECUTE        | f
- function regress_pg_dump_schema.test_agg(smallint) | postgres | regress_dump_test_role | EXECUTE        | f
- function regress_pg_dump_schema.test_func()        | postgres | -                      | EXECUTE        | f
- function regress_pg_dump_schema.test_func()        | postgres | postgres               | EXECUTE        | f
- function regress_pg_dump_schema.test_func()        | postgres | regress_dump_test_role | EXECUTE        | f
- function wgo_then_no_access()                      | postgres | -                      | EXECUTE        | f
- function wgo_then_no_access()                      | postgres | postgres               | EXECUTE        | f
- function wgo_then_no_access()                      | postgres | pg_signal_backend      | EXECUTE        | t
- sequence regress_pg_dump_schema.test_seq           | postgres | postgres               | SELECT         | f
...

diff -U3 /Users/admin/pgsql/src/test/modules/test_pg_dump/expected/test_pg_dump.out /Users/admin/pgsql/build/testrun/tes...
--- /Users/admin/pgsql/src/test/modules/test_pg_dump/expected/test_pg_dump.out	2024-04-30 00:15:04
+++ /Users/admin/pgsql/build/testrun/test_pg_dump/regress/results/test_pg_dump.out	2024-04-30 00:19:39
@@ -73,68 +73,9 @@
   (SELECT pg_describe_object(classoid,objoid,objsubid) AS obj, initprivs
    FROM pg_init_privs WHERE privtype = 'e' ORDER BY 1) s,
   aclexplode(s.initprivs) a;
-                        obj                         | grantor  |        grantee         | privilege_type | is_grantable...
-----------------------------------------------------+----------+------------------------+----------------+-------------...
- column col1 of table regress_pg_dump_table         | postgres | -                      | SELECT         | f
- function regress_pg_dump_schema.test_agg(smallint) | postgres | -                      | EXECUTE        | f
- function regress_pg_dump_schema.test_agg(smallint) | postgres | postgres               | EXECUTE        | f
- function regress_pg_dump_schema.test_agg(smallint) | postgres | regress_dump_test_role | EXECUTE        | f
- function regress_pg_dump_schema.test_func()        | postgres | -                      | EXECUTE        | f
- function regress_pg_dump_schema.test_func()        | postgres | postgres               | EXECUTE        | f
- function regress_pg_dump_schema.test_func()        | postgres | regress_dump_test_role | EXECUTE        | f
- function wgo_then_no_access()                      | postgres | -                      | EXECUTE        | f
- function wgo_then_no_access()                      | postgres | postgres               | EXECUTE        | f
- function wgo_then_no_access()                      | postgres | pg_signal_backend      | EXECUTE        | t
- sequence regress_pg_dump_schema.test_seq           | postgres | postgres               | SELECT         | f
...

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/select_parallel.out /tmp/cirrus-ci-build/build/testrun/pg_upgrad...
--- /tmp/cirrus-ci-build/src/test/regress/expected/select_parallel.out	2024-04-29 21:45:49.470597000 +0000
+++ /tmp/cirrus-ci-build/build/testrun/pg_upgrade/002_pg_upgrade/data/results/select_parallel.out	2024-04-29 21:47:19.36...
@@ -451,26 +451,36 @@
   join tenk1 t3 on t3.stringu1 = tenk1.stringu1
   where tenk1.four = t.four
 );
-                                                                                                                       ...
------------------------------------------------------------------------------------------------------------------------...
- Seq Scan on public.tenk1 t
+                                                                                                                       ...
+-----------------------------------------------------------------------------------------------------------------------...
+ Hash Join
    Output: t.unique1, t.unique2, t.two, t.four, t.ten, t.twenty, t.hundred, t.thousand, t.twothousand, t.fivethous, t.t...
-   Filter: (SubPlan 1)
-   SubPlan 1
-     ->  Hash Join
-           Output: t.two
-           Hash Cond: (tenk1.stringu1 = t3.stringu1)
-           ->  Seq Scan on public.tenk1
...

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/select_parallel.out /tmp/cirrus-ci-build/build/testrun/recovery/...
--- /tmp/cirrus-ci-build/src/test/regress/expected/select_parallel.out	2024-04-29 21:45:49.470597000 +0000
+++ /tmp/cirrus-ci-build/build/testrun/recovery/027_stream_regress/data/results/select_parallel.out	2024-04-29 21:48:00....
@@ -451,26 +451,36 @@
   join tenk1 t3 on t3.stringu1 = tenk1.stringu1
   where tenk1.four = t.four
 );
-                                                                                                                       ...
------------------------------------------------------------------------------------------------------------------------...
- Seq Scan on public.tenk1 t
+                                                                                                                       ...
+-----------------------------------------------------------------------------------------------------------------------...
+ Hash Join
    Output: t.unique1, t.unique2, t.two, t.four, t.ten, t.twenty, t.hundred, t.thousand, t.twothousand, t.fivethous, t.t...
-   Filter: (SubPlan 1)
-   SubPlan 1
-     ->  Hash Join
-           Output: t.two
-           Hash Cond: (tenk1.stringu1 = t3.stringu1)
-           ->  Seq Scan on public.tenk1
...

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/select_parallel.out /tmp/cirrus-ci-build/build/testrun/regress/r...
--- /tmp/cirrus-ci-build/src/test/regress/expected/select_parallel.out	2024-04-29 21:45:49.470597000 +0000
+++ /tmp/cirrus-ci-build/build/testrun/regress/regress/results/select_parallel.out	2024-04-29 21:47:18.202713000 +0000
@@ -451,26 +451,36 @@
   join tenk1 t3 on t3.stringu1 = tenk1.stringu1
   where tenk1.four = t.four
 );
-                                                                                                                       ...
------------------------------------------------------------------------------------------------------------------------...
- Seq Scan on public.tenk1 t
+                                                                                                                       ...
+-----------------------------------------------------------------------------------------------------------------------...
+ Hash Join
    Output: t.unique1, t.unique2, t.two, t.four, t.ten, t.twenty, t.hundred, t.thousand, t.twothousand, t.fivethous, t.t...
-   Filter: (SubPlan 1)
-   SubPlan 1
-     ->  Hash Join
-           Output: t.two
-           Hash Cond: (tenk1.stringu1 = t3.stringu1)
-           ->  Seq Scan on public.tenk1
...

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/select_parallel.out /tmp/cirrus-ci-build/src/bin/pg_upgrade/tmp_...
--- /tmp/cirrus-ci-build/src/test/regress/expected/select_parallel.out	2024-04-29 21:45:47.360740155 +0000
+++ /tmp/cirrus-ci-build/src/bin/pg_upgrade/tmp_check/results/select_parallel.out	2024-04-29 21:49:33.428521463 +0000
@@ -451,26 +451,36 @@
   join tenk1 t3 on t3.stringu1 = tenk1.stringu1
   where tenk1.four = t.four
 );
-                                                                                                                       ...
------------------------------------------------------------------------------------------------------------------------...
- Seq Scan on public.tenk1 t
+                                                                                                                       ...
+-----------------------------------------------------------------------------------------------------------------------...
+ Hash Join
    Output: t.unique1, t.unique2, t.two, t.four, t.ten, t.twenty, t.hundred, t.thousand, t.twothousand, t.fivethous, t.t...
-   Filter: (SubPlan 1)
-   SubPlan 1
-     ->  Hash Join
-           Output: t.two
-           Hash Cond: (tenk1.stringu1 = t3.stringu1)
-           ->  Seq Scan on public.tenk1
...

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/select_parallel.out /tmp/cirrus-ci-build/src/test/regress/result...
--- /tmp/cirrus-ci-build/src/test/regress/expected/select_parallel.out	2024-04-29 21:45:47.360740155 +0000
+++ /tmp/cirrus-ci-build/src/test/regress/results/select_parallel.out	2024-04-29 21:48:20.624588670 +0000
@@ -451,26 +451,36 @@
   join tenk1 t3 on t3.stringu1 = tenk1.stringu1
   where tenk1.four = t.four
 );
-                                                                                                                       ...
------------------------------------------------------------------------------------------------------------------------...
- Seq Scan on public.tenk1 t
+                                                                                                                       ...
+-----------------------------------------------------------------------------------------------------------------------...
+ Hash Join
    Output: t.unique1, t.unique2, t.two, t.four, t.ten, t.twenty, t.hundred, t.thousand, t.twothousand, t.fivethous, t.t...
-   Filter: (SubPlan 1)
-   SubPlan 1
-     ->  Hash Join
-           Output: t.two
-           Hash Cond: (tenk1.stringu1 = t3.stringu1)
-           ->  Seq Scan on public.tenk1
...

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/select_parallel.out /tmp/cirrus-ci-build/build/testrun/pg_upgrad...
--- /tmp/cirrus-ci-build/src/test/regress/expected/select_parallel.out	2024-04-29 21:45:44.164552117 +0000
+++ /tmp/cirrus-ci-build/build/testrun/pg_upgrade/002_pg_upgrade/data/results/select_parallel.out	2024-04-29 21:48:32.30...
@@ -451,26 +451,36 @@
   join tenk1 t3 on t3.stringu1 = tenk1.stringu1
   where tenk1.four = t.four
 );
-                                                                                                                       ...
------------------------------------------------------------------------------------------------------------------------...
- Seq Scan on public.tenk1 t
+                                                                                                                       ...
+-----------------------------------------------------------------------------------------------------------------------...
+ Hash Join
    Output: t.unique1, t.unique2, t.two, t.four, t.ten, t.twenty, t.hundred, t.thousand, t.twothousand, t.fivethous, t.t...
-   Filter: (SubPlan 1)
-   SubPlan 1
-     ->  Hash Join
-           Output: t.two
-           Hash Cond: (tenk1.stringu1 = t3.stringu1)
-           ->  Seq Scan on public.tenk1
...

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/select_parallel.out /tmp/cirrus-ci-build/build/testrun/recovery/...
--- /tmp/cirrus-ci-build/src/test/regress/expected/select_parallel.out	2024-04-29 21:45:44.164552117 +0000
+++ /tmp/cirrus-ci-build/build/testrun/recovery/027_stream_regress/data/results/select_parallel.out	2024-04-29 21:49:04....
@@ -451,26 +451,36 @@
   join tenk1 t3 on t3.stringu1 = tenk1.stringu1
   where tenk1.four = t.four
 );
-                                                                                                                       ...
------------------------------------------------------------------------------------------------------------------------...
- Seq Scan on public.tenk1 t
+                                                                                                                       ...
+-----------------------------------------------------------------------------------------------------------------------...
+ Hash Join
    Output: t.unique1, t.unique2, t.two, t.four, t.ten, t.twenty, t.hundred, t.thousand, t.twothousand, t.fivethous, t.t...
-   Filter: (SubPlan 1)
-   SubPlan 1
-     ->  Hash Join
-           Output: t.two
-           Hash Cond: (tenk1.stringu1 = t3.stringu1)
-           ->  Seq Scan on public.tenk1
...

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/select_parallel.out /tmp/cirrus-ci-build/build/testrun/regress/r...
--- /tmp/cirrus-ci-build/src/test/regress/expected/select_parallel.out	2024-04-29 21:45:44.164552117 +0000
+++ /tmp/cirrus-ci-build/build/testrun/regress/regress/results/select_parallel.out	2024-04-29 21:48:27.680405837 +0000
@@ -451,26 +451,36 @@
   join tenk1 t3 on t3.stringu1 = tenk1.stringu1
   where tenk1.four = t.four
 );
-                                                                                                                       ...
------------------------------------------------------------------------------------------------------------------------...
- Seq Scan on public.tenk1 t
+                                                                                                                       ...
+-----------------------------------------------------------------------------------------------------------------------...
+ Hash Join
    Output: t.unique1, t.unique2, t.two, t.four, t.ten, t.twenty, t.hundred, t.thousand, t.twothousand, t.fivethous, t.t...
-   Filter: (SubPlan 1)
-   SubPlan 1
-     ->  Hash Join
-           Output: t.two
-           Hash Cond: (tenk1.stringu1 = t3.stringu1)
-           ->  Seq Scan on public.tenk1
...

diff -w -U3 C:/cirrus/src/test/regress/expected/select_parallel.out C:/cirrus/build/testrun/pg_upgrade/002_pg_upgrade/da...
--- C:/cirrus/src/test/regress/expected/select_parallel.out	2024-04-29 21:45:58.866591500 +0000
+++ C:/cirrus/build/testrun/pg_upgrade/002_pg_upgrade/data/results/select_parallel.out	2024-04-29 21:49:20.618389300 +00...
@@ -452,25 +452,35 @@
   where tenk1.four = t.four
 );
                                                                                                                        ...
------------------------------------------------------------------------------------------------------------------------...
- Seq Scan on public.tenk1 t
+-----------------------------------------------------------------------------------------------------------------------...
+ Hash Join
    Output: t.unique1, t.unique2, t.two, t.four, t.ten, t.twenty, t.hundred, t.thousand, t.twothousand, t.fivethous, t.t...
-   Filter: (SubPlan 1)
-   SubPlan 1
-     ->  Hash Join
-           Output: t.two
-           Hash Cond: (tenk1.stringu1 = t3.stringu1)
-           ->  Seq Scan on public.tenk1
-                 Output: tenk1.unique1, tenk1.unique2, tenk1.two, tenk1.four, tenk1.ten, tenk1.twenty, tenk1.hundred, t...
-                 Filter: (tenk1.four = t.four)
...

diff -w -U3 C:/cirrus/src/test/regress/expected/select_parallel.out C:/cirrus/build/testrun/recovery/027_stream_regress/...
--- C:/cirrus/src/test/regress/expected/select_parallel.out	2024-04-29 21:45:58.866591500 +0000
+++ C:/cirrus/build/testrun/recovery/027_stream_regress/data/results/select_parallel.out	2024-04-29 21:51:34.754613800 +...
@@ -452,25 +452,35 @@
   where tenk1.four = t.four
 );
                                                                                                                        ...
------------------------------------------------------------------------------------------------------------------------...
- Seq Scan on public.tenk1 t
+-----------------------------------------------------------------------------------------------------------------------...
+ Hash Join
    Output: t.unique1, t.unique2, t.two, t.four, t.ten, t.twenty, t.hundred, t.thousand, t.twothousand, t.fivethous, t.t...
-   Filter: (SubPlan 1)
-   SubPlan 1
-     ->  Hash Join
-           Output: t.two
-           Hash Cond: (tenk1.stringu1 = t3.stringu1)
-           ->  Seq Scan on public.tenk1
-                 Output: tenk1.unique1, tenk1.unique2, tenk1.two, tenk1.four, tenk1.ten, tenk1.twenty, tenk1.hundred, t...
-                 Filter: (tenk1.four = t.four)
...

diff -w -U3 C:/cirrus/src/test/regress/expected/select_parallel.out C:/cirrus/build/testrun/regress/regress/results/sele...
--- C:/cirrus/src/test/regress/expected/select_parallel.out	2024-04-29 21:45:58.866591500 +0000
+++ C:/cirrus/build/testrun/regress/regress/results/select_parallel.out	2024-04-29 21:49:17.441140900 +0000
@@ -452,25 +452,35 @@
   where tenk1.four = t.four
 );
                                                                                                                        ...
------------------------------------------------------------------------------------------------------------------------...
- Seq Scan on public.tenk1 t
+-----------------------------------------------------------------------------------------------------------------------...
+ Hash Join
    Output: t.unique1, t.unique2, t.two, t.four, t.ten, t.twenty, t.hundred, t.thousand, t.twothousand, t.fivethous, t.t...
-   Filter: (SubPlan 1)
-   SubPlan 1
-     ->  Hash Join
-           Output: t.two
-           Hash Cond: (tenk1.stringu1 = t3.stringu1)
-           ->  Seq Scan on public.tenk1
-                 Output: tenk1.unique1, tenk1.unique2, tenk1.two, tenk1.four, tenk1.ten, tenk1.twenty, tenk1.hundred, t...
-                 Filter: (tenk1.four = t.four)
...

diff -U3 /Users/admin/pgsql/src/test/regress/expected/select_parallel.out /Users/admin/pgsql/build/testrun/pg_upgrade/00...
--- /Users/admin/pgsql/src/test/regress/expected/select_parallel.out	2024-04-29 21:45:38
+++ /Users/admin/pgsql/build/testrun/pg_upgrade/002_pg_upgrade/data/results/select_parallel.out	2024-04-29 21:48:10
@@ -451,26 +451,36 @@
   join tenk1 t3 on t3.stringu1 = tenk1.stringu1
   where tenk1.four = t.four
 );
-                                                                                                                       ...
------------------------------------------------------------------------------------------------------------------------...
- Seq Scan on public.tenk1 t
+                                                                                                                       ...
+-----------------------------------------------------------------------------------------------------------------------...
+ Hash Join
    Output: t.unique1, t.unique2, t.two, t.four, t.ten, t.twenty, t.hundred, t.thousand, t.twothousand, t.fivethous, t.t...
-   Filter: (SubPlan 1)
-   SubPlan 1
-     ->  Hash Join
-           Output: t.two
-           Hash Cond: (tenk1.stringu1 = t3.stringu1)
-           ->  Seq Scan on public.tenk1
...

diff -U3 /Users/admin/pgsql/src/test/regress/expected/select_parallel.out /Users/admin/pgsql/build/testrun/recovery/027_...
--- /Users/admin/pgsql/src/test/regress/expected/select_parallel.out	2024-04-29 21:45:38
+++ /Users/admin/pgsql/build/testrun/recovery/027_stream_regress/data/results/select_parallel.out	2024-04-29 21:49:21
@@ -451,26 +451,36 @@
   join tenk1 t3 on t3.stringu1 = tenk1.stringu1
   where tenk1.four = t.four
 );
-                                                                                                                       ...
------------------------------------------------------------------------------------------------------------------------...
- Seq Scan on public.tenk1 t
+                                                                                                                       ...
+-----------------------------------------------------------------------------------------------------------------------...
+ Hash Join
    Output: t.unique1, t.unique2, t.two, t.four, t.ten, t.twenty, t.hundred, t.thousand, t.twothousand, t.fivethous, t.t...
-   Filter: (SubPlan 1)
-   SubPlan 1
-     ->  Hash Join
-           Output: t.two
-           Hash Cond: (tenk1.stringu1 = t3.stringu1)
-           ->  Seq Scan on public.tenk1
...

diff -U3 /Users/admin/pgsql/src/test/regress/expected/select_parallel.out /Users/admin/pgsql/build/testrun/regress/regre...
--- /Users/admin/pgsql/src/test/regress/expected/select_parallel.out	2024-04-29 21:45:38
+++ /Users/admin/pgsql/build/testrun/regress/regress/results/select_parallel.out	2024-04-29 21:48:11
@@ -451,26 +451,36 @@
   join tenk1 t3 on t3.stringu1 = tenk1.stringu1
   where tenk1.four = t.four
 );
-                                                                                                                       ...
------------------------------------------------------------------------------------------------------------------------...
- Seq Scan on public.tenk1 t
+                                                                                                                       ...
+-----------------------------------------------------------------------------------------------------------------------...
+ Hash Join
    Output: t.unique1, t.unique2, t.two, t.four, t.ten, t.twenty, t.hundred, t.thousand, t.twothousand, t.fivethous, t.t...
-   Filter: (SubPlan 1)
-   SubPlan 1
-     ->  Hash Join
-           Output: t.two
-           Hash Cond: (tenk1.stringu1 = t3.stringu1)
-           ->  Seq Scan on public.tenk1
...

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/partition_join.out /tmp/cirrus-ci-build/build/testrun/pg_upgrade...
--- /tmp/cirrus-ci-build/src/test/regress/expected/partition_join.out	2024-04-29 18:08:46.287017000 +0000
+++ /tmp/cirrus-ci-build/build/testrun/pg_upgrade/002_pg_upgrade/data/results/partition_join.out	2024-04-29 18:10:24.712...
@@ -5133,17 +5133,15 @@
                               QUERY PLAN                               
 -----------------------------------------------------------------------
  Limit
-   ->  Merge Append
-         Sort Key: x.id
-         ->  Merge Left Join
-               Merge Cond: (x_1.id = y_1.id)
+   ->  Merge Left Join
+         Merge Cond: (x.id = y.id)
+         ->  Append
                ->  Index Only Scan using fract_t0_pkey on fract_t0 x_1
-               ->  Index Only Scan using fract_t0_pkey on fract_t0 y_1
-         ->  Merge Left Join
-               Merge Cond: (x_2.id = y_2.id)
                ->  Index Only Scan using fract_t1_pkey on fract_t1 x_2
+         ->  Append
...

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/partition_join.out /tmp/cirrus-ci-build/build/testrun/recovery/0...
--- /tmp/cirrus-ci-build/src/test/regress/expected/partition_join.out	2024-04-29 18:08:46.287017000 +0000
+++ /tmp/cirrus-ci-build/build/testrun/recovery/027_stream_regress/data/results/partition_join.out	2024-04-29 18:10:56.6...
@@ -5133,17 +5133,15 @@
                               QUERY PLAN                               
 -----------------------------------------------------------------------
  Limit
-   ->  Merge Append
-         Sort Key: x.id
-         ->  Merge Left Join
-               Merge Cond: (x_1.id = y_1.id)
+   ->  Merge Left Join
+         Merge Cond: (x.id = y.id)
+         ->  Append
                ->  Index Only Scan using fract_t0_pkey on fract_t0 x_1
-               ->  Index Only Scan using fract_t0_pkey on fract_t0 y_1
-         ->  Merge Left Join
-               Merge Cond: (x_2.id = y_2.id)
                ->  Index Only Scan using fract_t1_pkey on fract_t1 x_2
+         ->  Append
...

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/partition_join.out /tmp/cirrus-ci-build/build/testrun/regress/re...
--- /tmp/cirrus-ci-build/src/test/regress/expected/partition_join.out	2024-04-29 18:08:46.287017000 +0000
+++ /tmp/cirrus-ci-build/build/testrun/regress/regress/results/partition_join.out	2024-04-29 18:10:24.616271000 +0000
@@ -5133,17 +5133,15 @@
                               QUERY PLAN                               
 -----------------------------------------------------------------------
  Limit
-   ->  Merge Append
-         Sort Key: x.id
-         ->  Merge Left Join
-               Merge Cond: (x_1.id = y_1.id)
+   ->  Merge Left Join
+         Merge Cond: (x.id = y.id)
+         ->  Append
                ->  Index Only Scan using fract_t0_pkey on fract_t0 x_1
-               ->  Index Only Scan using fract_t0_pkey on fract_t0 y_1
-         ->  Merge Left Join
-               Merge Cond: (x_2.id = y_2.id)
                ->  Index Only Scan using fract_t1_pkey on fract_t1 x_2
+         ->  Append
...

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/partition_join.out /tmp/cirrus-ci-build/src/bin/pg_upgrade/tmp_c...
--- /tmp/cirrus-ci-build/src/test/regress/expected/partition_join.out	2024-04-29 18:08:45.435632941 +0000
+++ /tmp/cirrus-ci-build/src/bin/pg_upgrade/tmp_check/results/partition_join.out	2024-04-29 18:12:23.683523776 +0000
@@ -5133,17 +5133,15 @@
                               QUERY PLAN                               
 -----------------------------------------------------------------------
  Limit
-   ->  Merge Append
-         Sort Key: x.id
-         ->  Merge Left Join
-               Merge Cond: (x_1.id = y_1.id)
+   ->  Merge Left Join
+         Merge Cond: (x.id = y.id)
+         ->  Append
                ->  Index Only Scan using fract_t0_pkey on fract_t0 x_1
-               ->  Index Only Scan using fract_t0_pkey on fract_t0 y_1
-         ->  Merge Left Join
-               Merge Cond: (x_2.id = y_2.id)
                ->  Index Only Scan using fract_t1_pkey on fract_t1 x_2
+         ->  Append
...

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/partition_join.out /tmp/cirrus-ci-build/src/test/regress/results...
--- /tmp/cirrus-ci-build/src/test/regress/expected/partition_join.out	2024-04-29 18:08:45.435632941 +0000
+++ /tmp/cirrus-ci-build/src/test/regress/results/partition_join.out	2024-04-29 18:11:23.775530117 +0000
@@ -5133,17 +5133,15 @@
                               QUERY PLAN                               
 -----------------------------------------------------------------------
  Limit
-   ->  Merge Append
-         Sort Key: x.id
-         ->  Merge Left Join
-               Merge Cond: (x_1.id = y_1.id)
+   ->  Merge Left Join
+         Merge Cond: (x.id = y.id)
+         ->  Append
                ->  Index Only Scan using fract_t0_pkey on fract_t0 x_1
-               ->  Index Only Scan using fract_t0_pkey on fract_t0 y_1
-         ->  Merge Left Join
-               Merge Cond: (x_2.id = y_2.id)
                ->  Index Only Scan using fract_t1_pkey on fract_t1 x_2
+         ->  Append
...

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/partition_join.out /tmp/cirrus-ci-build/build/testrun/pg_upgrade...
--- /tmp/cirrus-ci-build/src/test/regress/expected/partition_join.out	2024-04-29 18:08:39.456831475 +0000
+++ /tmp/cirrus-ci-build/build/testrun/pg_upgrade/002_pg_upgrade/data/results/partition_join.out	2024-04-29 18:11:14.660...
@@ -5133,17 +5133,15 @@
                               QUERY PLAN                               
 -----------------------------------------------------------------------
  Limit
-   ->  Merge Append
-         Sort Key: x.id
-         ->  Merge Left Join
-               Merge Cond: (x_1.id = y_1.id)
+   ->  Merge Left Join
+         Merge Cond: (x.id = y.id)
+         ->  Append
                ->  Index Only Scan using fract_t0_pkey on fract_t0 x_1
-               ->  Index Only Scan using fract_t0_pkey on fract_t0 y_1
-         ->  Merge Left Join
-               Merge Cond: (x_2.id = y_2.id)
                ->  Index Only Scan using fract_t1_pkey on fract_t1 x_2
+         ->  Append
...

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/partition_join.out /tmp/cirrus-ci-build/build/testrun/recovery/0...
--- /tmp/cirrus-ci-build/src/test/regress/expected/partition_join.out	2024-04-29 18:08:39.456831475 +0000
+++ /tmp/cirrus-ci-build/build/testrun/recovery/027_stream_regress/data/results/partition_join.out	2024-04-29 18:11:37.0...
@@ -5133,17 +5133,15 @@
                               QUERY PLAN                               
 -----------------------------------------------------------------------
  Limit
-   ->  Merge Append
-         Sort Key: x.id
-         ->  Merge Left Join
-               Merge Cond: (x_1.id = y_1.id)
+   ->  Merge Left Join
+         Merge Cond: (x.id = y.id)
+         ->  Append
                ->  Index Only Scan using fract_t0_pkey on fract_t0 x_1
-               ->  Index Only Scan using fract_t0_pkey on fract_t0 y_1
-         ->  Merge Left Join
-               Merge Cond: (x_2.id = y_2.id)
                ->  Index Only Scan using fract_t1_pkey on fract_t1 x_2
+         ->  Append
...

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/partition_join.out /tmp/cirrus-ci-build/build/testrun/regress/re...
--- /tmp/cirrus-ci-build/src/test/regress/expected/partition_join.out	2024-04-29 18:08:39.456831475 +0000
+++ /tmp/cirrus-ci-build/build/testrun/regress/regress/results/partition_join.out	2024-04-29 18:11:09.552721085 +0000
@@ -5133,17 +5133,15 @@
                               QUERY PLAN                               
 -----------------------------------------------------------------------
  Limit
-   ->  Merge Append
-         Sort Key: x.id
-         ->  Merge Left Join
-               Merge Cond: (x_1.id = y_1.id)
+   ->  Merge Left Join
+         Merge Cond: (x.id = y.id)
+         ->  Append
                ->  Index Only Scan using fract_t0_pkey on fract_t0 x_1
-               ->  Index Only Scan using fract_t0_pkey on fract_t0 y_1
-         ->  Merge Left Join
-               Merge Cond: (x_2.id = y_2.id)
                ->  Index Only Scan using fract_t1_pkey on fract_t1 x_2
+         ->  Append
...

diff -w -U3 C:/cirrus/src/test/regress/expected/partition_join.out C:/cirrus/build/testrun/pg_upgrade/002_pg_upgrade/dat...
--- C:/cirrus/src/test/regress/expected/partition_join.out	2024-04-29 18:09:05.776409900 +0000
+++ C:/cirrus/build/testrun/pg_upgrade/002_pg_upgrade/data/results/partition_join.out	2024-04-29 18:13:07.347972800 +000...
@@ -5133,17 +5133,15 @@
                               QUERY PLAN                               
 -----------------------------------------------------------------------
  Limit
-   ->  Merge Append
-         Sort Key: x.id
          ->  Merge Left Join
-               Merge Cond: (x_1.id = y_1.id)
+         Merge Cond: (x.id = y.id)
+         ->  Append
                ->  Index Only Scan using fract_t0_pkey on fract_t0 x_1
-               ->  Index Only Scan using fract_t0_pkey on fract_t0 y_1
-         ->  Merge Left Join
-               Merge Cond: (x_2.id = y_2.id)
                ->  Index Only Scan using fract_t1_pkey on fract_t1 x_2
+         ->  Append
+               ->  Index Only Scan using fract_t0_pkey on fract_t0 y_1
...

diff -w -U3 C:/cirrus/src/test/regress/expected/partition_join.out C:/cirrus/build/testrun/recovery/027_stream_regress/d...
--- C:/cirrus/src/test/regress/expected/partition_join.out	2024-04-29 18:09:05.776409900 +0000
+++ C:/cirrus/build/testrun/recovery/027_stream_regress/data/results/partition_join.out	2024-04-29 18:15:38.570139100 +0...
@@ -5133,17 +5133,15 @@
                               QUERY PLAN                               
 -----------------------------------------------------------------------
  Limit
-   ->  Merge Append
-         Sort Key: x.id
          ->  Merge Left Join
-               Merge Cond: (x_1.id = y_1.id)
+         Merge Cond: (x.id = y.id)
+         ->  Append
                ->  Index Only Scan using fract_t0_pkey on fract_t0 x_1
-               ->  Index Only Scan using fract_t0_pkey on fract_t0 y_1
-         ->  Merge Left Join
-               Merge Cond: (x_2.id = y_2.id)
                ->  Index Only Scan using fract_t1_pkey on fract_t1 x_2
+         ->  Append
+               ->  Index Only Scan using fract_t0_pkey on fract_t0 y_1
...

diff -w -U3 C:/cirrus/src/test/regress/expected/partition_join.out C:/cirrus/build/testrun/regress/regress/results/parti...
--- C:/cirrus/src/test/regress/expected/partition_join.out	2024-04-29 18:09:05.776409900 +0000
+++ C:/cirrus/build/testrun/regress/regress/results/partition_join.out	2024-04-29 18:12:59.478833500 +0000
@@ -5133,17 +5133,15 @@
                               QUERY PLAN                               
 -----------------------------------------------------------------------
  Limit
-   ->  Merge Append
-         Sort Key: x.id
          ->  Merge Left Join
-               Merge Cond: (x_1.id = y_1.id)
+         Merge Cond: (x.id = y.id)
+         ->  Append
                ->  Index Only Scan using fract_t0_pkey on fract_t0 x_1
-               ->  Index Only Scan using fract_t0_pkey on fract_t0 y_1
-         ->  Merge Left Join
-               Merge Cond: (x_2.id = y_2.id)
                ->  Index Only Scan using fract_t1_pkey on fract_t1 x_2
+         ->  Append
+               ->  Index Only Scan using fract_t0_pkey on fract_t0 y_1
...

diff -U3 /Users/admin/pgsql/src/test/regress/expected/partition_join.out /Users/admin/pgsql/build/testrun/pg_upgrade/002...
--- /Users/admin/pgsql/src/test/regress/expected/partition_join.out	2024-04-29 18:08:36
+++ /Users/admin/pgsql/build/testrun/pg_upgrade/002_pg_upgrade/data/results/partition_join.out	2024-04-29 18:12:57
@@ -5133,17 +5133,15 @@
                               QUERY PLAN                               
 -----------------------------------------------------------------------
  Limit
-   ->  Merge Append
-         Sort Key: x.id
-         ->  Merge Left Join
-               Merge Cond: (x_1.id = y_1.id)
+   ->  Merge Left Join
+         Merge Cond: (x.id = y.id)
+         ->  Append
                ->  Index Only Scan using fract_t0_pkey on fract_t0 x_1
-               ->  Index Only Scan using fract_t0_pkey on fract_t0 y_1
-         ->  Merge Left Join
-               Merge Cond: (x_2.id = y_2.id)
                ->  Index Only Scan using fract_t1_pkey on fract_t1 x_2
+         ->  Append
...

diff -U3 /Users/admin/pgsql/src/test/regress/expected/partition_join.out /Users/admin/pgsql/build/testrun/recovery/027_s...
--- /Users/admin/pgsql/src/test/regress/expected/partition_join.out	2024-04-29 18:08:36
+++ /Users/admin/pgsql/build/testrun/recovery/027_stream_regress/data/results/partition_join.out	2024-04-29 18:14:19
@@ -5133,17 +5133,15 @@
                               QUERY PLAN                               
 -----------------------------------------------------------------------
  Limit
-   ->  Merge Append
-         Sort Key: x.id
-         ->  Merge Left Join
-               Merge Cond: (x_1.id = y_1.id)
+   ->  Merge Left Join
+         Merge Cond: (x.id = y.id)
+         ->  Append
                ->  Index Only Scan using fract_t0_pkey on fract_t0 x_1
-               ->  Index Only Scan using fract_t0_pkey on fract_t0 y_1
-         ->  Merge Left Join
-               Merge Cond: (x_2.id = y_2.id)
                ->  Index Only Scan using fract_t1_pkey on fract_t1 x_2
+         ->  Append
...

diff -U3 /Users/admin/pgsql/src/test/regress/expected/partition_join.out /Users/admin/pgsql/build/testrun/regress/regres...
--- /Users/admin/pgsql/src/test/regress/expected/partition_join.out	2024-04-29 18:08:36
+++ /Users/admin/pgsql/build/testrun/regress/regress/results/partition_join.out	2024-04-29 18:12:52
@@ -5133,17 +5133,15 @@
                               QUERY PLAN                               
 -----------------------------------------------------------------------
  Limit
-   ->  Merge Append
-         Sort Key: x.id
-         ->  Merge Left Join
-               Merge Cond: (x_1.id = y_1.id)
+   ->  Merge Left Join
+         Merge Cond: (x.id = y.id)
+         ->  Append
                ->  Index Only Scan using fract_t0_pkey on fract_t0 x_1
-               ->  Index Only Scan using fract_t0_pkey on fract_t0 y_1
-         ->  Merge Left Join
-               Merge Cond: (x_2.id = y_2.id)
                ->  Index Only Scan using fract_t1_pkey on fract_t1 x_2
+         ->  Append
...

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/alter_table.out /tmp/cirrus-ci-build/build/testrun/pg_upgrade/00...
--- /tmp/cirrus-ci-build/src/test/regress/expected/alter_table.out	2024-04-29 11:05:50.237995000 +0000
+++ /tmp/cirrus-ci-build/build/testrun/pg_upgrade/002_pg_upgrade/data/results/alter_table.out	2024-04-29 11:07:26.354875...
@@ -3476,9 +3476,20 @@
 WHERE relkind IN ('r', 'i', 'S', 't', 'm') AND mapped_oid IS DISTINCT FROM oid;
 SELECT m.* FROM filenode_mapping m LEFT JOIN pg_class c ON c.oid = m.oid
 WHERE c.oid IS NOT NULL OR m.mapped_oid IS NOT NULL;
- oid | mapped_oid | reltablespace | relfilenode | relname 
------+------------+---------------+-------------+---------
-(0 rows)
+  oid  | mapped_oid | reltablespace | relfilenode |       relname        
+-------+------------+---------------+-------------+----------------------
+ 37818 |            |             0 |       37818 | pktable_pkey
+ 37815 |            |             0 |       37815 | pktable
+ 37820 |            |             0 |       37820 | fktable
+ 38336 |            |             0 |       38342 | foo
+ 38346 |            |             0 |       38346 | pg_toast_38336_index
+ 38345 |            |             0 |       38345 | pg_toast_38336
+ 38625 |            |             0 |       38625 | old_oids
+ 38644 |            |             0 |       38644 | pg_toast_38641
...

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/alter_table.out /tmp/cirrus-ci-build/build/testrun/recovery/027_...
--- /tmp/cirrus-ci-build/src/test/regress/expected/alter_table.out	2024-04-29 11:05:50.237995000 +0000
+++ /tmp/cirrus-ci-build/build/testrun/recovery/027_stream_regress/data/results/alter_table.out	2024-04-29 11:07:56.1559...
@@ -3476,9 +3476,20 @@
 WHERE relkind IN ('r', 'i', 'S', 't', 'm') AND mapped_oid IS DISTINCT FROM oid;
 SELECT m.* FROM filenode_mapping m LEFT JOIN pg_class c ON c.oid = m.oid
 WHERE c.oid IS NOT NULL OR m.mapped_oid IS NOT NULL;
- oid | mapped_oid | reltablespace | relfilenode | relname 
------+------------+---------------+-------------+---------
-(0 rows)
+  oid  | mapped_oid | reltablespace | relfilenode |       relname        
+-------+------------+---------------+-------------+----------------------
+ 37725 |            |             0 |       37725 | pktable_pkey
+ 37722 |            |             0 |       37722 | pktable
+ 37729 |            |             0 |       37729 | fktable
+ 38293 |            |             0 |       38299 | foo
+ 38303 |            |             0 |       38303 | pg_toast_38293_index
+ 38302 |            |             0 |       38302 | pg_toast_38293
+ 38512 |            |             0 |       38512 | old_oids
+ 38533 |            |             0 |       38533 | pg_toast_38530
...

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/alter_table.out /tmp/cirrus-ci-build/build/testrun/regress/regre...
--- /tmp/cirrus-ci-build/src/test/regress/expected/alter_table.out	2024-04-29 11:05:50.237995000 +0000
+++ /tmp/cirrus-ci-build/build/testrun/regress/regress/results/alter_table.out	2024-04-29 11:07:21.085172000 +0000
@@ -3476,9 +3476,20 @@
 WHERE relkind IN ('r', 'i', 'S', 't', 'm') AND mapped_oid IS DISTINCT FROM oid;
 SELECT m.* FROM filenode_mapping m LEFT JOIN pg_class c ON c.oid = m.oid
 WHERE c.oid IS NOT NULL OR m.mapped_oid IS NOT NULL;
- oid | mapped_oid | reltablespace | relfilenode | relname 
------+------------+---------------+-------------+---------
-(0 rows)
+  oid  | mapped_oid | reltablespace | relfilenode |       relname        
+-------+------------+---------------+-------------+----------------------
+ 37734 |            |             0 |       37734 | pktable_pkey
+ 37727 |            |             0 |       37727 | pktable
+ 37736 |            |             0 |       37736 | fktable
+ 38331 |            |             0 |       38336 | foo
+ 38340 |            |             0 |       38340 | pg_toast_38331_index
+ 38339 |            |             0 |       38339 | pg_toast_38331
+ 38548 |            |             0 |       38548 | old_oids
+ 38569 |            |             0 |       38569 | pg_toast_38565
...

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/alter_table.out /tmp/cirrus-ci-build/src/bin/pg_upgrade/tmp_chec...
--- /tmp/cirrus-ci-build/src/test/regress/expected/alter_table.out	2024-04-29 11:05:38.400537804 +0000
+++ /tmp/cirrus-ci-build/src/bin/pg_upgrade/tmp_check/results/alter_table.out	2024-04-29 11:09:01.752575736 +0000
@@ -3476,9 +3476,20 @@
 WHERE relkind IN ('r', 'i', 'S', 't', 'm') AND mapped_oid IS DISTINCT FROM oid;
 SELECT m.* FROM filenode_mapping m LEFT JOIN pg_class c ON c.oid = m.oid
 WHERE c.oid IS NOT NULL OR m.mapped_oid IS NOT NULL;
- oid | mapped_oid | reltablespace | relfilenode | relname 
------+------------+---------------+-------------+---------
-(0 rows)
+  oid  | mapped_oid | reltablespace | relfilenode |       relname        
+-------+------------+---------------+-------------+----------------------
+ 37946 |            |             0 |       37946 | pktable_pkey
+ 37943 |            |             0 |       37943 | pktable
+ 37949 |            |             0 |       37949 | fktable
+ 38483 |            |             0 |       38488 | foo
+ 38492 |            |             0 |       38492 | pg_toast_38483_index
+ 38491 |            |             0 |       38491 | pg_toast_38483
+ 38747 |            |             0 |       38747 | old_oids
+ 38771 |            |             0 |       38771 | pg_toast_38768
...

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/alter_table.out /tmp/cirrus-ci-build/src/test/regress/results/al...
--- /tmp/cirrus-ci-build/src/test/regress/expected/alter_table.out	2024-04-29 11:05:38.400537804 +0000
+++ /tmp/cirrus-ci-build/src/test/regress/results/alter_table.out	2024-04-29 11:07:56.636575281 +0000
@@ -3476,9 +3476,20 @@
 WHERE relkind IN ('r', 'i', 'S', 't', 'm') AND mapped_oid IS DISTINCT FROM oid;
 SELECT m.* FROM filenode_mapping m LEFT JOIN pg_class c ON c.oid = m.oid
 WHERE c.oid IS NOT NULL OR m.mapped_oid IS NOT NULL;
- oid | mapped_oid | reltablespace | relfilenode | relname 
------+------------+---------------+-------------+---------
-(0 rows)
+  oid  | mapped_oid | reltablespace | relfilenode |       relname        
+-------+------------+---------------+-------------+----------------------
+ 37884 |            |             0 |       37884 | pktable_pkey
+ 37881 |            |             0 |       37881 | pktable
+ 37887 |            |             0 |       37887 | fktable
+ 38447 |            |             0 |       38453 | foo
+ 38457 |            |             0 |       38457 | pg_toast_38447_index
+ 38456 |            |             0 |       38456 | pg_toast_38447
+ 38671 |            |             0 |       38671 | old_oids
+ 38690 |            |             0 |       38690 | pg_toast_38687
...

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/alter_table.out /tmp/cirrus-ci-build/build/testrun/pg_upgrade/00...
--- /tmp/cirrus-ci-build/src/test/regress/expected/alter_table.out	2024-04-29 11:05:38.449063816 +0000
+++ /tmp/cirrus-ci-build/build/testrun/pg_upgrade/002_pg_upgrade/data/results/alter_table.out	2024-04-29 11:07:50.048946...
@@ -3476,9 +3476,29 @@
 WHERE relkind IN ('r', 'i', 'S', 't', 'm') AND mapped_oid IS DISTINCT FROM oid;
 SELECT m.* FROM filenode_mapping m LEFT JOIN pg_class c ON c.oid = m.oid
 WHERE c.oid IS NOT NULL OR m.mapped_oid IS NOT NULL;
- oid | mapped_oid | reltablespace | relfilenode | relname 
------+------------+---------------+-------------+---------
-(0 rows)
+  oid  | mapped_oid | reltablespace | relfilenode |       relname        
+-------+------------+---------------+-------------+----------------------
+ 38074 |            |             0 |       38074 | pg_toast_38066
+ 38075 |            |             0 |       38075 | pg_toast_38066_index
+ 38066 |            |             0 |       38066 | users
+ 38065 |            |             0 |       38065 | users_id_seq
+ 38313 |            |             0 |       38313 | foo
+ 38555 |            |             0 |       38555 | forc_test
+ 38940 |            |             0 |       38940 | pg_toast_38937
+ 38941 |            |             0 |       38941 | pg_toast_38937_index
...

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/alter_table.out /tmp/cirrus-ci-build/build/testrun/recovery/027_...
--- /tmp/cirrus-ci-build/src/test/regress/expected/alter_table.out	2024-04-29 11:05:38.449063816 +0000
+++ /tmp/cirrus-ci-build/build/testrun/recovery/027_stream_regress/data/results/alter_table.out	2024-04-29 11:08:16.0489...
@@ -3476,9 +3476,29 @@
 WHERE relkind IN ('r', 'i', 'S', 't', 'm') AND mapped_oid IS DISTINCT FROM oid;
 SELECT m.* FROM filenode_mapping m LEFT JOIN pg_class c ON c.oid = m.oid
 WHERE c.oid IS NOT NULL OR m.mapped_oid IS NOT NULL;
- oid | mapped_oid | reltablespace | relfilenode | relname 
------+------------+---------------+-------------+---------
-(0 rows)
+  oid  | mapped_oid | reltablespace | relfilenode |       relname        
+-------+------------+---------------+-------------+----------------------
+ 37916 |            |             0 |       37916 | users
+ 37915 |            |             0 |       37915 | users_id_seq
+ 37921 |            |             0 |       37921 | pg_toast_37916
+ 37933 |            |             0 |       37933 | pg_toast_37916_index
+ 38170 |            |             0 |       38170 | foo
+ 38357 |            |             0 |       38357 | forc_test
+ 38799 |            |             0 |       38799 | pg_toast_38796
+ 38800 |            |             0 |       38800 | pg_toast_38796_index
...

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/alter_table.out /tmp/cirrus-ci-build/build/testrun/regress/regre...
--- /tmp/cirrus-ci-build/src/test/regress/expected/alter_table.out	2024-04-29 11:05:38.449063816 +0000
+++ /tmp/cirrus-ci-build/build/testrun/regress/regress/results/alter_table.out	2024-04-29 11:07:45.672949148 +0000
@@ -3476,9 +3476,29 @@
 WHERE relkind IN ('r', 'i', 'S', 't', 'm') AND mapped_oid IS DISTINCT FROM oid;
 SELECT m.* FROM filenode_mapping m LEFT JOIN pg_class c ON c.oid = m.oid
 WHERE c.oid IS NOT NULL OR m.mapped_oid IS NOT NULL;
- oid | mapped_oid | reltablespace | relfilenode | relname 
------+------------+---------------+-------------+---------
-(0 rows)
+  oid  | mapped_oid | reltablespace | relfilenode |       relname        
+-------+------------+---------------+-------------+----------------------
+ 38877 |            |             0 |       38877 | pg_toast_38874
+ 37964 |            |             0 |       37964 | users_id_seq
+ 37970 |            |             0 |       37970 | pg_toast_37965
+ 37971 |            |             0 |       37971 | pg_toast_37965_index
+ 37965 |            |             0 |       37965 | users
+ 38134 |            |             0 |       38134 | foo
+ 38343 |            |             0 |       38343 | forc_test
+ 38878 |            |             0 |       38878 | pg_toast_38874_index
...

diff -w -U3 C:/cirrus/src/test/regress/expected/alter_table.out C:/cirrus/build/testrun/pg_upgrade/002_pg_upgrade/data/r...
--- C:/cirrus/src/test/regress/expected/alter_table.out	2024-04-29 11:05:53.811323000 +0000
+++ C:/cirrus/build/testrun/pg_upgrade/002_pg_upgrade/data/results/alter_table.out	2024-04-29 11:09:37.029688800 +0000
@@ -3477,8 +3477,19 @@
 SELECT m.* FROM filenode_mapping m LEFT JOIN pg_class c ON c.oid = m.oid
 WHERE c.oid IS NOT NULL OR m.mapped_oid IS NOT NULL;
  oid | mapped_oid | reltablespace | relfilenode | relname 
------+------------+---------------+-------------+---------
-(0 rows)
+-------+------------+---------------+-------------+----------------------
+ 36901 |            |             0 |       36901 | pktable_pkey
+ 36897 |            |             0 |       36897 | pktable
+ 36907 |            |             0 |       36907 | fktable
+ 37974 |            |             0 |       37979 | foo
+ 37983 |            |             0 |       37983 | pg_toast_37974_index
+ 37982 |            |             0 |       37982 | pg_toast_37974
+ 38217 |            |             0 |       38217 | old_oids
+ 38244 |            |             0 |       38244 | pg_toast_38241
+ 38245 |            |             0 |       38245 | pg_toast_38241_index
+ 38241 |            |             0 |       38241 | recur2
...

diff -w -U3 C:/cirrus/src/test/regress/expected/alter_table.out C:/cirrus/build/testrun/recovery/027_stream_regress/data...
--- C:/cirrus/src/test/regress/expected/alter_table.out	2024-04-29 11:05:53.811323000 +0000
+++ C:/cirrus/build/testrun/recovery/027_stream_regress/data/results/alter_table.out	2024-04-29 11:11:37.700099700 +0000
@@ -3477,8 +3477,19 @@
 SELECT m.* FROM filenode_mapping m LEFT JOIN pg_class c ON c.oid = m.oid
 WHERE c.oid IS NOT NULL OR m.mapped_oid IS NOT NULL;
  oid | mapped_oid | reltablespace | relfilenode | relname 
------+------------+---------------+-------------+---------
-(0 rows)
+-------+------------+---------------+-------------+----------------------
+ 37311 |            |             0 |       37311 | pktable_pkey
+ 37308 |            |             0 |       37308 | pktable
+ 37315 |            |             0 |       37315 | fktable
+ 38005 |            |             0 |       38010 | foo
+ 38014 |            |             0 |       38014 | pg_toast_38005_index
+ 38013 |            |             0 |       38013 | pg_toast_38005
+ 38280 |            |             0 |       38280 | old_oids
+ 38305 |            |             0 |       38305 | pg_toast_38302
+ 38306 |            |             0 |       38306 | pg_toast_38302_index
+ 38302 |            |             0 |       38302 | recur2
...

diff -w -U3 C:/cirrus/src/test/regress/expected/alter_table.out C:/cirrus/build/testrun/regress/regress/results/alter_ta...
--- C:/cirrus/src/test/regress/expected/alter_table.out	2024-04-29 11:05:53.811323000 +0000
+++ C:/cirrus/build/testrun/regress/regress/results/alter_table.out	2024-04-29 11:09:34.903726800 +0000
@@ -3477,8 +3477,19 @@
 SELECT m.* FROM filenode_mapping m LEFT JOIN pg_class c ON c.oid = m.oid
 WHERE c.oid IS NOT NULL OR m.mapped_oid IS NOT NULL;
  oid | mapped_oid | reltablespace | relfilenode | relname 
------+------------+---------------+-------------+---------
-(0 rows)
+-------+------------+---------------+-------------+----------------------
+ 37503 |            |             0 |       37503 | pktable_pkey
+ 37500 |            |             0 |       37500 | pktable
+ 37513 |            |             0 |       37513 | fktable
+ 38144 |            |             0 |       38161 | foo
+ 38165 |            |             0 |       38165 | pg_toast_38144_index
+ 38164 |            |             0 |       38164 | pg_toast_38144
+ 38379 |            |             0 |       38379 | old_oids
+ 38409 |            |             0 |       38409 | pg_toast_38406
+ 38410 |            |             0 |       38410 | pg_toast_38406_index
+ 38406 |            |             0 |       38406 | recur2
...

diff -U3 /Users/admin/pgsql/src/test/regress/expected/alter_table.out /Users/admin/pgsql/build/testrun/pg_upgrade/002_pg...
--- /Users/admin/pgsql/src/test/regress/expected/alter_table.out	2024-04-29 11:05:36
+++ /Users/admin/pgsql/build/testrun/pg_upgrade/002_pg_upgrade/data/results/alter_table.out	2024-04-29 11:07:57
@@ -3476,9 +3476,20 @@
 WHERE relkind IN ('r', 'i', 'S', 't', 'm') AND mapped_oid IS DISTINCT FROM oid;
 SELECT m.* FROM filenode_mapping m LEFT JOIN pg_class c ON c.oid = m.oid
 WHERE c.oid IS NOT NULL OR m.mapped_oid IS NOT NULL;
- oid | mapped_oid | reltablespace | relfilenode | relname 
------+------------+---------------+-------------+---------
-(0 rows)
+  oid  | mapped_oid | reltablespace | relfilenode |       relname        
+-------+------------+---------------+-------------+----------------------
+ 37636 |            |             0 |       37636 | pktable_pkey
+ 37633 |            |             0 |       37633 | pktable
+ 37641 |            |             0 |       37641 | fktable
+ 38443 |            |             0 |       38448 | foo
+ 38452 |            |             0 |       38452 | pg_toast_38443_index
+ 38451 |            |             0 |       38451 | pg_toast_38443
+ 38692 |            |             0 |       38692 | pg_toast_38689
+ 38675 |            |             0 |       38675 | old_oids
...

diff -U3 /Users/admin/pgsql/src/test/regress/expected/alter_table.out /Users/admin/pgsql/build/testrun/recovery/027_stre...
--- /Users/admin/pgsql/src/test/regress/expected/alter_table.out	2024-04-29 11:05:36
+++ /Users/admin/pgsql/build/testrun/recovery/027_stream_regress/data/results/alter_table.out	2024-04-29 11:09:56
@@ -3476,9 +3476,20 @@
 WHERE relkind IN ('r', 'i', 'S', 't', 'm') AND mapped_oid IS DISTINCT FROM oid;
 SELECT m.* FROM filenode_mapping m LEFT JOIN pg_class c ON c.oid = m.oid
 WHERE c.oid IS NOT NULL OR m.mapped_oid IS NOT NULL;
- oid | mapped_oid | reltablespace | relfilenode | relname 
------+------------+---------------+-------------+---------
-(0 rows)
+  oid  | mapped_oid | reltablespace | relfilenode |       relname        
+-------+------------+---------------+-------------+----------------------
+ 37529 |            |             0 |       37529 | pktable_pkey
+ 37526 |            |             0 |       37526 | pktable
+ 37531 |            |             0 |       37531 | fktable
+ 38267 |            |             0 |       38273 | foo
+ 38278 |            |             0 |       38278 | pg_toast_38267_index
+ 38277 |            |             0 |       38277 | pg_toast_38267
+ 38499 |            |             0 |       38499 | old_oids
+ 38519 |            |             0 |       38519 | pg_toast_38516
...

diff -U3 /Users/admin/pgsql/src/test/regress/expected/alter_table.out /Users/admin/pgsql/build/testrun/regress/regress/r...
--- /Users/admin/pgsql/src/test/regress/expected/alter_table.out	2024-04-29 11:05:36
+++ /Users/admin/pgsql/build/testrun/regress/regress/results/alter_table.out	2024-04-29 11:07:54
@@ -3476,9 +3476,20 @@
 WHERE relkind IN ('r', 'i', 'S', 't', 'm') AND mapped_oid IS DISTINCT FROM oid;
 SELECT m.* FROM filenode_mapping m LEFT JOIN pg_class c ON c.oid = m.oid
 WHERE c.oid IS NOT NULL OR m.mapped_oid IS NOT NULL;
- oid | mapped_oid | reltablespace | relfilenode | relname 
------+------------+---------------+-------------+---------
-(0 rows)
+  oid  | mapped_oid | reltablespace | relfilenode |       relname        
+-------+------------+---------------+-------------+----------------------
+ 37766 |            |             0 |       37766 | pktable_pkey
+ 37763 |            |             0 |       37763 | pktable
+ 37768 |            |             0 |       37768 | fktable
+ 38355 |            |             0 |       38360 | foo
+ 38364 |            |             0 |       38364 | pg_toast_38355_index
+ 38363 |            |             0 |       38363 | pg_toast_38355
+ 38664 |            |             0 |       38664 | old_oids
+ 38681 |            |             0 |       38681 | pg_toast_38678
...

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/constraints.out /tmp/cirrus-ci-build/build/testrun/pg_upgrade/00...
--- /tmp/cirrus-ci-build/src/test/regress/expected/constraints.out	2024-04-29 08:02:57.080035000 +0000
+++ /tmp/cirrus-ci-build/build/testrun/pg_upgrade/002_pg_upgrade/data/results/constraints.out	2024-04-29 08:04:05.450750...
@@ -1231,72 +1231,10 @@
 Inherits: notnull_tbl4
 
 \d+ notnull_tbl4_cld2
-                             Table "public.notnull_tbl4_cld2"
- Column |  Type   | Collation | Nullable | Default | Storage | Stats target | Description 
---------+---------+-----------+----------+---------+---------+--------------+-------------
- a      | integer |           | not null |         | plain   |              | 
-Indexes:
-    "notnull_tbl4_cld2_pkey" PRIMARY KEY, btree (a) DEFERRABLE
-Not-null constraints:
-    "notnull_tbl4_cld2_a_not_null" NOT NULL "a" (inherited)
-Inherits: notnull_tbl4
-
-\d+ notnull_tbl4_cld3
-                             Table "public.notnull_tbl4_cld3"
- Column |  Type   | Collation | Nullable | Default | Storage | Stats target | Description 
...

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/constraints.out /tmp/cirrus-ci-build/build/testrun/recovery/027_...
--- /tmp/cirrus-ci-build/src/test/regress/expected/constraints.out	2024-04-29 08:02:57.080035000 +0000
+++ /tmp/cirrus-ci-build/build/testrun/recovery/027_stream_regress/data/results/constraints.out	2024-04-29 08:04:25.9814...
@@ -1160,143 +1160,10 @@
 create table cnn2_parted(a int primary key) partition by list (a);
 create table cnn2_part1(a int);
 alter table cnn2_parted attach partition cnn2_part1 for values in (1);
-insert into cnn2_part1 values (null);
-ERROR:  null value in column "a" of relation "cnn2_part1" violates not-null constraint
-DETAIL:  Failing row contains (null).
-drop table cnn2_parted, cnn2_part1;
-create table cnn2_parted(a int not null) partition by list (a);
-create table cnn2_part1(a int primary key);
-alter table cnn2_parted attach partition cnn2_part1 for values in (1);
-ERROR:  column "a" in child table must be marked NOT NULL
-drop table cnn2_parted, cnn2_part1;
-create table cnn2_parted(a int) partition by list (a);
-create table cnn_part1 partition of cnn2_parted for values in (1, null);
-insert into cnn_part1 values (null);
-alter table cnn2_parted add primary key (a);
...

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/constraints.out /tmp/cirrus-ci-build/build/testrun/regress/regre...
--- /tmp/cirrus-ci-build/src/test/regress/expected/constraints.out	2024-04-29 08:02:57.080035000 +0000
+++ /tmp/cirrus-ci-build/build/testrun/regress/regress/results/constraints.out	2024-04-29 08:04:01.266541000 +0000
@@ -1183,120 +1183,7 @@
 CREATE TABLE notnull_tbl4_lk3 (LIKE notnull_tbl4 INCLUDING INDEXES, CONSTRAINT a_nn NOT NULL a);
 CREATE TABLE notnull_tbl4_cld () INHERITS (notnull_tbl4);
 CREATE TABLE notnull_tbl4_cld2 (PRIMARY KEY (a) DEFERRABLE) INHERITS (notnull_tbl4);
-CREATE TABLE notnull_tbl4_cld3 (PRIMARY KEY (a) DEFERRABLE, CONSTRAINT a_nn NOT NULL a) INHERITS (notnull_tbl4);
-\d+ notnull_tbl4
-                               Table "public.notnull_tbl4"
- Column |  Type   | Collation | Nullable | Default | Storage | Stats target | Description 
---------+---------+-----------+----------+---------+---------+--------------+-------------
- a      | integer |           | not null |         | plain   |              | 
-Indexes:
-    "notnull_tbl4_pkey" PRIMARY KEY, btree (a) DEFERRABLE INITIALLY DEFERRED
-Child tables: notnull_tbl4_cld,
-              notnull_tbl4_cld2,
-              notnull_tbl4_cld3
-
-\d+ notnull_tbl4_lk
...

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/triggers.out /tmp/cirrus-ci-build/src/bin/pg_upgrade/tmp_check/r...
--- /tmp/cirrus-ci-build/src/test/regress/expected/triggers.out	2024-04-29 08:02:51.794780285 +0000
+++ /tmp/cirrus-ci-build/src/bin/pg_upgrade/tmp_check/results/triggers.out	2024-04-29 08:05:24.834631148 +0000
@@ -2454,1293 +2454,10 @@
 NOTICE:  trigger parted_trig_odd on parted1_irreg AFTER INSERT for ROW: (a,b)=(1,aardvark)
 NOTICE:  trigger parted_trig on parted1_irreg AFTER INSERT for ROW: (a,b)=(2,aanimals)
 insert into parted1_irreg values ('aardwolf', 2);
-NOTICE:  aardwolf <- woof!
-NOTICE:  trigger parted_trig on parted1_irreg AFTER INSERT for ROW: (a,b)=(2,aardwolf)
-insert into parted_irreg_ancestor values ('aasvogel', 3);
-NOTICE:  aasvogel <- woof!
-NOTICE:  trigger parted_trig on parted1_irreg AFTER INSERT for ROW: (a,b)=(3,aasvogel)
-NOTICE:  trigger parted_trig_odd on parted1_irreg AFTER INSERT for ROW: (a,b)=(3,aasvogel)
-drop table parted_irreg_ancestor;
--- Before triggers and partitions
-create table parted (a int, b int, c text) partition by list (a);
-create table parted_1 partition of parted for values in (1)
-  partition by list (b);
-create table parted_1_1 partition of parted_1 for values in (1);
-create function parted_trigfunc() returns trigger language plpgsql as $$
...

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/triggers.out /tmp/cirrus-ci-build/src/test/regress/results/trigg...
--- /tmp/cirrus-ci-build/src/test/regress/expected/triggers.out	2024-04-29 08:02:51.794780285 +0000
+++ /tmp/cirrus-ci-build/src/test/regress/results/triggers.out	2024-04-29 08:04:42.378703602 +0000
@@ -2681,1066 +2681,10 @@
 (7 rows)
 
 drop table parted_referenced, parted_trigger, unparted_trigger;
--- verify that the "AFTER UPDATE OF columns" event is propagated correctly
-create table parted_trigger (a int, b text) partition by range (a);
-create table parted_trigger_1 partition of parted_trigger for values from (0) to (1000);
-create table parted_trigger_2 (drp int, a int, b text);
-alter table parted_trigger_2 drop column drp;
-alter table parted_trigger attach partition parted_trigger_2 for values from (1000) to (2000);
-create trigger parted_trigger after update of b on parted_trigger
-  for each row execute procedure trigger_notice_ab();
-create table parted_trigger_3 (b text, a int) partition by range (length(b));
-create table parted_trigger_3_1 partition of parted_trigger_3 for values from (1) to (4);
-create table parted_trigger_3_2 partition of parted_trigger_3 for values from (4) to (8);
-alter table parted_trigger attach partition parted_trigger_3 for values from (2000) to (3000);
-insert into parted_trigger values (0, 'a'), (1000, 'c'), (2000, 'e'), (2001, 'eeee');
...

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/constraints.out /tmp/cirrus-ci-build/build/testrun/pg_upgrade/00...
--- /tmp/cirrus-ci-build/src/test/regress/expected/constraints.out	2024-04-29 08:02:51.671936670 +0000
+++ /tmp/cirrus-ci-build/build/testrun/pg_upgrade/002_pg_upgrade/data/results/constraints.out	2024-04-29 08:05:03.031844...
@@ -1127,176 +1127,7 @@
 Child tables: cnn_grandchild2
 
 \d+ cnn_grandchild2
-                              Table "public.cnn_grandchild2"
- Column |  Type   | Collation | Nullable | Default | Storage | Stats target | Description 
---------+---------+-----------+----------+---------+---------+--------------+-------------
- a      | integer |           |          |         | plain   |              | 
- b      | integer |           | not null |         | plain   |              | 
-Not-null constraints:
-    "cnn_grandchild_b_not_null" NOT NULL "b" (inherited)
-Inherits: cnn_grandchild,
-          cnn_child2
-
-ALTER TABLE cnn_parent DROP CONSTRAINT cnn_parent_pkey;
-ERROR:  constraint "cnn_parent_pkey" of relation "cnn_parent" does not exist
--- keeps these tables around, for pg_upgrade testing
...

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/constraints.out /tmp/cirrus-ci-build/build/testrun/recovery/027_...
--- /tmp/cirrus-ci-build/src/test/regress/expected/constraints.out	2024-04-29 08:02:51.671936670 +0000
+++ /tmp/cirrus-ci-build/build/testrun/recovery/027_stream_regress/data/results/constraints.out	2024-04-29 08:05:25.8598...
@@ -1204,6 +1204,9 @@
     "notnull_tbl4_lk_a_not_null" NOT NULL "a"
 
 \d+ notnull_tbl4_lk2
+WARNING:  terminating connection because of crash of another server process
+DETAIL:  The postmaster has commanded this server process to roll back the current transaction and exit, because anothe...
+HINT:  In a moment you should be able to reconnect to the database and repeat your command.
                              Table "public.notnull_tbl4_lk2"
  Column |  Type   | Collation | Nullable | Default | Storage | Stats target | Description 
 --------+---------+-----------+----------+---------+---------+--------------+-------------
@@ -1212,91 +1215,7 @@
     "notnull_tbl4_lk2_pkey" PRIMARY KEY, btree (a) DEFERRABLE INITIALLY DEFERRED
 
 \d+ notnull_tbl4_lk3
-                             Table "public.notnull_tbl4_lk3"
- Column |  Type   | Collation | Nullable | Default | Storage | Stats target | Description 
---------+---------+-----------+----------+---------+---------+--------------+-------------
...

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/triggers.out /tmp/cirrus-ci-build/build/testrun/regress/regress/...
--- /tmp/cirrus-ci-build/src/test/regress/expected/triggers.out	2024-04-29 08:02:51.747936713 +0000
+++ /tmp/cirrus-ci-build/build/testrun/regress/regress/results/triggers.out	2024-04-29 08:04:59.307847380 +0000
@@ -2629,1118 +2629,10 @@
 create table parted_trigger (a int, b text) partition by range (a);
 create table parted_trigger_1 partition of parted_trigger for values from (0) to (1000);
 create table parted_trigger_2 (drp int, a int, b text);
-alter table parted_trigger_2 drop column drp;
-alter table parted_trigger attach partition parted_trigger_2 for values from (1000) to (2000);
-create trigger parted_trigger after update on parted_trigger
-  for each row when (new.a % 2 = 1 and length(old.b) >= 2) execute procedure trigger_notice_ab();
-create table parted_trigger_3 (b text, a int) partition by range (length(b));
-create table parted_trigger_3_1 partition of parted_trigger_3 for values from (1) to (3);
-create table parted_trigger_3_2 partition of parted_trigger_3 for values from (3) to (5);
-alter table parted_trigger attach partition parted_trigger_3 for values from (2000) to (3000);
-insert into parted_trigger values
-    (0, 'a'), (1, 'bbb'), (2, 'bcd'), (3, 'c'),
-	(1000, 'c'), (1001, 'ddd'), (1002, 'efg'), (1003, 'f'),
-	(2000, 'e'), (2001, 'fff'), (2002, 'ghi'), (2003, 'h');
-update parted_trigger set a = a + 2; -- notice for odd 'a' values, long 'b' values
...

diff -w -U3 C:/cirrus/src/test/regress/expected/updatable_views.out C:/cirrus/build/testrun/pg_upgrade/002_pg_upgrade/da...
--- C:/cirrus/src/test/regress/expected/updatable_views.out	2024-04-29 08:03:09.178981500 +0000
+++ C:/cirrus/build/testrun/pg_upgrade/002_pg_upgrade/data/results/updatable_views.out	2024-04-29 08:05:38.776512200 +00...
@@ -1155,2847 +1155,7 @@
   WHEN MATCHED THEN UPDATE SET b = s.b
   WHEN NOT MATCHED AND s.a > 0 THEN INSERT VALUES (s.a, s.b)
   RETURNING merge_action(), s.*, t.*;
- merge_action | a | b  | a |   b   
---------------+---+----+---+-------
- DELETE       | 1 | R1 | 1 | Row 1
- UPDATE       | 2 | R2 | 2 | R2
- INSERT       | 3 | R3 | 3 | R3
-(3 rows)
-
-SELECT * FROM base_tbl ORDER BY a;
- a  |   b    
-----+--------
- -2 | Row -2
- -1 | Row -1
-  0 | Row 0
...

diff -w -U3 C:/cirrus/src/test/regress/expected/triggers.out C:/cirrus/build/testrun/recovery/027_stream_regress/data/re...
--- C:/cirrus/src/test/regress/expected/triggers.out	2024-04-29 08:03:09.168424700 +0000
+++ C:/cirrus/build/testrun/recovery/027_stream_regress/data/results/triggers.out	2024-04-29 08:07:25.504422800 +0000
@@ -3527,220 +3527,10 @@
 create or replace trigger my_trig
   after insert on parted_trig
   for each row execute procedure funcA();
-insert into parted_trig (a) values (50);
-NOTICE:  hello from funcA
-create or replace trigger my_trig
-  after insert on parted_trig
-  for each row execute procedure funcB();
-insert into parted_trig (a) values (50);
-NOTICE:  hello from funcB
--- test that child trigger cannot be replaced directly
-create or replace trigger my_trig
-  after insert on parted_trig
-  for each row execute procedure funcA();
-insert into parted_trig (a) values (50);
-NOTICE:  hello from funcA
...

diff -w -U3 C:/cirrus/src/test/regress/expected/updatable_views.out C:/cirrus/build/testrun/regress/regress/results/upda...
--- C:/cirrus/src/test/regress/expected/updatable_views.out	2024-04-29 08:03:09.178981500 +0000
+++ C:/cirrus/build/testrun/regress/regress/results/updatable_views.out	2024-04-29 08:05:37.432772100 +0000
@@ -1155,2847 +1155,7 @@
   WHEN MATCHED THEN UPDATE SET b = s.b
   WHEN NOT MATCHED AND s.a > 0 THEN INSERT VALUES (s.a, s.b)
   RETURNING merge_action(), s.*, t.*;
- merge_action | a | b  | a |   b   
---------------+---+----+---+-------
- DELETE       | 1 | R1 | 1 | Row 1
- UPDATE       | 2 | R2 | 2 | R2
- INSERT       | 3 | R3 | 3 | R3
-(3 rows)
-
-SELECT * FROM base_tbl ORDER BY a;
- a  |   b    
-----+--------
- -2 | Row -2
- -1 | Row -1
-  0 | Row 0
...

diff -U3 /Users/admin/pgsql/src/test/regress/expected/updatable_views.out /Users/admin/pgsql/build/testrun/pg_upgrade/00...
--- /Users/admin/pgsql/src/test/regress/expected/updatable_views.out	2024-04-29 08:02:45
+++ /Users/admin/pgsql/build/testrun/pg_upgrade/002_pg_upgrade/data/results/updatable_views.out	2024-04-29 08:05:59
@@ -1152,2850 +1152,10 @@
 MERGE INTO rw_view2 t
   USING (SELECT x, 'R'||x FROM generate_series(0,3) x) AS s(a,b) ON t.a = s.a
   WHEN MATCHED AND t.a <= 1 THEN DELETE
-  WHEN MATCHED THEN UPDATE SET b = s.b
-  WHEN NOT MATCHED AND s.a > 0 THEN INSERT VALUES (s.a, s.b)
-  RETURNING merge_action(), s.*, t.*;
- merge_action | a | b  | a |   b   
---------------+---+----+---+-------
- DELETE       | 1 | R1 | 1 | Row 1
- UPDATE       | 2 | R2 | 2 | R2
- INSERT       | 3 | R3 | 3 | R3
-(3 rows)
-
-SELECT * FROM base_tbl ORDER BY a;
- a  |   b    
-----+--------
...

diff -U3 /Users/admin/pgsql/src/test/regress/expected/constraints.out /Users/admin/pgsql/build/testrun/recovery/027_stre...
--- /Users/admin/pgsql/src/test/regress/expected/constraints.out	2024-04-29 08:02:45
+++ /Users/admin/pgsql/build/testrun/recovery/027_stream_regress/data/results/constraints.out	2024-04-29 08:06:16
@@ -1171,132 +1171,10 @@
 drop table cnn2_parted, cnn2_part1;
 create table cnn2_parted(a int) partition by list (a);
 create table cnn_part1 partition of cnn2_parted for values in (1, null);
-insert into cnn_part1 values (null);
-alter table cnn2_parted add primary key (a);
-ERROR:  column "a" of relation "cnn_part1" contains null values
-drop table cnn2_parted;
--- columns in regular and LIKE inheritance should be marked not-nullable
--- for primary keys, even if those are deferred
-CREATE TABLE notnull_tbl4 (a INTEGER PRIMARY KEY INITIALLY DEFERRED);
-CREATE TABLE notnull_tbl4_lk (LIKE notnull_tbl4);
-CREATE TABLE notnull_tbl4_lk2 (LIKE notnull_tbl4 INCLUDING INDEXES);
-CREATE TABLE notnull_tbl4_lk3 (LIKE notnull_tbl4 INCLUDING INDEXES, CONSTRAINT a_nn NOT NULL a);
-CREATE TABLE notnull_tbl4_cld () INHERITS (notnull_tbl4);
-CREATE TABLE notnull_tbl4_cld2 (PRIMARY KEY (a) DEFERRABLE) INHERITS (notnull_tbl4);
-CREATE TABLE notnull_tbl4_cld3 (PRIMARY KEY (a) DEFERRABLE, CONSTRAINT a_nn NOT NULL a) INHERITS (notnull_tbl4);
...

diff -U3 /Users/admin/pgsql/src/test/regress/expected/updatable_views.out /Users/admin/pgsql/build/testrun/regress/regre...
--- /Users/admin/pgsql/src/test/regress/expected/updatable_views.out	2024-04-29 08:02:45
+++ /Users/admin/pgsql/build/testrun/regress/regress/results/updatable_views.out	2024-04-29 08:05:59
@@ -1152,2850 +1152,10 @@
 MERGE INTO rw_view2 t
   USING (SELECT x, 'R'||x FROM generate_series(0,3) x) AS s(a,b) ON t.a = s.a
   WHEN MATCHED AND t.a <= 1 THEN DELETE
-  WHEN MATCHED THEN UPDATE SET b = s.b
-  WHEN NOT MATCHED AND s.a > 0 THEN INSERT VALUES (s.a, s.b)
-  RETURNING merge_action(), s.*, t.*;
- merge_action | a | b  | a |   b   
---------------+---+----+---+-------
- DELETE       | 1 | R1 | 1 | Row 1
- UPDATE       | 2 | R2 | 2 | R2
- INSERT       | 3 | R3 | 3 | R3
-(3 rows)
-
-SELECT * FROM base_tbl ORDER BY a;
- a  |   b    
-----+--------
...

diff -U3 /tmp/cirrus-ci-build/contrib/postgres_fdw/expected/postgres_fdw.out /tmp/cirrus-ci-build/build/testrun/postgres...
--- /tmp/cirrus-ci-build/contrib/postgres_fdw/expected/postgres_fdw.out	2024-04-29 05:43:59.922649000 +0000
+++ /tmp/cirrus-ci-build/build/testrun/postgres_fdw/regress/results/postgres_fdw.out	2024-04-29 05:47:44.337923000 +0000
@@ -2754,6 +2754,7 @@
 SET LOCAL statement_timeout = '10ms';
 select count(*) from ft1 CROSS JOIN ft2 CROSS JOIN ft4 CROSS JOIN ft5; -- this takes very long
 ERROR:  canceling statement due to statement timeout
+WARNING:  could not get result of cancel request due to timeout
 COMMIT;
 -- ====================================================================
 -- Check that userid to use when querying the remote table is correctly

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/sysviews.out /tmp/cirrus-ci-build/build/testrun/pg_upgrade/002_p...
--- /tmp/cirrus-ci-build/src/test/regress/expected/sysviews.out	2024-04-28 18:55:10.575697000 +0000
+++ /tmp/cirrus-ci-build/build/testrun/pg_upgrade/002_pg_upgrade/data/results/sysviews.out	2024-04-28 18:56:51.029001000...
@@ -157,7 +157,8 @@
  enable_seqscan                 | on
  enable_sort                    | on
  enable_tidscan                 | on
-(23 rows)
+ enable_toast_cache             | off
+(24 rows)
 
 -- There are always wait event descriptions for various types.
 select type, count(*) > 0 as ok FROM pg_wait_events

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/sysviews.out /tmp/cirrus-ci-build/build/testrun/recovery/027_str...
--- /tmp/cirrus-ci-build/src/test/regress/expected/sysviews.out	2024-04-28 18:55:10.575697000 +0000
+++ /tmp/cirrus-ci-build/build/testrun/recovery/027_stream_regress/data/results/sysviews.out	2024-04-28 18:57:27.7551830...
@@ -157,7 +157,8 @@
  enable_seqscan                 | on
  enable_sort                    | on
  enable_tidscan                 | on
-(23 rows)
+ enable_toast_cache             | off
+(24 rows)
 
 -- There are always wait event descriptions for various types.
 select type, count(*) > 0 as ok FROM pg_wait_events

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/sysviews.out /tmp/cirrus-ci-build/build/testrun/regress/regress/...
--- /tmp/cirrus-ci-build/src/test/regress/expected/sysviews.out	2024-04-28 18:55:10.575697000 +0000
+++ /tmp/cirrus-ci-build/build/testrun/regress/regress/results/sysviews.out	2024-04-28 18:56:47.465206000 +0000
@@ -157,7 +157,8 @@
  enable_seqscan                 | on
  enable_sort                    | on
  enable_tidscan                 | on
-(23 rows)
+ enable_toast_cache             | off
+(24 rows)
 
 -- There are always wait event descriptions for various types.
 select type, count(*) > 0 as ok FROM pg_wait_events

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/sysviews.out /tmp/cirrus-ci-build/src/bin/pg_upgrade/tmp_check/r...
--- /tmp/cirrus-ci-build/src/test/regress/expected/sysviews.out	2024-04-28 18:55:00.063903153 +0000
+++ /tmp/cirrus-ci-build/src/bin/pg_upgrade/tmp_check/results/sysviews.out	2024-04-28 19:00:16.591402074 +0000
@@ -157,7 +157,8 @@
  enable_seqscan                 | on
  enable_sort                    | on
  enable_tidscan                 | on
-(23 rows)
+ enable_toast_cache             | off
+(24 rows)
 
 -- There are always wait event descriptions for various types.
 select type, count(*) > 0 as ok FROM pg_wait_events

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/sysviews.out /tmp/cirrus-ci-build/src/test/recovery/tmp_check/re...
--- /tmp/cirrus-ci-build/src/test/regress/expected/sysviews.out	2024-04-28 18:55:00.063903153 +0000
+++ /tmp/cirrus-ci-build/src/test/recovery/tmp_check/results/sysviews.out	2024-04-28 19:01:55.651235916 +0000
@@ -157,7 +157,8 @@
  enable_seqscan                 | on
  enable_sort                    | on
  enable_tidscan                 | on
-(23 rows)
+ enable_toast_cache             | off
+(24 rows)
 
 -- There are always wait event descriptions for various types.
 select type, count(*) > 0 as ok FROM pg_wait_events

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/sysviews.out /tmp/cirrus-ci-build/src/test/regress/results/sysvi...
--- /tmp/cirrus-ci-build/src/test/regress/expected/sysviews.out	2024-04-28 18:55:00.063903153 +0000
+++ /tmp/cirrus-ci-build/src/test/regress/results/sysviews.out	2024-04-28 18:58:57.355571266 +0000
@@ -157,7 +157,8 @@
  enable_seqscan                 | on
  enable_sort                    | on
  enable_tidscan                 | on
-(23 rows)
+ enable_toast_cache             | off
+(24 rows)
 
 -- There are always wait event descriptions for various types.
 select type, count(*) > 0 as ok FROM pg_wait_events

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/sysviews.out /tmp/cirrus-ci-build/build/testrun/pg_upgrade/002_p...
--- /tmp/cirrus-ci-build/src/test/regress/expected/sysviews.out	2024-04-28 18:54:57.487239933 +0000
+++ /tmp/cirrus-ci-build/build/testrun/pg_upgrade/002_pg_upgrade/data/results/sysviews.out	2024-04-28 18:58:27.171148148...
@@ -157,7 +157,8 @@
  enable_seqscan                 | on
  enable_sort                    | on
  enable_tidscan                 | on
-(23 rows)
+ enable_toast_cache             | off
+(24 rows)
 
 -- There are always wait event descriptions for various types.
 select type, count(*) > 0 as ok FROM pg_wait_events

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/sysviews.out /tmp/cirrus-ci-build/build/testrun/recovery/027_str...
--- /tmp/cirrus-ci-build/src/test/regress/expected/sysviews.out	2024-04-28 18:54:57.487239933 +0000
+++ /tmp/cirrus-ci-build/build/testrun/recovery/027_stream_regress/data/results/sysviews.out	2024-04-28 18:59:04.5071215...
@@ -157,7 +157,8 @@
  enable_seqscan                 | on
  enable_sort                    | on
  enable_tidscan                 | on
-(23 rows)
+ enable_toast_cache             | off
+(24 rows)
 
 -- There are always wait event descriptions for various types.
 select type, count(*) > 0 as ok FROM pg_wait_events

diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/sysviews.out /tmp/cirrus-ci-build/build/testrun/regress/regress/...
--- /tmp/cirrus-ci-build/src/test/regress/expected/sysviews.out	2024-04-28 18:54:57.487239933 +0000
+++ /tmp/cirrus-ci-build/build/testrun/regress/regress/results/sysviews.out	2024-04-28 18:58:25.179149566 +0000
@@ -157,7 +157,8 @@
  enable_seqscan                 | on
  enable_sort                    | on
  enable_tidscan                 | on
-(23 rows)
+ enable_toast_cache             | off
+(24 rows)
 
 -- There are always wait event descriptions for various types.
 select type, count(*) > 0 as ok FROM pg_wait_events

diff -w -U3 C:/cirrus/src/test/regress/expected/sysviews.out C:/cirrus/build/testrun/pg_upgrade/002_pg_upgrade/data/resu...
--- C:/cirrus/src/test/regress/expected/sysviews.out	2024-04-28 18:55:15.395173800 +0000
+++ C:/cirrus/build/testrun/pg_upgrade/002_pg_upgrade/data/results/sysviews.out	2024-04-28 18:58:13.805319900 +0000
@@ -157,7 +157,8 @@
  enable_seqscan                 | on
  enable_sort                    | on
  enable_tidscan                 | on
-(23 rows)
+ enable_toast_cache             | off
+(24 rows)
 
 -- There are always wait event descriptions for various types.
 select type, count(*) > 0 as ok FROM pg_wait_events

diff -w -U3 C:/cirrus/src/test/regress/expected/sysviews.out C:/cirrus/build/testrun/recovery/027_stream_regress/data/re...
--- C:/cirrus/src/test/regress/expected/sysviews.out	2024-04-28 18:55:15.395173800 +0000
+++ C:/cirrus/build/testrun/recovery/027_stream_regress/data/results/sysviews.out	2024-04-28 19:00:42.887477500 +0000
@@ -157,7 +157,8 @@
  enable_seqscan                 | on
  enable_sort                    | on
  enable_tidscan                 | on
-(23 rows)
+ enable_toast_cache             | off
+(24 rows)
 
 -- There are always wait event descriptions for various types.
 select type, count(*) > 0 as ok FROM pg_wait_events

diff -w -U3 C:/cirrus/src/test/regress/expected/sysviews.out C:/cirrus/build/testrun/regress/regress/results/sysviews.ou...
--- C:/cirrus/src/test/regress/expected/sysviews.out	2024-04-28 18:55:15.395173800 +0000
+++ C:/cirrus/build/testrun/regress/regress/results/sysviews.out	2024-04-28 18:58:08.439087300 +0000
@@ -157,7 +157,8 @@
  enable_seqscan                 | on
  enable_sort                    | on
  enable_tidscan                 | on
-(23 rows)
+ enable_toast_cache             | off
+(24 rows)
 
 -- There are always wait event descriptions for various types.
 select type, count(*) > 0 as ok FROM pg_wait_events

diff -U3 /Users/admin/pgsql/src/test/regress/expected/sysviews.out /Users/admin/pgsql/build/testrun/pg_upgrade/002_pg_up...
--- /Users/admin/pgsql/src/test/regress/expected/sysviews.out	2024-04-28 18:54:48
+++ /Users/admin/pgsql/build/testrun/pg_upgrade/002_pg_upgrade/data/results/sysviews.out	2024-04-28 18:57:24
@@ -157,7 +157,8 @@
  enable_seqscan                 | on
  enable_sort                    | on
  enable_tidscan                 | on
-(23 rows)
+ enable_toast_cache             | off
+(24 rows)
 
 -- There are always wait event descriptions for various types.
 select type, count(*) > 0 as ok FROM pg_wait_events

diff -U3 /Users/admin/pgsql/src/test/regress/expected/sysviews.out /Users/admin/pgsql/build/testrun/recovery/027_stream_...
--- /Users/admin/pgsql/src/test/regress/expected/sysviews.out	2024-04-28 18:54:48
+++ /Users/admin/pgsql/build/testrun/recovery/027_stream_regress/data/results/sysviews.out	2024-04-28 18:58:14
@@ -157,7 +157,8 @@
  enable_seqscan                 | on
  enable_sort                    | on
  enable_tidscan                 | on
-(23 rows)
+ enable_toast_cache             | off
+(24 rows)
 
 -- There are always wait event descriptions for various types.
 select type, count(*) > 0 as ok FROM pg_wait_events

diff -U3 /Users/admin/pgsql/src/test/regress/expected/sysviews.out /Users/admin/pgsql/build/testrun/regress/regress/resu...
--- /Users/admin/pgsql/src/test/regress/expected/sysviews.out	2024-04-28 18:54:48
+++ /Users/admin/pgsql/build/testrun/regress/regress/results/sysviews.out	2024-04-28 18:57:25
@@ -157,7 +157,8 @@
  enable_seqscan                 | on
  enable_sort                    | on
  enable_tidscan                 | on
-(23 rows)
+ enable_toast_cache             | off
+(24 rows)
 
 -- There are always wait event descriptions for various types.
 select type, count(*) > 0 as ok FROM pg_wait_events