Stop a few regression tests from needlessly disabling GEQO. This was

necessary in 1997, when geqo_threshold did not exist, but it is no
longer needed.

diff --git a/src/test/regress/expected/geometry.out b/src/test/regress/expected/geometry.out
index e90952cc2f4dc5681138dd79a72d12c3b215dcb5..6910e54ec661796d254902098346508c8776e61a 100644 (file)
--- a/src/test/regress/expected/geometry.out
+++ b/src/test/regress/expected/geometry.out
@@ -284,7 +284,6 @@ SELECT '' AS twenty, b.f1 / p.f1 AS rotation
 --
 -- Paths
 --
-SET geqo TO 'off';
 SELECT '' AS eight, npoints(f1) AS npoints, f1 AS path FROM PATH_TBL;
  eight | npoints |           path            
 -------+---------+---------------------------
@@ -337,7 +336,6 @@ SELECT '' AS eight, p1.f1 * point '(2,-1)' AS dist_mul
        | ((34,13),(40,15))
 (8 rows)
 
-RESET geqo;
 --
 -- Polygons
 --

diff --git a/src/test/regress/expected/geometry_1.out b/src/test/regress/expected/geometry_1.out
index 164fc71017fc99c029dacc784ebb0f969f76feaf..0e014925257aac965d074677696752a77fae412c 100644 (file)
--- a/src/test/regress/expected/geometry_1.out
+++ b/src/test/regress/expected/geometry_1.out
@@ -284,7 +284,6 @@ SELECT '' AS twenty, b.f1 / p.f1 AS rotation
 --
 -- Paths
 --
-SET geqo TO 'off';
 SELECT '' AS eight, npoints(f1) AS npoints, f1 AS path FROM PATH_TBL;
  eight | npoints |           path            
 -------+---------+---------------------------
@@ -337,7 +336,6 @@ SELECT '' AS eight, p1.f1 * point '(2,-1)' AS dist_mul
        | ((34,13),(40,15))
 (8 rows)
 
-RESET geqo;
 --
 -- Polygons
 --

diff --git a/src/test/regress/expected/geometry_2.out b/src/test/regress/expected/geometry_2.out
index 2763ca1643bcd62067ce7b354e2d5aeda40c2fb5..7787dab06185c6e79d9a6150651e2a6990f52946 100644 (file)
--- a/src/test/regress/expected/geometry_2.out
+++ b/src/test/regress/expected/geometry_2.out
@@ -284,7 +284,6 @@ SELECT '' AS twenty, b.f1 / p.f1 AS rotation
 --
 -- Paths
 --
-SET geqo TO 'off';
 SELECT '' AS eight, npoints(f1) AS npoints, f1 AS path FROM PATH_TBL;
  eight | npoints |           path            
 -------+---------+---------------------------
@@ -337,7 +336,6 @@ SELECT '' AS eight, p1.f1 * point '(2,-1)' AS dist_mul
        | ((34,13),(40,15))
 (8 rows)
 
-RESET geqo;
 --
 -- Polygons
 --

diff --git a/src/test/regress/expected/point.out b/src/test/regress/expected/point.out
index 96bcc6d695c56644a738bd183cb5c68c86b44b2a..a31a4b39b7021973a22d2f05d28c06e46ef0ed5e 100644 (file)
--- a/src/test/regress/expected/point.out
+++ b/src/test/regress/expected/point.out
@@ -105,7 +105,6 @@ SELECT '' AS six, p.f1, p.f1 <-> point '(0,0)' AS dist
      | (5.1,34.5) | 34.8749193547455
 (6 rows)
 
-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, p1.f1[0], p2.f1[0];
@@ -222,4 +221,3 @@ SELECT '' AS three, p1.f1 AS point1, p2.f1 AS point2, (p1.f1 <-> p2.f1) AS dista
        | (5.1,34.5) | (10,10)  | 24.9851956166046
 (3 rows)
 
-RESET geqo;

