From d77a50630711659288c615ce6dba5fb04e189f78 Mon Sep 17 00:00:00 2001
From: "Thomas G. Lockhart" <lockhart@fourpalms.org>
Date: Wed, 24 Sep 1997 17:55:38 +0000
Subject: [PATCH] Use additional ORDER BY to cope with new sorting routines.
---
src/test/regress/expected/point.out | 4 ++--
src/test/regress/sql/point.sql | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/test/regress/expected/point.out b/src/test/regress/expected/point.out
index 193110150aa..c4130bae245 100644
--- a/src/test/regress/expected/point.out
+++ b/src/test/regress/expected/point.out
@@ -179,14 +179,14 @@ thirty|point1 |point2
QUERY: SELECT '' AS fifteen, p1.f1 AS point1, p2.f1 AS point2, (p1.f1 <-> p2.f1) AS distance
FROM POINT_TBL p1, POINT_TBL p2
WHERE (p1.f1 <-> p2.f1) > 3 and p1.f1 << p2.f1
- ORDER BY distance;
+ ORDER BY distance, point1 using <<, point2 using <<;
fifteen|point1 |point2 | distance
-------+----------+----------+----------------
|(-3,4) |(0,0) | 5
|(-10,0) |(-3,4) |8.06225774829855
|(-10,0) |(0,0) | 10
- |(-5,-12) |(0,0) | 13
|(-10,0) |(-5,-12) | 13
+ |(-5,-12) |(0,0) | 13
|(0,0) |(10,10) | 14.142135623731
|(-3,4) |(10,10) |14.3178210632764
|(-5,-12) |(-3,4) |16.1245154965971
diff --git a/src/test/regress/sql/point.sql b/src/test/regress/sql/point.sql
index 5fab6d5e7b8..336ffa299fa 100644
--- a/src/test/regress/sql/point.sql
+++ b/src/test/regress/sql/point.sql
@@ -67,7 +67,7 @@ SELECT '' AS thirty, p1.f1 AS point1, p2.f1 AS point2
SELECT '' AS fifteen, p1.f1 AS point1, p2.f1 AS point2, (p1.f1 <-> p2.f1) AS distance
FROM POINT_TBL p1, POINT_TBL p2
WHERE (p1.f1 <-> p2.f1) > 3 and p1.f1 << p2.f1
- ORDER BY distance;
+ ORDER BY distance, point1 using <<, point2 using <<;
-- put distance result into output to allow sorting with GEQ optimizer - tgl 97/05/10
SELECT '' AS three, p1.f1 AS point1, p2.f1 AS point2, (p1.f1 <-> p2.f1) AS distance