Fix collate regression case by removing an ORDER BY (added in XL) which seems

to produce different results on different platforms.

Expected output adjusted accordingly

diff --git a/src/test/regress/expected/collate.out b/src/test/regress/expected/collate.out
index 13c252494e7e2e09095eff1c2d376a50bf0314be..2c037682f339c50bc334593ceb12c0ba4cc24ea9 100644 (file)
--- a/src/test/regress/expected/collate.out
+++ b/src/test/regress/expected/collate.out
@@ -489,7 +489,7 @@ LINE 2:    (SELECT x FROM (VALUES('a' COLLATE "C"),('b')) t(x)
                    ^
 HINT:  Use the COLLATE clause to set the collation of the non-recursive term.
 SELECT a, b, a < b as lt FROM
-  (VALUES ('a', 'B'), ('A', 'b' COLLATE "C")) v(a,b) ORDER BY a;
+  (VALUES ('a', 'B'), ('A', 'b' COLLATE "C")) v(a,b);
  a | b | lt 
 ---+---+----
  a | B | f

diff --git a/src/test/regress/sql/collate.sql b/src/test/regress/sql/collate.sql
index a281921fe2f8492efb66cd8d39c96db41687671c..d663593111d779c4cde204e159a8a16e4c67e042 100644 (file)
--- a/src/test/regress/sql/collate.sql
+++ b/src/test/regress/sql/collate.sql
@@ -161,7 +161,7 @@ WITH RECURSIVE foo(x) AS
 SELECT * FROM foo;
 
 SELECT a, b, a < b as lt FROM
-  (VALUES ('a', 'B'), ('A', 'b' COLLATE "C")) v(a,b) ORDER BY a;
+  (VALUES ('a', 'B'), ('A', 'b' COLLATE "C")) v(a,b);
 
 
 -- casting