diff --git a/src/test/regress/expected/boolean.out b/src/test/regress/expected/boolean.out
index 9c8ae4447f012c950109cd05364b7be81faba792..d69ba887f7fc72bdf9ce27481494cb6ec9ed0dbe 100644
--- a/src/test/regress/expected/boolean.out
+++ b/src/test/regress/expected/boolean.out
@@ -156,25 +156,26 @@ ff_4|f1|f1
(4 rows)
QUERY: SELECT '' AS tf_12_ff_4, BOOLTBL1.*, BOOLTBL2.*
- WHERE BOOLTBL2.f1 = BOOLTBL1.f1 or BOOLTBL1.f1 = 'true'::bool;
+ WHERE BOOLTBL2.f1 = BOOLTBL1.f1 or BOOLTBL1.f1 = 'true'::bool
+ ORDER BY BOOLTBL1.f1, BOOLTBL2.f1;
tf_12_ff_4|f1|f1
----------+--+--
+ |f |f
+ |f |f
+ |f |f
+ |f |f
|t |f
|t |f
|t |f
- |f |f
|t |f
|t |f
|t |f
- |f |f
|t |f
|t |f
|t |f
- |f |f
|t |f
|t |f
|t |f
- |f |f
(16 rows)
QUERY: DROP TABLE BOOLTBL1;
diff --git a/src/test/regress/expected/reltime.out b/src/test/regress/expected/reltime.out
index 592ba9414ff21ddc61b1fc05f2dbd3fe95eda445..383456ad739a7b4438595555c38068e6959aed3e 100644
--- a/src/test/regress/expected/reltime.out
+++ b/src/test/regress/expected/reltime.out
@@ -77,23 +77,24 @@ five|f1
QUERY: SELECT '' AS fifteen, r1.*, r2.*
FROM RELTIME_TBL r1, RELTIME_TBL r2
- WHERE r1.f1 > r2.f1;
+ WHERE r1.f1 > r2.f1
+ ORDER BY r1.f1, r2.f1;
fifteen|f1 |f1
-------+----------+----------------
+ |@ 1 minute|@ 14 seconds ago
+ |@ 5 hours |@ 14 seconds ago
|@ 5 hours |@ 1 minute
+ |@ 10 days |@ 14 seconds ago
|@ 10 days |@ 1 minute
- |@ 34 years|@ 1 minute
- |@ 3 months|@ 1 minute
|@ 10 days |@ 5 hours
- |@ 34 years|@ 5 hours
+ |@ 3 months|@ 14 seconds ago
+ |@ 3 months|@ 1 minute
|@ 3 months|@ 5 hours
- |@ 34 years|@ 10 days
|@ 3 months|@ 10 days
- |@ 34 years|@ 3 months
- |@ 1 minute|@ 14 seconds ago
- |@ 5 hours |@ 14 seconds ago
- |@ 10 days |@ 14 seconds ago
|@ 34 years|@ 14 seconds ago
- |@ 3 months|@ 14 seconds ago
+ |@ 34 years|@ 1 minute
+ |@ 34 years|@ 5 hours
+ |@ 34 years|@ 10 days
+ |@ 34 years|@ 3 months
(15 rows)
diff --git a/src/test/regress/expected/timespan.out b/src/test/regress/expected/timespan.out
index d83f2904a3b19d9998baf803e2fff22bea98faf5..71ed584331cdf9ceb0f3194bd5d9e6e1d57aab5a 100644
--- a/src/test/regress/expected/timespan.out
+++ b/src/test/regress/expected/timespan.out
@@ -96,53 +96,54 @@ nine|f1
QUERY: SELECT '' AS fortyfive, r1.*, r2.*
FROM TIMESPAN_TBL r1, TIMESPAN_TBL r2
- WHERE r1.f1 > r2.f1;
+ WHERE r1.f1 > r2.f1
+ ORDER BY r1.f1, r2.f1;
fortyfive|f1 |f1
---------+-----------------------------+-----------------------------
+ |@ 1 min |@ 14 secs ago
+ |@ 5 hours |@ 14 secs ago
|@ 5 hours |@ 1 min
- |@ 10 days |@ 1 min
- |@ 34 years |@ 1 min
- |@ 3 mons |@ 1 min
+ |@ 1 day 2 hours 3 mins 4 secs|@ 14 secs ago
|@ 1 day 2 hours 3 mins 4 secs|@ 1 min
- |@ 6 years |@ 1 min
- |@ 5 mons |@ 1 min
- |@ 5 mons 12 hours |@ 1 min
+ |@ 1 day 2 hours 3 mins 4 secs|@ 5 hours
+ |@ 10 days |@ 14 secs ago
+ |@ 10 days |@ 1 min
|@ 10 days |@ 5 hours
- |@ 34 years |@ 5 hours
+ |@ 10 days |@ 1 day 2 hours 3 mins 4 secs
+ |@ 3 mons |@ 14 secs ago
+ |@ 3 mons |@ 1 min
|@ 3 mons |@ 5 hours
- |@ 1 day 2 hours 3 mins 4 secs|@ 5 hours
- |@ 6 years |@ 5 hours
- |@ 5 mons |@ 5 hours
- |@ 5 mons 12 hours |@ 5 hours
- |@ 34 years |@ 10 days
+ |@ 3 mons |@ 1 day 2 hours 3 mins 4 secs
|@ 3 mons |@ 10 days
- |@ 6 years |@ 10 days
+ |@ 5 mons |@ 14 secs ago
+ |@ 5 mons |@ 1 min
+ |@ 5 mons |@ 5 hours
+ |@ 5 mons |@ 1 day 2 hours 3 mins 4 secs
|@ 5 mons |@ 10 days
- |@ 5 mons 12 hours |@ 10 days
- |@ 34 years |@ 3 mons
- |@ 6 years |@ 3 mons
|@ 5 mons |@ 3 mons
+ |@ 5 mons 12 hours |@ 14 secs ago
+ |@ 5 mons 12 hours |@ 1 min
+ |@ 5 mons 12 hours |@ 5 hours
+ |@ 5 mons 12 hours |@ 1 day 2 hours 3 mins 4 secs
+ |@ 5 mons 12 hours |@ 10 days
|@ 5 mons 12 hours |@ 3 mons
- |@ 1 min |@ 14 secs ago
- |@ 5 hours |@ 14 secs ago
- |@ 10 days |@ 14 secs ago
- |@ 34 years |@ 14 secs ago
- |@ 3 mons |@ 14 secs ago
- |@ 1 day 2 hours 3 mins 4 secs|@ 14 secs ago
+ |@ 5 mons 12 hours |@ 5 mons
|@ 6 years |@ 14 secs ago
- |@ 5 mons |@ 14 secs ago
- |@ 5 mons 12 hours |@ 14 secs ago
- |@ 10 days |@ 1 day 2 hours 3 mins 4 secs
- |@ 34 years |@ 1 day 2 hours 3 mins 4 secs
- |@ 3 mons |@ 1 day 2 hours 3 mins 4 secs
+ |@ 6 years |@ 1 min
+ |@ 6 years |@ 5 hours
|@ 6 years |@ 1 day 2 hours 3 mins 4 secs
- |@ 5 mons |@ 1 day 2 hours 3 mins 4 secs
- |@ 5 mons 12 hours |@ 1 day 2 hours 3 mins 4 secs
- |@ 34 years |@ 6 years
- |@ 34 years |@ 5 mons
+ |@ 6 years |@ 10 days
+ |@ 6 years |@ 3 mons
|@ 6 years |@ 5 mons
- |@ 5 mons 12 hours |@ 5 mons
- |@ 34 years |@ 5 mons 12 hours
|@ 6 years |@ 5 mons 12 hours
+ |@ 34 years |@ 14 secs ago
+ |@ 34 years |@ 1 min
+ |@ 34 years |@ 5 hours
+ |@ 34 years |@ 1 day 2 hours 3 mins 4 secs
+ |@ 34 years |@ 10 days
+ |@ 34 years |@ 3 mons
+ |@ 34 years |@ 5 mons
+ |@ 34 years |@ 5 mons 12 hours
+ |@ 34 years |@ 6 years
(45 rows)
diff --git a/src/test/regress/sql/boolean.sql b/src/test/regress/sql/boolean.sql
index 6005ad64bd78192782633596ff124fa2511239a7..a62a2e92609996374d674dc20b72f55bb02d1959 100644
--- a/src/test/regress/sql/boolean.sql
+++ b/src/test/regress/sql/boolean.sql
@@ -1,7 +1,7 @@
--
-- boolean.source
--
--- $Header: /cvsroot/pgsql/src/test/regress/sql/boolean.sql,v 1.2 1997/04/27 04:35:02 scrappy Exp $
+-- $Header: /cvsroot/pgsql/src/test/regress/sql/boolean.sql,v 1.3 1997/05/09 03:26:43 scrappy Exp $
--
--
@@ -92,7 +92,8 @@ SELECT '' AS ff_4, BOOLTBL1.*, BOOLTBL2.*
SELECT '' AS tf_12_ff_4, BOOLTBL1.*, BOOLTBL2.*
- WHERE BOOLTBL2.f1 = BOOLTBL1.f1 or BOOLTBL1.f1 = 'true'::bool;
+ WHERE BOOLTBL2.f1 = BOOLTBL1.f1 or BOOLTBL1.f1 = 'true'::bool
+ ORDER BY BOOLTBL1.f1, BOOLTBL2.f1;
DROP TABLE BOOLTBL1;
diff --git a/src/test/regress/sql/reltime.sql b/src/test/regress/sql/reltime.sql
index 804ec3f4a684e10a33ffd65b859095547c168651..d11b48f0960d2f310256a778d712ecc6b6de43cc 100644
--- a/src/test/regress/sql/reltime.sql
+++ b/src/test/regress/sql/reltime.sql
@@ -42,5 +42,6 @@ SELECT '' AS five, RELTIME_TBL.*
SELECT '' AS fifteen, r1.*, r2.*
FROM RELTIME_TBL r1, RELTIME_TBL r2
- WHERE r1.f1 > r2.f1;
+ WHERE r1.f1 > r2.f1
+ ORDER BY r1.f1, r2.f1;
diff --git a/src/test/regress/sql/timespan.sql b/src/test/regress/sql/timespan.sql
index 32eb893d0799083d3d8f5d1f6ca099e39f8dcee4..df103edae0aa4b9a29aeed0eface819439ae06fd 100644
--- a/src/test/regress/sql/timespan.sql
+++ b/src/test/regress/sql/timespan.sql
@@ -39,5 +39,6 @@ SELECT '' AS nine, TIMESPAN_TBL.*
SELECT '' AS fortyfive, r1.*, r2.*
FROM TIMESPAN_TBL r1, TIMESPAN_TBL r2
- WHERE r1.f1 > r2.f1;
+ WHERE r1.f1 > r2.f1
+ ORDER BY r1.f1, r2.f1;