diff --git a/src/test/regress/expected/tinterval.out b/src/test/regress/expected/tinterval.out
index 5644cbc49326fca72e0ddd9567e7009c249e6951..1b4586b87ae25684723d1a98d868c42aeb3b82c8 100644 (file)
--- a/src/test/regress/expected/tinterval.out
+++ b/src/test/regress/expected/tinterval.out
@@ -103,7 +103,6 @@ SELECT '' AS three, t1.*
        | ["Wed Dec 31 16:00:00 1969 PST" "Mon May 01 00:30:30 1995 PDT"]
 (3 rows)
 
-SET geqo TO 'off';
 SELECT '' AS five, t1.f1, t2.f1
    FROM TINTERVAL_TBL t1, TINTERVAL_TBL t2
    WHERE t1.f1 && t2.f1 and
@@ -167,4 +166,3 @@ SELECT '' AS three, t1.f1
        | ["Wed Dec 31 16:00:00 1969 PST" "Mon May 01 00:30:30 1995 PDT"]
 (3 rows)
 
-RESET geqo;

diff --git a/src/test/regress/sql/geometry.sql b/src/test/regress/sql/geometry.sql
index 523bcdb76dfe660372d2f03a5651c9a4f3b5fabe..73f8032bb15a6113d61883ee93f190408cbb22a7 100644 (file)
--- a/src/test/regress/sql/geometry.sql
+++ b/src/test/regress/sql/geometry.sql
@@ -87,8 +87,6 @@ SELECT '' AS twenty, b.f1 / p.f1 AS rotation
 -- Paths
 --
 
-SET geqo TO 'off';
-
 SELECT '' AS eight, npoints(f1) AS npoints, f1 AS path FROM PATH_TBL;
 
 SELECT '' AS four, path(f1) FROM POLYGON_TBL;
@@ -101,8 +99,6 @@ SELECT '' AS eight, p1.f1 + point '(10,10)' AS dist_add
 SELECT '' AS eight, p1.f1 * point '(2,-1)' AS dist_mul
    FROM PATH_TBL p1;
 
-RESET geqo;
-
 --
 -- Polygons
 --

diff --git a/src/test/regress/sql/point.sql b/src/test/regress/sql/point.sql
index 1f5f7635d199834c250959ab0e26c07678e25d7d..8523c2ee9f8cd5c66e16b6b0a15ecec19e0768f7 100644 (file)
--- a/src/test/regress/sql/point.sql
+++ b/src/test/regress/sql/point.sql
@@ -55,8 +55,6 @@ SELECT '' AS six, p.f1, p.f1 <-> point '(0,0)' AS dist
    FROM POINT_TBL p
    ORDER BY dist;
 
-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, p1.f1[0], p2.f1[0];
@@ -76,6 +74,3 @@ SELECT '' AS three, p1.f1 AS point1, p2.f1 AS point2, (p1.f1 <-> p2.f1) AS dista
    FROM POINT_TBL p1, POINT_TBL p2 
    WHERE (p1.f1 <-> p2.f1) > 3 and p1.f1 << p2.f1 and p1.f1 >^ p2.f1
    ORDER BY distance;
-
-RESET geqo;
-

diff --git a/src/test/regress/sql/tinterval.sql b/src/test/regress/sql/tinterval.sql
index 82d61dda3e826367f42c6b272ad763072839611b..5abdb6d10668e8ce109398bc081b4e6f0603e415 100644 (file)
--- a/src/test/regress/sql/tinterval.sql
+++ b/src/test/regress/sql/tinterval.sql
@@ -70,8 +70,6 @@ SELECT '' AS three, t1.*
    WHERE t1.f1 &&
         tinterval '["Aug 15 14:23:19 1983" "Sep 16 14:23:19 1983"]';
 
-SET geqo TO 'off';
-
 SELECT '' AS five, t1.f1, t2.f1
    FROM TINTERVAL_TBL t1, TINTERVAL_TBL t2
    WHERE t1.f1 && t2.f1 and
@@ -97,5 +95,3 @@ SELECT '' AS three, t1.f1
         (abstime 'Aug 15 14:23:19 1983' <#>
          abstime 'Sep 16 14:23:19 1983')
    ORDER BY t1.f1;
-
-RESET geqo;