diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/subselect.out /tmp/cirrus-ci-build/src/test/regress/results/subselect.out
--- /tmp/cirrus-ci-build/src/test/regress/expected/subselect.out	2024-08-26 01:52:25.057512844 +0000
+++ /tmp/cirrus-ci-build/src/test/regress/results/subselect.out	2024-08-26 01:54:07.370217714 +0000
@@ -1023,15 +1023,10 @@
 explain (costs off)
 select count(*) from tenk1 t
 where (exists(select 1 from tenk1 k where k.unique1 = t.unique2) or ten < 0);
-                                QUERY PLAN                                
---------------------------------------------------------------------------
- Aggregate
-   ->  Seq Scan on tenk1 t
-         Filter: ((ANY (unique2 = (hashed SubPlan 2).col1)) OR (ten < 0))
-         SubPlan 2
-           ->  Index Only Scan using tenk1_unique1 on tenk1 k
-(5 rows)
-
+ERROR:  deadlock detected
+DETAIL:  Process 16227 waits for AccessShareLock on relation 24330 of database 16384; blocked by process 16218.
+Process 16218 waits for AccessExclusiveLock on relation 16418 of database 16384; blocked by process 16227.
+HINT:  See server log for query details.
 select count(*) from tenk1 t
 where (exists(select 1 from tenk1 k where k.unique1 = t.unique2) or ten < 0);
  count 
diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/arrays.out /tmp/cirrus-ci-build/src/test/regress/results/arrays.out
--- /tmp/cirrus-ci-build/src/test/regress/expected/arrays.out	2024-08-26 01:52:24.969545485 +0000
+++ /tmp/cirrus-ci-build/src/test/regress/results/arrays.out	2024-08-26 01:54:07.170221061 +0000
@@ -2227,11 +2227,10 @@
 
 -- array_agg(anynonarray)
 select array_agg(unique1) from (select unique1 from tenk1 where unique1 < 15 order by unique1) ss;
-              array_agg               
---------------------------------------
- {0,1,2,3,4,5,6,7,8,9,10,11,12,13,14}
-(1 row)
-
+ERROR:  deadlock detected
+DETAIL:  Process 16231 waits for AccessShareLock on relation 24330 of database 16384; blocked by process 16218.
+Process 16218 waits for AccessExclusiveLock on relation 16418 of database 16384; blocked by process 16231.
+HINT:  See server log for query details.
 select array_agg(ten) from (select ten from tenk1 where unique1 < 15 order by unique1) ss;
             array_agg            
 ---------------------------------
diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/btree_index.out /tmp/cirrus-ci-build/src/test/regress/results/btree_index.out
--- /tmp/cirrus-ci-build/src/test/regress/expected/btree_index.out	2024-08-26 01:52:24.973543943 +0000
+++ /tmp/cirrus-ci-build/src/test/regress/results/btree_index.out	2024-08-26 01:54:12.066142255 +0000
@@ -158,13 +158,10 @@
 set enable_bitmapscan to false;
 explain (costs off)
 select hundred, twenty from tenk1 where hundred < 48 order by hundred desc limit 1;
-                       QUERY PLAN                       
---------------------------------------------------------
- Limit
-   ->  Index Scan Backward using tenk1_hundred on tenk1
-         Index Cond: (hundred < 48)
-(3 rows)
-
+ERROR:  deadlock detected
+DETAIL:  Process 16236 waits for AccessShareLock on relation 24330 of database 16384; blocked by process 16218.
+Process 16218 waits for AccessExclusiveLock on relation 16418 of database 16384; blocked by process 16236.
+HINT:  See server log for query details.
 select hundred, twenty from tenk1 where hundred < 48 order by hundred desc limit 1;
  hundred | twenty 
 ---------+--------