diff -U3 /tmp/cirrus-ci-build/contrib/pg_stat_statements/expected/select.out /tmp/cirrus-ci-build/build/testrun/pg_stat_statements/regress/results/select.out
--- /tmp/cirrus-ci-build/contrib/pg_stat_statements/expected/select.out	2024-03-19 22:52:31.873584732 +0000
+++ /tmp/cirrus-ci-build/build/testrun/pg_stat_statements/regress/results/select.out	2024-03-19 22:56:39.309437982 +0000
@@ -319,96 +319,7 @@
 FROM (VALUES (1, 2, 3), (4, NULL, 6), (7, 8, 9)) AS t (a, b, c)
 GROUP BY ROLLUP(a, b), rollup(a, c)
 ORDER BY a, b, c;
- a | b | c 
----+---+---
- 1 | 2 | 3
- 1 | 2 |  
- 1 | 2 |  
- 1 |   | 3
- 1 |   | 3
- 1 |   |  
- 1 |   |  
- 1 |   |  
- 4 |   | 6
- 4 |   | 6
- 4 |   | 6
- 4 |   |  
- 4 |   |  
- 4 |   |  
- 4 |   |  
- 4 |   |  
- 7 | 8 | 9
- 7 | 8 |  
- 7 | 8 |  
- 7 |   | 9
- 7 |   | 9
- 7 |   |  
- 7 |   |  
- 7 |   |  
-   |   |  
-(25 rows)
-
-SELECT a, b, c
-FROM (VALUES (1, 2, 3), (4, NULL, 6), (7, 8, 9)) AS t (a, b, c)
-GROUP BY DISTINCT ROLLUP(a, b), rollup(a, c)
-ORDER BY a, b, c;
- a | b | c 
----+---+---
- 1 | 2 | 3
- 1 | 2 |  
- 1 |   | 3
- 1 |   |  
- 4 |   | 6
- 4 |   | 6
- 4 |   |  
- 4 |   |  
- 7 | 8 | 9
- 7 | 8 |  
- 7 |   | 9
- 7 |   |  
-   |   |  
-(13 rows)
-
-SELECT COUNT(*) FROM pg_stat_statements WHERE query LIKE '%GROUP BY%ROLLUP%';
- count 
--------
-     2
-(1 row)
-
--- GROUPING SET agglevelsup
-SELECT (
-  SELECT (
-    SELECT GROUPING(a,b) FROM (VALUES (1)) v2(c)
-  ) FROM (VALUES (1,2)) v1(a,b) GROUP BY (a,b)
-) FROM (VALUES(6,7)) v3(e,f) GROUP BY ROLLUP(e,f);
- grouping 
-----------
-        0
-        0
-        0
-(3 rows)
-
-SELECT (
-  SELECT (
-    SELECT GROUPING(e,f) FROM (VALUES (1)) v2(c)
-  ) FROM (VALUES (1,2)) v1(a,b) GROUP BY (a,b)
-) FROM (VALUES(6,7)) v3(e,f) GROUP BY ROLLUP(e,f);
- grouping 
-----------
-        3
-        0
-        1
-(3 rows)
-
-SELECT COUNT(*) FROM pg_stat_statements WHERE query LIKE '%SELECT GROUPING%';
- count 
--------
-     2
-(1 row)
-
-SELECT pg_stat_statements_reset() IS NOT NULL AS t;
- t 
----
- t
-(1 row)
-
+server closed the connection unexpectedly
+	This probably means the server terminated abnormally
+	before or while processing the request.
+connection to server was lost
diff -U3 /tmp/cirrus-ci-build/contrib/pg_stat_statements/expected/dml.out /tmp/cirrus-ci-build/build/testrun/pg_stat_statements/regress/results/dml.out
--- /tmp/cirrus-ci-build/contrib/pg_stat_statements/expected/dml.out	2024-03-19 22:52:31.873584732 +0000
+++ /tmp/cirrus-ci-build/build/testrun/pg_stat_statements/regress/results/dml.out	2024-03-19 22:56:39.393437934 +0000
@@ -78,14 +78,29 @@
      1 |    1 | DELETE FROM pgss_dml_tab WHERE a > $1
      1 |    3 | INSERT INTO pgss_dml_tab (a, b) VALUES ($1, $2), ($3, $4), ($5, $6)
      1 |   10 | INSERT INTO pgss_dml_tab VALUES(generate_series($1, $2), $3)
+     1 |    1 | INSERT INTO tbl_inh_1 SELECT $1
+     1 |    2 | SELECT *                                                           +
+       |      | FROM limitoption                                                   +
+       |      | WHERE val < $1                                                     +
+       |      | ORDER BY val                                                       +
+       |      | FETCH FIRST $2 ROW ONLY
+     1 |   10 | SELECT *                                                           +
+       |      | FROM limitoption                                                   +
+       |      | WHERE val < $1                                                     +
+       |      | ORDER BY val                                                       +
+       |      | FETCH FIRST $2 ROWS WITH TIES
+     1 |    0 | SELECT * FROM ONLY tbl_inh
      1 |   12 | SELECT * FROM pgss_dml_tab ORDER BY a
      2 |    4 | SELECT * FROM pgss_dml_tab WHERE a > $1 ORDER BY a
      1 |    8 | SELECT * FROM pgss_dml_tab WHERE a IN ($1, $2, $3, $4, $5)
+     1 |    1 | SELECT * FROM tbl_inh
+     2 |    2 | SELECT COUNT(*) FROM pg_stat_statements WHERE query LIKE $1
+     1 |    1 | SELECT dealloc FROM pg_stat_statements_info
      1 |    1 | SELECT pg_stat_statements_reset() IS NOT NULL AS t
      1 |    0 | SET pg_stat_statements.track_utility = FALSE
      6 |    6 | UPDATE pgss_dml_tab SET b = $1 WHERE a = $2
      1 |    3 | UPDATE pgss_dml_tab SET b = $1 WHERE a > $2
-(10 rows)
+(17 rows)
 
 SELECT pg_stat_statements_reset() IS NOT NULL AS t;
  t 
diff -U3 /tmp/cirrus-ci-build/contrib/pg_stat_statements/expected/oldextversions.out /tmp/cirrus-ci-build/build/testrun/pg_stat_statements/regress/results/oldextversions.out
--- /tmp/cirrus-ci-build/contrib/pg_stat_statements/expected/oldextversions.out	2024-03-19 22:52:31.873584732 +0000
+++ /tmp/cirrus-ci-build/build/testrun/pg_stat_statements/regress/results/oldextversions.out	2024-03-19 22:56:39.853437675 +0000
@@ -343,3 +343,10 @@
 (1 row)
 
 DROP EXTENSION pg_stat_statements;
+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 another server process exited abnormally and possibly corrupted shared memory.
+HINT:  In a moment you should be able to reconnect to the database and repeat your command.
+server closed the connection unexpectedly
+	This probably means the server terminated abnormally
+	before or while processing the request.
+connection to server was lost