Change ORDER BY to get consistant results with new sorting routines.

diff --git a/src/test/regress/sql/geometry.sql b/src/test/regress/sql/geometry.sql
index 63e9334d9adce31c5c1b53acbd87bea0e6615078..c27b31b6ef57f677002fea70744fb6d3849ceda0 100644 (file)
--- a/src/test/regress/sql/geometry.sql
+++ b/src/test/regress/sql/geometry.sql
@@ -144,5 +144,5 @@ SELECT '' AS two, circle(f1)
 SELECT '' AS twentyfour, c1.f1 AS circle, p1.f1 AS point, (p1.f1 <-> c1.f1) AS distance
    FROM CIRCLE_TBL c1, POINT_TBL p1
    WHERE (p1.f1 <-> c1.f1) > 0
-   ORDER BY distance, circle;
+   ORDER BY distance, circle, point using <<;
 

diff --git a/src/test/regress/sql/horology.sql b/src/test/regress/sql/horology.sql
index 91764702dce184ca8131e1b648deca3db9b33234..4dae31af6ec1d1e5cb22f020b6b62a12211eb4e0 100644 (file)
--- a/src/test/regress/sql/horology.sql
+++ b/src/test/regress/sql/horology.sql
@@ -21,12 +21,12 @@ SELECT '' AS ten, f1 AS datetime
 
 SELECT '' AS hundred, d.f1 AS datetime, t.f1 AS timespan, d.f1 + t.f1 AS plus
   FROM TEMP_DATETIME d, TIMESPAN_TBL t
-  ORDER BY plus;
+  ORDER BY plus, datetime, timespan;
 
 SELECT '' AS hundred, d.f1 AS datetime, t.f1 AS timespan, d.f1 - t.f1 AS minus
   FROM TEMP_DATETIME d, TIMESPAN_TBL t
   WHERE isfinite(d.f1)
-  ORDER BY minus;
+  ORDER BY minus, datetime, timespan;
 
 SELECT '' AS ten, d.f1 AS datetime, '1980-01-06 00:00 GMT'::datetime AS gpstime_zero,
    d.f1 - '1980-01-06 00:00 GMT'::datetime AS difference

diff --git a/src/test/regress/sql/point.sql b/src/test/regress/sql/point.sql
index 8bd856990037865d2e306abca2340ec495488de4..5fab6d5e7b85ca354132a1d420fc016907e40b9b 100644 (file)
--- a/src/test/regress/sql/point.sql
+++ b/src/test/regress/sql/point.sql
@@ -57,7 +57,7 @@ SET geqo TO 'off';
 
 SELECT '' AS thirtysix, p1.f1 AS point1, p2.f1 AS point2, p1.f1 <-> p2.f1 AS dist
    FROM POINT_TBL p1, POINT_TBL p2
-   ORDER BY dist;
+   ORDER BY dist, point1 using <<, point2 using <<;
 
 SELECT '' AS thirty, p1.f1 AS point1, p2.f1 AS point2
    FROM POINT_TBL p1, POINT_TBL p2