diff --strip-trailing-cr -U3 C:/cirrus/src/test/regress/expected/partition_aggregate.out C:/cirrus/build/testrun/pg_upgrade/002_pg_upgrade/data/results/partition_aggregate.out
--- C:/cirrus/src/test/regress/expected/partition_aggregate.out	2024-10-25 01:44:28.985786300 +0000
+++ C:/cirrus/build/testrun/pg_upgrade/002_pg_upgrade/data/results/partition_aggregate.out	2024-10-25 01:48:30.400725800 +0000
@@ -1529,44 +1529,32 @@
     locale = 'und-u-ks-level2',
     deterministic = false
 );
+ERROR:  ICU is not supported in this build
 CREATE TABLE pagg_tab3 (c text collate case_insensitive) PARTITION BY LIST(c collate "C");
+ERROR:  collation "case_insensitive" for encoding "UTF8" does not exist
+LINE 1: CREATE TABLE pagg_tab3 (c text collate case_insensitive) PAR...
+                                       ^
 CREATE TABLE pagg_tab3_p1 PARTITION OF pagg_tab3 FOR VALUES IN ('a', 'b', 'c', 'd');
+ERROR:  relation "pagg_tab3" does not exist
 CREATE TABLE pagg_tab3_p2 PARTITION OF pagg_tab3 FOR VALUES IN ('e', 'f', 'A');
+ERROR:  relation "pagg_tab3" does not exist
 CREATE TABLE pagg_tab3_p3 PARTITION OF pagg_tab3 FOR VALUES IN ('B', 'C', 'D', 'E');
+ERROR:  relation "pagg_tab3" does not exist
 INSERT INTO pagg_tab3 SELECT substr('abcdeABCDE', (i % 10) +1 , 1) FROM generate_series(0, 2999) i;
+ERROR:  relation "pagg_tab3" does not exist
+LINE 1: INSERT INTO pagg_tab3 SELECT substr('abcdeABCDE', (i % 10) +...
+                    ^
 ANALYZE pagg_tab3;
+ERROR:  relation "pagg_tab3" does not exist
 EXPLAIN (COSTS OFF)
 SELECT upper(c collate case_insensitive), count(c) FROM pagg_tab3 GROUP BY c collate case_insensitive ORDER BY 1;
-                             QUERY PLAN                             
---------------------------------------------------------------------
- Sort
-   Sort Key: (upper(pagg_tab3.c)) COLLATE case_insensitive
-   ->  Finalize GroupAggregate
-         Group Key: pagg_tab3.c
-         ->  Sort
-               Sort Key: pagg_tab3.c COLLATE case_insensitive
-               ->  Append
-                     ->  Partial HashAggregate
-                           Group Key: pagg_tab3.c
-                           ->  Seq Scan on pagg_tab3_p2 pagg_tab3
-                     ->  Partial HashAggregate
-                           Group Key: pagg_tab3_1.c
-                           ->  Seq Scan on pagg_tab3_p3 pagg_tab3_1
-                     ->  Partial HashAggregate
-                           Group Key: pagg_tab3_2.c
-                           ->  Seq Scan on pagg_tab3_p1 pagg_tab3_2
-(16 rows)
-
+ERROR:  relation "pagg_tab3" does not exist
+LINE 2: ... upper(c collate case_insensitive), count(c) FROM pagg_tab3 ...
+                                                             ^
 SELECT upper(c collate case_insensitive), count(c) FROM pagg_tab3 GROUP BY c collate case_insensitive ORDER BY 1;
- upper | count 
--------+-------
- A     |   600
- B     |   600
- C     |   600
- D     |   600
- E     |   600
-(5 rows)
-
+ERROR:  relation "pagg_tab3" does not exist
+LINE 1: ... upper(c collate case_insensitive), count(c) FROM pagg_tab3 ...
+                                                             ^
 RESET enable_partitionwise_aggregate;
 RESET enable_partitionwise_join;
 RESET max_parallel_workers_per_gather;