diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/join.out /tmp/cirrus-ci-build/build/testrun/pg_upgrade/002_pg_upgrade/data/results/join.out
--- /tmp/cirrus-ci-build/src/test/regress/expected/join.out	2024-11-10 08:02:03.796753000 +0000
+++ /tmp/cirrus-ci-build/build/testrun/pg_upgrade/002_pg_upgrade/data/results/join.out	2024-11-10 08:04:08.815159000 +0000
@@ -2800,19 +2800,10 @@
   left join
   (select * from tenk1 y order by y.unique2) y
   on x.thousand = y.unique2 and x.twothousand = y.hundred and x.fivethous = y.unique2;
-                                    QUERY PLAN                                    
-----------------------------------------------------------------------------------
- Aggregate
-   ->  Merge Left Join
-         Merge Cond: (x.thousand = y.unique2)
-         Join Filter: ((x.twothousand = y.hundred) AND (x.fivethous = y.unique2))
-         ->  Sort
-               Sort Key: x.thousand, x.twothousand, x.fivethous
-               ->  Seq Scan on tenk1 x
-         ->  Materialize
-               ->  Index Scan using tenk1_unique2 on tenk1 y
-(9 rows)
-
+ERROR:  deadlock detected
+DETAIL:  Process 10886 waits for AccessShareLock on relation 25097 of database 16387; blocked by process 10890.
+Process 10890 waits for AccessExclusiveLock on relation 16421 of database 16387; blocked by process 10886.
+HINT:  See server log for query details.
 select count(*) from
   (select * from tenk1 x order by x.thousand, x.twothousand, x.fivethous) x
   left join