From 8994cc6ffc8828569a39139996a0b0b8348ca036 Mon Sep 17 00:00:00 2001
From: Tom Lane <tgl@sss.pgh.pa.us>
Date: Tue, 26 Mar 2019 17:46:04 -0400
Subject: [PATCH] Add ORDER BY to more ICU regression test cases.

Commit c77e12208 didn't fully fix the problem.  Per buildfarm
and local testing.
---
 src/test/regress/expected/collate.icu.utf8.out | 8 ++++----
 src/test/regress/sql/collate.icu.utf8.sql      | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/test/regress/expected/collate.icu.utf8.out b/src/test/regress/expected/collate.icu.utf8.out
index d5132a28c3..01bd9fb5dd 100644
--- a/src/test/regress/expected/collate.icu.utf8.out
+++ b/src/test/regress/expected/collate.icu.utf8.out
@@ -1490,18 +1490,18 @@ SELECT x FROM test2bpci UNION SELECT x FROM test1bpci ORDER BY x;
  ghi
 (3 rows)
 
-SELECT x FROM test1bpci INTERSECT SELECT x FROM test2bpci;
+SELECT x FROM test1bpci INTERSECT SELECT x FROM test2bpci ORDER BY x;
   x  
 -----
- ghi
  abc
+ ghi
 (2 rows)
 
-SELECT x FROM test2bpci INTERSECT SELECT x FROM test1bpci;
+SELECT x FROM test2bpci INTERSECT SELECT x FROM test1bpci ORDER BY x;
   x  
 -----
- ghi
  ABC
+ ghi
 (2 rows)
 
 SELECT x FROM test1bpci EXCEPT SELECT x FROM test2bpci;
diff --git a/src/test/regress/sql/collate.icu.utf8.sql b/src/test/regress/sql/collate.icu.utf8.sql
index e611bdb567..2be7759c92 100644
--- a/src/test/regress/sql/collate.icu.utf8.sql
+++ b/src/test/regress/sql/collate.icu.utf8.sql
@@ -548,8 +548,8 @@ SELECT x FROM test3bpci WHERE x SIMILAR TO 'a%';
 SELECT x FROM test3bpci WHERE x ~ 'a';
 SELECT x FROM test1bpci UNION SELECT x FROM test2bpci ORDER BY x;
 SELECT x FROM test2bpci UNION SELECT x FROM test1bpci ORDER BY x;
-SELECT x FROM test1bpci INTERSECT SELECT x FROM test2bpci;
-SELECT x FROM test2bpci INTERSECT SELECT x FROM test1bpci;
+SELECT x FROM test1bpci INTERSECT SELECT x FROM test2bpci ORDER BY x;
+SELECT x FROM test2bpci INTERSECT SELECT x FROM test1bpci ORDER BY x;
 SELECT x FROM test1bpci EXCEPT SELECT x FROM test2bpci;
 SELECT x FROM test2bpci EXCEPT SELECT x FROM test1bpci;
 SELECT DISTINCT x FROM test3bpci ORDER BY x;