From 59b3b8014dcc4b016a2d429ccc975cd5aaf69283 Mon Sep 17 00:00:00 2001 From: Tom Lane Date: Fri, 3 Dec 2004 22:19:28 +0000 Subject: [PATCH] As long as we're forcing an ORDER BY in these four join queries, we had better make sure the sort order is totally specified; else we get burnt by platform-specific behavior of qsort() with equal keys. Per buildfarm results. --- src/test/regress/expected/join.out | 8 ++++---- src/test/regress/sql/join.sql | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/test/regress/expected/join.out b/src/test/regress/expected/join.out index 58d0d3f06f..b98288e5c2 100644 --- a/src/test/regress/expected/join.out +++ b/src/test/regress/expected/join.out @@ -1718,7 +1718,7 @@ SELECT '' AS "xxx", * -- SELECT '' AS "xxx", * FROM J1_TBL LEFT OUTER JOIN J2_TBL USING (i) - ORDER BY i, k; + ORDER BY i, k, t; xxx | i | j | t | k -----+---+---+-------+---- | 0 | | zero | @@ -1738,7 +1738,7 @@ SELECT '' AS "xxx", * SELECT '' AS "xxx", * FROM J1_TBL LEFT JOIN J2_TBL USING (i) - ORDER BY i, k; + ORDER BY i, k, t; xxx | i | j | t | k -----+---+---+-------+---- | 0 | | zero | @@ -1788,7 +1788,7 @@ SELECT '' AS "xxx", * SELECT '' AS "xxx", * FROM J1_TBL FULL OUTER JOIN J2_TBL USING (i) - ORDER BY i, k; + ORDER BY i, k, t; xxx | i | j | t | k -----+---+---+-------+---- | 0 | | zero | @@ -1810,7 +1810,7 @@ SELECT '' AS "xxx", * SELECT '' AS "xxx", * FROM J1_TBL FULL JOIN J2_TBL USING (i) - ORDER BY i, k; + ORDER BY i, k, t; xxx | i | j | t | k -----+---+---+-------+---- | 0 | | zero | diff --git a/src/test/regress/sql/join.sql b/src/test/regress/sql/join.sql index f9f851f677..9bda6f1d00 100644 --- a/src/test/regress/sql/join.sql +++ b/src/test/regress/sql/join.sql @@ -167,11 +167,11 @@ SELECT '' AS "xxx", * SELECT '' AS "xxx", * FROM J1_TBL LEFT OUTER JOIN J2_TBL USING (i) - ORDER BY i, k; + ORDER BY i, k, t; SELECT '' AS "xxx", * FROM J1_TBL LEFT JOIN J2_TBL USING (i) - ORDER BY i, k; + ORDER BY i, k, t; SELECT '' AS "xxx", * FROM J1_TBL RIGHT OUTER JOIN J2_TBL USING (i); @@ -181,11 +181,11 @@ SELECT '' AS "xxx", * SELECT '' AS "xxx", * FROM J1_TBL FULL OUTER JOIN J2_TBL USING (i) - ORDER BY i, k; + ORDER BY i, k, t; SELECT '' AS "xxx", * FROM J1_TBL FULL JOIN J2_TBL USING (i) - ORDER BY i, k; + ORDER BY i, k, t; SELECT '' AS "xxx", * FROM J1_TBL LEFT JOIN J2_TBL USING (i) WHERE (k = 1);