--- /dev/null
+++ b/src/test/regress/expected/point_1.out
@@ -0,0 +1,297 @@
+--
+-- POINT
+--
+CREATE TABLE POINT_TBL(f1 point);
+INSERT INTO POINT_TBL(f1) VALUES ('(0.0,0.0)');
+INSERT INTO POINT_TBL(f1) VALUES ('(-10.0,0.0)');
+INSERT INTO POINT_TBL(f1) VALUES ('(-3.0,4.0)');
+INSERT INTO POINT_TBL(f1) VALUES ('(5.1, 34.5)');
+INSERT INTO POINT_TBL(f1) VALUES ('(-5.0,-12.0)');
+-- bad format points
+INSERT INTO POINT_TBL(f1) VALUES ('asdfasdf');
+ERROR:  invalid input syntax for type point: "asdfasdf"
+LINE 1: INSERT INTO POINT_TBL(f1) VALUES ('asdfasdf');
+                                          ^
+INSERT INTO POINT_TBL(f1) VALUES ('10.0,10.0');
+INSERT INTO POINT_TBL(f1) VALUES ('(10.0 10.0)');
+ERROR:  invalid input syntax for type point: "(10.0 10.0)"
+LINE 1: INSERT INTO POINT_TBL(f1) VALUES ('(10.0 10.0)');
+                                          ^
+INSERT INTO POINT_TBL(f1) VALUES ('(10.0,10.0');
+ERROR:  invalid input syntax for type point: "(10.0,10.0"
+LINE 1: INSERT INTO POINT_TBL(f1) VALUES ('(10.0,10.0');
+                                          ^
+SELECT '' AS six, * FROM POINT_TBL;
+ six |     f1     
+-----+------------
+     | (0,0)
+     | (-10,0)
+     | (-3,4)
+     | (5.1,34.5)
+     | (-5,-12)
+     | (10,10)
+(6 rows)
+
+-- left of
+SELECT '' AS three, p.* FROM POINT_TBL p WHERE p.f1 << '(0.0, 0.0)';
+ three |    f1    
+-------+----------
+       | (-10,0)
+       | (-3,4)
+       | (-5,-12)
+(3 rows)
+
+-- right of
+SELECT '' AS three, p.* FROM POINT_TBL p WHERE '(0.0,0.0)' >> p.f1;
+ three |    f1    
+-------+----------
+       | (-10,0)
+       | (-3,4)
+       | (-5,-12)
+(3 rows)
+
+-- above
+SELECT '' AS one, p.* FROM POINT_TBL p WHERE '(0.0,0.0)' >^ p.f1;
+ one |    f1    
+-----+----------
+     | (-5,-12)
+(1 row)
+
+-- below
+SELECT '' AS one, p.* FROM POINT_TBL p WHERE p.f1 <^ '(0.0, 0.0)';
+ one |    f1    
+-----+----------
+     | (-5,-12)
+(1 row)
+
+-- equal
+SELECT '' AS one, p.* FROM POINT_TBL p WHERE p.f1 ~= '(5.1, 34.5)';
+ one |     f1     
+-----+------------
+     | (5.1,34.5)
+(1 row)
+
+-- point in box
+SELECT '' AS three, p.* FROM POINT_TBL p
+   WHERE p.f1 <@ box '(0,0,100,100)';
+ three |     f1     
+-------+------------
+       | (0,0)
+       | (5.1,34.5)
+       | (10,10)
+(3 rows)
+
+SELECT '' AS three, p.* FROM POINT_TBL p
+   WHERE box '(0,0,100,100)' @> p.f1;
+ three |     f1     
+-------+------------
+       | (0,0)
+       | (5.1,34.5)
+       | (10,10)
+(3 rows)
+
+SELECT '' AS three, p.* FROM POINT_TBL p
+   WHERE not p.f1 <@ box '(0,0,100,100)';
+ three |    f1    
+-------+----------
+       | (-10,0)
+       | (-3,4)
+       | (-5,-12)
+(3 rows)
+
+SELECT '' AS two, p.* FROM POINT_TBL p
+   WHERE p.f1 <@ path '[(0,0),(-10,0),(-10,10)]';
+ two |   f1    
+-----+---------
+     | (0,0)
+     | (-10,0)
+(2 rows)
+
+SELECT '' AS three, p.* FROM POINT_TBL p
+   WHERE not box '(0,0,100,100)' @> p.f1;
+ three |    f1    
+-------+----------
+       | (-10,0)
+       | (-3,4)
+       | (-5,-12)
+(3 rows)
+
+SELECT '' AS six, p.f1, p.f1 <-> point '(0,0)' AS dist
+   FROM POINT_TBL p
+   ORDER BY dist;
+ six |     f1     |       dist       
+-----+------------+------------------
+     | (0,0)      |                0
+     | (-3,4)     |                5
+     | (-10,0)    |               10
+     | (-5,-12)   |               13
+     | (10,10)    | 14.1421356237309
+     | (5.1,34.5) | 34.8749193547455
+(6 rows)
+
+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];
+ thirtysix |   point1   |   point2   |       dist       
+-----------+------------+------------+------------------
+           | (-10,0)    | (-10,0)    |                0
+           | (-5,-12)   | (-5,-12)   |                0
+           | (-3,4)     | (-3,4)     |                0
+           | (0,0)      | (0,0)      |                0
+           | (5.1,34.5) | (5.1,34.5) |                0
+           | (10,10)    | (10,10)    |                0
+           | (-3,4)     | (0,0)      |                5
+           | (0,0)      | (-3,4)     |                5
+           | (-10,0)    | (-3,4)     | 8.06225774829855
+           | (-3,4)     | (-10,0)    | 8.06225774829855
+           | (-10,0)    | (0,0)      |               10
+           | (0,0)      | (-10,0)    |               10
+           | (-10,0)    | (-5,-12)   |               13
+           | (-5,-12)   | (-10,0)    |               13
+           | (-5,-12)   | (0,0)      |               13
+           | (0,0)      | (-5,-12)   |               13
+           | (0,0)      | (10,10)    | 14.1421356237309
+           | (10,10)    | (0,0)      | 14.1421356237309
+           | (-3,4)     | (10,10)    | 14.3178210632764
+           | (10,10)    | (-3,4)     | 14.3178210632764
+           | (-5,-12)   | (-3,4)     | 16.1245154965971
+           | (-3,4)     | (-5,-12)   | 16.1245154965971
+           | (-10,0)    | (10,10)    | 22.3606797749979
+           | (10,10)    | (-10,0)    | 22.3606797749979
+           | (5.1,34.5) | (10,10)    | 24.9851956166046
+           | (10,10)    | (5.1,34.5) | 24.9851956166046
+           | (-5,-12)   | (10,10)    | 26.6270539113887
+           | (10,10)    | (-5,-12)   | 26.6270539113887
+           | (-3,4)     | (5.1,34.5) | 31.5572495632937
+           | (5.1,34.5) | (-3,4)     | 31.5572495632937
+           | (0,0)      | (5.1,34.5) | 34.8749193547455
+           | (5.1,34.5) | (0,0)      | 34.8749193547455
+           | (-10,0)    | (5.1,34.5) | 37.6597928831267
+           | (5.1,34.5) | (-10,0)    | 37.6597928831267
+           | (-5,-12)   | (5.1,34.5) | 47.5842410888311
+           | (5.1,34.5) | (-5,-12)   | 47.5842410888311
+(36 rows)
+
+SELECT '' AS thirty, p1.f1 AS point1, p2.f1 AS point2
+   FROM POINT_TBL p1, POINT_TBL p2
+   WHERE (p1.f1 <-> p2.f1) > 3;
+ thirty |   point1   |   point2   
+--------+------------+------------
+        | (0,0)      | (-10,0)
+        | (0,0)      | (-3,4)
+        | (0,0)      | (5.1,34.5)
+        | (0,0)      | (-5,-12)
+        | (0,0)      | (10,10)
+        | (-10,0)    | (0,0)
+        | (-10,0)    | (-3,4)
+        | (-10,0)    | (5.1,34.5)
+        | (-10,0)    | (-5,-12)
+        | (-10,0)    | (10,10)
+        | (-3,4)     | (0,0)
+        | (-3,4)     | (-10,0)
+        | (-3,4)     | (5.1,34.5)
+        | (-3,4)     | (-5,-12)
+        | (-3,4)     | (10,10)
+        | (5.1,34.5) | (0,0)
+        | (5.1,34.5) | (-10,0)
+        | (5.1,34.5) | (-3,4)
+        | (5.1,34.5) | (-5,-12)
+        | (5.1,34.5) | (10,10)
+        | (-5,-12)   | (0,0)
+        | (-5,-12)   | (-10,0)
+        | (-5,-12)   | (-3,4)
+        | (-5,-12)   | (5.1,34.5)
+        | (-5,-12)   | (10,10)
+        | (10,10)    | (0,0)
+        | (10,10)    | (-10,0)
+        | (10,10)    | (-3,4)
+        | (10,10)    | (5.1,34.5)
+        | (10,10)    | (-5,-12)
+(30 rows)
+
+-- put distance result into output to allow sorting with GEQ optimizer - tgl 97/05/10
+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, p1.f1[0], p2.f1[0];
+ fifteen |   point1   |   point2   |     distance     
+---------+------------+------------+------------------
+         | (-3,4)     | (0,0)      |                5
+         | (-10,0)    | (-3,4)     | 8.06225774829855
+         | (-10,0)    | (0,0)      |               10
+         | (-10,0)    | (-5,-12)   |               13
+         | (-5,-12)   | (0,0)      |               13
+         | (0,0)      | (10,10)    | 14.1421356237309
+         | (-3,4)     | (10,10)    | 14.3178210632764
+         | (-5,-12)   | (-3,4)     | 16.1245154965971
+         | (-10,0)    | (10,10)    | 22.3606797749979
+         | (5.1,34.5) | (10,10)    | 24.9851956166046
+         | (-5,-12)   | (10,10)    | 26.6270539113887
+         | (-3,4)     | (5.1,34.5) | 31.5572495632937
+         | (0,0)      | (5.1,34.5) | 34.8749193547455
+         | (-10,0)    | (5.1,34.5) | 37.6597928831267
+         | (-5,-12)   | (5.1,34.5) | 47.5842410888311
+(15 rows)
+
+-- 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
+   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;
+ three |   point1   |  point2  |     distance     
+-------+------------+----------+------------------
+       | (-3,4)     | (0,0)    |                5
+       | (-10,0)    | (-5,-12) |               13
+       | (5.1,34.5) | (10,10)  | 24.9851956166046
+(3 rows)
+
+-- Test that GiST indexes provide same behavior as sequential scan
+CREATE TEMP TABLE point_gist_tbl(f1 point);
+INSERT INTO point_gist_tbl SELECT '(0,0)' FROM generate_series(0,1000);
+CREATE INDEX point_gist_tbl_index ON point_gist_tbl USING gist (f1);
+INSERT INTO point_gist_tbl VALUES ('(0.0000009,0.0000009)');
+SET enable_seqscan TO true;
+SET enable_indexscan TO false;
+SET enable_bitmapscan TO false;
+SELECT COUNT(*) FROM point_gist_tbl WHERE f1 ~= '(0.0000009,0.0000009)'::point;
+ count 
+-------
+  1002
+(1 row)
+
+SELECT COUNT(*) FROM point_gist_tbl WHERE f1 <@ '(0.0000009,0.0000009),(0.0000009,0.0000009)'::box;
+ count 
+-------
+     1
+(1 row)
+
+SELECT COUNT(*) FROM point_gist_tbl WHERE f1 ~= '(0.0000018,0.0000018)'::point;
+ count 
+-------
+     1
+(1 row)
+
+SET enable_seqscan TO false;
+SET enable_indexscan TO true;
+SET enable_bitmapscan TO true;
+SELECT COUNT(*) FROM point_gist_tbl WHERE f1 ~= '(0.0000009,0.0000009)'::point;
+ count 
+-------
+  1002
+(1 row)
+
+SELECT COUNT(*) FROM point_gist_tbl WHERE f1 <@ '(0.0000009,0.0000009),(0.0000009,0.0000009)'::box;
+ count 
+-------
+     1
+(1 row)
+
+SELECT COUNT(*) FROM point_gist_tbl WHERE f1 ~= '(0.0000018,0.0000018)'::point;
+ count 
+-------
+     1
+(1 row)
+
+RESET enable_seqscan;
+RESET enable_indexscan;
+RESET enable_bitmapscan;
--- /dev/null
+++ b/src/test/regress/expected/polygon_1.out
@@ -0,0 +1,229 @@
+--
+-- POLYGON
+--
+-- polygon logic
+--
+CREATE TABLE POLYGON_TBL(f1 polygon);
+INSERT INTO POLYGON_TBL(f1) VALUES ('(2.0,0.0),(2.0,4.0),(0.0,0.0)');
+INSERT INTO POLYGON_TBL(f1) VALUES ('(3.0,1.0),(3.0,3.0),(1.0,0.0)');
+-- degenerate polygons
+INSERT INTO POLYGON_TBL(f1) VALUES ('(0.0,0.0)');
+INSERT INTO POLYGON_TBL(f1) VALUES ('(0.0,1.0),(0.0,1.0)');
+-- bad polygon input strings
+INSERT INTO POLYGON_TBL(f1) VALUES ('0.0');
+ERROR:  invalid input syntax for type polygon: "0.0"
+LINE 1: INSERT INTO POLYGON_TBL(f1) VALUES ('0.0');
+                                            ^
+INSERT INTO POLYGON_TBL(f1) VALUES ('(0.0 0.0');
+ERROR:  invalid input syntax for type polygon: "(0.0 0.0"
+LINE 1: INSERT INTO POLYGON_TBL(f1) VALUES ('(0.0 0.0');
+                                            ^
+INSERT INTO POLYGON_TBL(f1) VALUES ('(0,1,2)');
+ERROR:  invalid input syntax for type polygon: "(0,1,2)"
+LINE 1: INSERT INTO POLYGON_TBL(f1) VALUES ('(0,1,2)');
+                                            ^
+INSERT INTO POLYGON_TBL(f1) VALUES ('(0,1,2,3');
+ERROR:  invalid input syntax for type polygon: "(0,1,2,3"
+LINE 1: INSERT INTO POLYGON_TBL(f1) VALUES ('(0,1,2,3');
+                                            ^
+INSERT INTO POLYGON_TBL(f1) VALUES ('asdf');
+ERROR:  invalid input syntax for type polygon: "asdf"
+LINE 1: INSERT INTO POLYGON_TBL(f1) VALUES ('asdf');
+                                            ^
+SELECT '' AS four, * FROM POLYGON_TBL;
+ four |         f1          
+------+---------------------
+      | ((2,0),(2,4),(0,0))
+      | ((3,1),(3,3),(1,0))
+      | ((0,0))
+      | ((0,1),(0,1))
+(4 rows)
+
+-- overlap
+SELECT '' AS three, p.*
+   FROM POLYGON_TBL p
+   WHERE p.f1 && '(3.0,1.0),(3.0,3.0),(1.0,0.0)';
+ three |         f1          
+-------+---------------------
+       | ((2,0),(2,4),(0,0))
+       | ((3,1),(3,3),(1,0))
+(2 rows)
+
+-- left overlap
+SELECT '' AS four, p.*
+   FROM POLYGON_TBL p
+   WHERE p.f1 &< '(3.0,1.0),(3.0,3.0),(1.0,0.0)';
+ four |         f1          
+------+---------------------
+      | ((2,0),(2,4),(0,0))
+      | ((3,1),(3,3),(1,0))
+      | ((0,0))
+      | ((0,1),(0,1))
+(4 rows)
+
+-- right overlap
+SELECT '' AS two, p.*
+   FROM POLYGON_TBL p
+   WHERE p.f1 &> '(3.0,1.0),(3.0,3.0),(1.0,0.0)';
+ two |         f1          
+-----+---------------------
+     | ((3,1),(3,3),(1,0))
+(1 row)
+
+-- left of
+SELECT '' AS one, p.*
+   FROM POLYGON_TBL p
+   WHERE p.f1 << '(3.0,1.0),(3.0,3.0),(1.0,0.0)';
+ one |      f1       
+-----+---------------
+     | ((0,0))
+     | ((0,1),(0,1))
+(2 rows)
+
+-- right of
+SELECT '' AS zero, p.*
+   FROM POLYGON_TBL p
+   WHERE p.f1 >> '(3.0,1.0),(3.0,3.0),(1.0,0.0)';
+ zero | f1 
+------+----
+(0 rows)
+
+-- contained
+SELECT '' AS one, p.*
+   FROM POLYGON_TBL p
+   WHERE p.f1 <@ polygon '(3.0,1.0),(3.0,3.0),(1.0,0.0)';
+ one |         f1          
+-----+---------------------
+     | ((3,1),(3,3),(1,0))
+(1 row)
+
+-- same
+SELECT '' AS one, p.*
+   FROM POLYGON_TBL p
+   WHERE p.f1 ~= polygon '(3.0,1.0),(3.0,3.0),(1.0,0.0)';
+ one |         f1          
+-----+---------------------
+     | ((3,1),(3,3),(1,0))
+(1 row)
+
+-- contains
+SELECT '' AS one, p.*
+   FROM POLYGON_TBL p
+   WHERE p.f1 @> polygon '(3.0,1.0),(3.0,3.0),(1.0,0.0)';
+ one |         f1          
+-----+---------------------
+     | ((3,1),(3,3),(1,0))
+(1 row)
+
+--
+-- polygon logic
+--
+-- left of
+SELECT polygon '(2.0,0.0),(2.0,4.0),(0.0,0.0)' << polygon '(3.0,1.0),(3.0,3.0),(1.0,0.0)' AS false;
+ false 
+-------
+ f
+(1 row)
+
+-- left overlap
+SELECT polygon '(2.0,0.0),(2.0,4.0),(0.0,0.0)' << polygon '(3.0,1.0),(3.0,3.0),(1.0,0.0)' AS true;
+ true 
+------
+ f
+(1 row)
+
+-- right overlap
+SELECT polygon '(2.0,0.0),(2.0,4.0),(0.0,0.0)' &> polygon '(3.0,1.0),(3.0,3.0),(1.0,0.0)' AS false;
+ false 
+-------
+ f
+(1 row)
+
+-- right of
+SELECT polygon '(2.0,0.0),(2.0,4.0),(0.0,0.0)' >> polygon '(3.0,1.0),(3.0,3.0),(1.0,0.0)' AS false;
+ false 
+-------
+ f
+(1 row)
+
+-- contained in
+SELECT polygon '(2.0,0.0),(2.0,4.0),(0.0,0.0)' <@ polygon '(3.0,1.0),(3.0,3.0),(1.0,0.0)' AS false;
+ false 
+-------
+ f
+(1 row)
+
+-- contains
+SELECT polygon '(2.0,0.0),(2.0,4.0),(0.0,0.0)' @> polygon '(3.0,1.0),(3.0,3.0),(1.0,0.0)' AS false;
+ false 
+-------
+ f
+(1 row)
+
+SELECT '((0,4),(6,4),(1,2),(6,0),(0,0))'::polygon @> '((2,1),(2,3),(3,3),(3,1))'::polygon AS "false";
+ false 
+-------
+ f
+(1 row)
+
+SELECT '((0,4),(6,4),(3,2),(6,0),(0,0))'::polygon @> '((2,1),(2,3),(3,3),(3,1))'::polygon AS "true";
+ true 
+------
+ t
+(1 row)
+
+SELECT '((1,1),(1,4),(5,4),(5,3),(2,3),(2,2),(5,2),(5,1))'::polygon @> '((3,2),(3,3),(4,3),(4,2))'::polygon AS "false";
+ false 
+-------
+ f
+(1 row)
+
+SELECT '((0,0),(0,3),(3,3),(3,0))'::polygon @> '((2,1),(2,2),(3,2),(3,1))'::polygon AS "true";
+ true 
+------
+ t
+(1 row)
+
+-- same
+SELECT polygon '(2.0,0.0),(2.0,4.0),(0.0,0.0)' ~= polygon '(3.0,1.0),(3.0,3.0),(1.0,0.0)' AS false;
+ false 
+-------
+ f
+(1 row)
+
+-- overlap
+SELECT polygon '(2.0,0.0),(2.0,4.0),(0.0,0.0)' && polygon '(3.0,1.0),(3.0,3.0),(1.0,0.0)' AS true;
+ true 
+------
+ t
+(1 row)
+
+SELECT '((0,4),(6,4),(1,2),(6,0),(0,0))'::polygon && '((2,1),(2,3),(3,3),(3,1))'::polygon AS "true";
+ true 
+------
+ t
+(1 row)
+
+SELECT '((1,4),(1,1),(4,1),(4,2),(2,2),(2,4),(1,4))'::polygon && '((3,3),(4,3),(4,4),(3,4),(3,3))'::polygon AS "false";
+ false 
+-------
+ f
+(1 row)
+
+SELECT '((200,800),(800,800),(800,200),(200,200))' &&  '(1000,1000,0,0)'::polygon AS "true";
+ true 
+------
+ t
+(1 row)
+
+-- distance from a point
+SELECT	'(0,0)'::point <-> '((0,0),(1,2),(2,1))'::polygon as on_corner,
+	'(1,1)'::point <-> '((0,0),(2,2),(1,3))'::polygon as on_segment,
+	'(2,2)'::point <-> '((0,0),(1,4),(3,1))'::polygon as inside,
+	'(3,3)'::point <-> '((0,2),(2,0),(2,2))'::polygon as near_corner,
+	'(4,4)'::point <-> '((0,0),(0,3),(4,0))'::polygon as near_segment;
+ on_corner | on_segment | inside |   near_corner    | near_segment 
+-----------+------------+--------+------------------+--------------
+         0 |          0 |      0 | 1.41421356237309 |          3.2
+(1 row)
+
