merge

mysql-test/suite/gis/r/spatial_analysis_functions_area.result

@@ -9,7 +9,7 @@ internal_tmp_disk_storage_engine	MYISAM
 #Creating the spatial Geometry object
 USE test;
 DROP TABLE IF EXISTS gis_geometrycollection;
-CREATE TABLE gis_geometrycollection  (fid INTEGER NOT NULL PRIMARY KEY, g GEOMETRYCOLLECTION);
+CREATE TABLE gis_geometrycollection (fid INTEGER NOT NULL PRIMARY KEY, g GEOMETRYCOLLECTION);
 SET @star_elem_vertical= 'POLYGON((5 0,15 25,25 0,15 5,5 0))';
 SET @star_elem_horizontal= 'POLYGON((25 0,0 15,30 15,22 10,25 0))';
 SET @star_center= 'POINT(15 10)';
@@ -227,6 +227,15 @@ Area(GeomFromText(@star_collection_elems))
 SELECT Area(GeomFromText(@star_collection_multilinestr));
 Area(GeomFromText(@star_collection_multilinestr))
 665
+SELECT Area(GeomFromText('GEOMETRYCOLLECTION()'));
+Area(GeomFromText('GEOMETRYCOLLECTION()'))
+0
+SELECT Area(GeomFromText('GEOMETRYCOLLECTION(GEOMETRYCOLLECTION())'));
+Area(GeomFromText('GEOMETRYCOLLECTION(GEOMETRYCOLLECTION())'))
+0
+SELECT Area(GeomFromText('GEOMETRYCOLLECTION(GEOMETRYCOLLECTION(GEOMETRYCOLLECTION()))'));
+Area(GeomFromText('GEOMETRYCOLLECTION(GEOMETRYCOLLECTION(GEOMETRYCOLLECTION()))'))
+0
 SELECT Area(GeomFromText('GEOMETRYCOLLECTION(POINT(10 10),MULTIPOINT(0 0,10 10))'));
 Area(GeomFromText('GEOMETRYCOLLECTION(POINT(10 10),MULTIPOINT(0 0,10 10))'))
 0
@@ -434,6 +443,15 @@ ST_Area(GeomFromText(@star_collection_elems))
 SELECT ST_Area(GeomFromText(@star_collection_multilinestr));
 ST_Area(GeomFromText(@star_collection_multilinestr))
 665
+SELECT ST_Area(GeomFromText('GEOMETRYCOLLECTION()'));
+ST_Area(GeomFromText('GEOMETRYCOLLECTION()'))
+0
+SELECT ST_Area(GeomFromText('GEOMETRYCOLLECTION(GEOMETRYCOLLECTION())'));
+ST_Area(GeomFromText('GEOMETRYCOLLECTION(GEOMETRYCOLLECTION())'))
+0
+SELECT ST_Area(GeomFromText('GEOMETRYCOLLECTION(GEOMETRYCOLLECTION(GEOMETRYCOLLECTION()))'));
+ST_Area(GeomFromText('GEOMETRYCOLLECTION(GEOMETRYCOLLECTION(GEOMETRYCOLLECTION()))'))
+0
 SELECT ST_Area(GeomFromText('GEOMETRYCOLLECTION(POINT(10 10),MULTIPOINT(0 0,10 10))'));
 ST_Area(GeomFromText('GEOMETRYCOLLECTION(POINT(10 10),MULTIPOINT(0 0,10 10))'))
 0
@@ -788,9 +806,25 @@ ST_Area(GeomFromWKB(0x0000000007000000010000000003000000010000000400000000000000
 #====================================================================================
 # Invalid function calls
 #====================================================================================
+#---------------------------------------------------------------------------------------
+# Area()
+SELECT Area();
+ERROR 42000: Incorrect parameter count in the call to native function 'Area'
 SELECT Area(NULL);
 Area(NULL)
 NULL
+SELECT Area(GeomFromText('POINT()'));
+ERROR 22023: Invalid GIS data provided to function st_geometryfromtext.
+SELECT Area(GeomFromText('LINESTRING()'));
+ERROR 22023: Invalid GIS data provided to function st_geometryfromtext.
+SELECT Area(GeomFromText('POLYGON(())'));
+ERROR 22023: Invalid GIS data provided to function st_geometryfromtext.
+SELECT Area(GeomFromText('MULTIPOINT()'));
+ERROR 22023: Invalid GIS data provided to function st_geometryfromtext.
+SELECT Area(GeomFromText('MULTILINESTRING(())'));
+ERROR 22023: Invalid GIS data provided to function st_geometryfromtext.
+SELECT Area(GeomFromText('MULTIPOLYGON((()))'));
+ERROR 22023: Invalid GIS data provided to function st_geometryfromtext.
 SELECT Area(GeomFromText('POINT(a 0)'));
 ERROR 22023: Invalid GIS data provided to function st_geometryfromtext.
 SELECT Area(GeomFromText('POINT(! 0)'));
@@ -821,17 +855,12 @@ SELECT Area(GeomFromText('POLYGON((0 0,5 5))'));
 ERROR 22023: Invalid GIS data provided to function st_area.
 SELECT Area(GeomFromText('POLYGON((0 0,5 5,10 10))'));
 ERROR 22023: Invalid GIS data provided to function st_area.
+SELECT Area(GeomFromText('POLYGON((0 0,0 5,10 10),(0 0))'));
+ERROR 22023: Invalid GIS data provided to function st_area.
 SELECT Area(GeomFromText('MULTIPOLYGON(((0 0,5 5,10 10)),((10 10)))'));
 ERROR 22023: Invalid GIS data provided to function st_area.
-SELECT Area(GeomFromText('GEOMETRYCOLLECTION()'));
-Area(GeomFromText('GEOMETRYCOLLECTION()'))
-0
-SELECT Area(GeomFromText('GEOMETRYCOLLECTION(GEOMETRYCOLLECTION())'));
-Area(GeomFromText('GEOMETRYCOLLECTION(GEOMETRYCOLLECTION())'))
-0
-SELECT Area(GeomFromText('GEOMETRYCOLLECTION(GEOMETRYCOLLECTION(GEOMETRYCOLLECTION()))'));
-Area(GeomFromText('GEOMETRYCOLLECTION(GEOMETRYCOLLECTION(GEOMETRYCOLLECTION()))'))
-0
+SELECT Area(GeomFromText('MULTIPOLYGON(((0 0,5 5,10 10)),((10 10))'));
+ERROR 22023: Invalid GIS data provided to function st_geometryfromtext.
 SELECT Area(0x000000000200000000000000000000000000000000);
 ERROR HY000: Geometry byte string must be little endian.
 SELECT Area(0x010100000001000000010100000000000000000000);
@@ -846,9 +875,25 @@ SELECT Area(0x010300000002000000010300000002000000050000);
 ERROR HY000: Geometry byte string must be little endian.
 SELECT Area(0x010400000002000000010100000000000000000000);
 ERROR HY000: Geometry byte string must be little endian.
+#---------------------------------------------------------------------------------------
+# ST_Area()
+SELECT ST_Area();
+ERROR 42000: Incorrect parameter count in the call to native function 'ST_Area'
 SELECT ST_Area(NULL);
 ST_Area(NULL)
 NULL
+SELECT ST_Area(GeomFromText('POINT()'));
+ERROR 22023: Invalid GIS data provided to function st_geometryfromtext.
+SELECT ST_Area(GeomFromText('LINESTRING()'));
+ERROR 22023: Invalid GIS data provided to function st_geometryfromtext.
+SELECT ST_Area(GeomFromText('POLYGON(())'));
+ERROR 22023: Invalid GIS data provided to function st_geometryfromtext.
+SELECT ST_Area(GeomFromText('MULTIPOINT()'));
+ERROR 22023: Invalid GIS data provided to function st_geometryfromtext.
+SELECT ST_Area(GeomFromText('MULTILINESTRING(())'));
+ERROR 22023: Invalid GIS data provided to function st_geometryfromtext.
+SELECT ST_Area(GeomFromText('MULTIPOLYGON((()))'));
+ERROR 22023: Invalid GIS data provided to function st_geometryfromtext.
 SELECT ST_Area(GeomFromText('POINT(a 0)'));
 ERROR 22023: Invalid GIS data provided to function st_geometryfromtext.
 SELECT ST_Area(GeomFromText('POINT(! 0)'));
@@ -879,17 +924,12 @@ SELECT ST_Area(GeomFromText('POLYGON((0 0,5 5))'));
 ERROR 22023: Invalid GIS data provided to function st_area.
 SELECT ST_Area(GeomFromText('POLYGON((0 0,5 5,10 10))'));
 ERROR 22023: Invalid GIS data provided to function st_area.
+SELECT ST_Area(GeomFromText('POLYGON((0 0,0 5,10 10),(0 0))'));
+ERROR 22023: Invalid GIS data provided to function st_area.
 SELECT ST_Area(GeomFromText('MULTIPOLYGON(((0 0,5 5,10 10)),((10 10)))'));
 ERROR 22023: Invalid GIS data provided to function st_area.
-SELECT ST_Area(GeomFromText('GEOMETRYCOLLECTION()'));
-ST_Area(GeomFromText('GEOMETRYCOLLECTION()'))
-0
-SELECT ST_Area(GeomFromText('GEOMETRYCOLLECTION(GEOMETRYCOLLECTION())'));
-ST_Area(GeomFromText('GEOMETRYCOLLECTION(GEOMETRYCOLLECTION())'))
-0
-SELECT ST_Area(GeomFromText('GEOMETRYCOLLECTION(GEOMETRYCOLLECTION(GEOMETRYCOLLECTION()))'));
-ST_Area(GeomFromText('GEOMETRYCOLLECTION(GEOMETRYCOLLECTION(GEOMETRYCOLLECTION()))'))
-0
+SELECT ST_Area(GeomFromText('MULTIPOLYGON(((0 0,5 5,10 10)),((10 10))'));
+ERROR 22023: Invalid GIS data provided to function st_geometryfromtext.
 SELECT ST_Area(0x000000000200000000000000000000000000000000);
 ERROR HY000: Geometry byte string must be little endian.
 SELECT ST_Area(0x010100000001000000010100000000000000000000);
@@ -906,4 +946,3 @@ SELECT ST_Area(0x010400000002000000010100000000000000000000);
 ERROR HY000: Geometry byte string must be little endian.
 #clean up
 DROP TABLE IF EXISTS gis_geometrycollection;
-DROP TABLE IF EXISTS gis_geometrycollection_2;

mysql-test/suite/gis/r/spatial_analysis_functions_centroid.result

@@ -9,7 +9,7 @@ internal_tmp_disk_storage_engine	MYISAM
 #Creating the spatial Geometry object
 USE test;
 DROP TABLE IF EXISTS gis_geometrycollection;
-CREATE TABLE gis_geometrycollection  (fid INTEGER NOT NULL PRIMARY KEY, g GEOMETRYCOLLECTION);
+CREATE TABLE gis_geometrycollection (fid INTEGER NOT NULL PRIMARY KEY, g GEOMETRYCOLLECTION);
 SET @star_elem_vertical= 'POLYGON((5 0,15 25,25 0,15 5,5 0))';
 SET @star_elem_horizontal= 'POLYGON((25 0,0 15,30 15,22 10,25 0))';
 SET @star_center= 'POINT(15 10)';
@@ -224,6 +224,15 @@ POINT(15.265664160401002 10.463659147869674)
 SELECT AsText(Centroid(GeomFromText(@star_collection_multilinestr)));
 AsText(Centroid(GeomFromText(@star_collection_multilinestr)))
 POINT(15.265664160401002 10.463659147869674)
+SELECT AsText(Centroid(GeomFromText('GEOMETRYCOLLECTION()')));
+AsText(Centroid(GeomFromText('GEOMETRYCOLLECTION()')))
+NULL
+SELECT AsText(Centroid(GeomFromText('GEOMETRYCOLLECTION(GEOMETRYCOLLECTION())')));
+AsText(Centroid(GeomFromText('GEOMETRYCOLLECTION(GEOMETRYCOLLECTION())')))
+NULL
+SELECT AsText(Centroid(GeomFromText('GEOMETRYCOLLECTION(GEOMETRYCOLLECTION(GEOMETRYCOLLECTION()))')));
+AsText(Centroid(GeomFromText('GEOMETRYCOLLECTION(GEOMETRYCOLLECTION(GEOMETRYCOLLECTION()))')))
+NULL
 SELECT AsText(Centroid(GeomFromText('GEOMETRYCOLLECTION(POINT(10 10),MULTIPOINT(0 0,10 10))')));
 AsText(Centroid(GeomFromText('GEOMETRYCOLLECTION(POINT(10 10),MULTIPOINT(0 0,10 10))')))
 POINT(6.666666666666667 6.666666666666667)
@@ -452,6 +461,15 @@ POINT(15.265664160401002 10.463659147869674)
 SELECT AsText(ST_Centroid(GeomFromText(@star_collection_multilinestr)));
 AsText(ST_Centroid(GeomFromText(@star_collection_multilinestr)))
 POINT(15.265664160401002 10.463659147869674)
+SELECT AsText(ST_Centroid(GeomFromText('GEOMETRYCOLLECTION()')));
+AsText(ST_Centroid(GeomFromText('GEOMETRYCOLLECTION()')))
+NULL
+SELECT AsText(ST_Centroid(GeomFromText('GEOMETRYCOLLECTION(GEOMETRYCOLLECTION())')));
+AsText(ST_Centroid(GeomFromText('GEOMETRYCOLLECTION(GEOMETRYCOLLECTION())')))
+NULL
+SELECT AsText(ST_Centroid(GeomFromText('GEOMETRYCOLLECTION(GEOMETRYCOLLECTION(GEOMETRYCOLLECTION()))')));
+AsText(ST_Centroid(GeomFromText('GEOMETRYCOLLECTION(GEOMETRYCOLLECTION(GEOMETRYCOLLECTION()))')))
+NULL
 SELECT AsText(ST_Centroid(GeomFromText('GEOMETRYCOLLECTION(POINT(10 10),MULTIPOINT(0 0,10 10))')));
 AsText(ST_Centroid(GeomFromText('GEOMETRYCOLLECTION(POINT(10 10),MULTIPOINT(0 0,10 10))')))
 POINT(6.666666666666667 6.666666666666667)
@@ -827,9 +845,25 @@ POINT(3.3333333333333335 6.666666666666667)
 #====================================================================================
 # Invalid function calls
 #====================================================================================
+#---------------------------------------------------------------------------------------
+# Centroid()
+SELECT AsText(Centroid());
+ERROR 42000: Incorrect parameter count in the call to native function 'Centroid'
 SELECT AsText(Centroid(NULL));
 AsText(Centroid(NULL))
 NULL
+SELECT AsText(Centroid(GeomFromText('POINT()')));
+ERROR 22023: Invalid GIS data provided to function st_geometryfromtext.
+SELECT AsText(Centroid(GeomFromText('LINESTRING()')));
+ERROR 22023: Invalid GIS data provided to function st_geometryfromtext.
+SELECT AsText(Centroid(GeomFromText('POLYGON(())')));
+ERROR 22023: Invalid GIS data provided to function st_geometryfromtext.
+SELECT AsText(Centroid(GeomFromText('MULTIPOINT()')));
+ERROR 22023: Invalid GIS data provided to function st_geometryfromtext.
+SELECT AsText(Centroid(GeomFromText('MULTILINESTRING(())')));
+ERROR 22023: Invalid GIS data provided to function st_geometryfromtext.
+SELECT AsText(Centroid(GeomFromText('MULTIPOLYGON((()))')));
+ERROR 22023: Invalid GIS data provided to function st_geometryfromtext.
 SELECT AsText(Centroid(GeomFromText('POINT(a 0)')));
 ERROR 22023: Invalid GIS data provided to function st_geometryfromtext.
 SELECT AsText(Centroid(GeomFromText('POINT(! 0)')));
@@ -860,17 +894,12 @@ SELECT AsText(Centroid(GeomFromText('POLYGON((0 0,5 5))')));
 ERROR 22023: Invalid GIS data provided to function st_centroid.
 SELECT AsText(Centroid(GeomFromText('POLYGON((0 0,5 5,10 10))')));
 ERROR 22023: Invalid GIS data provided to function st_centroid.
+SELECT AsText(Centroid(GeomFromText('POLYGON((0 0,0 5,10 10),(0 0))')));
+ERROR 22023: Invalid GIS data provided to function st_centroid.
 SELECT AsText(Centroid(GeomFromText('MULTIPOLYGON(((0 0,5 5,10 10)),((10 10)))')));
 ERROR 22023: Invalid GIS data provided to function st_centroid.
-SELECT AsText(Centroid(GeomFromText('GEOMETRYCOLLECTION()')));
-AsText(Centroid(GeomFromText('GEOMETRYCOLLECTION()')))
-NULL
-SELECT AsText(Centroid(GeomFromText('GEOMETRYCOLLECTION(GEOMETRYCOLLECTION())')));
-AsText(Centroid(GeomFromText('GEOMETRYCOLLECTION(GEOMETRYCOLLECTION())')))
-NULL
-SELECT AsText(Centroid(GeomFromText('GEOMETRYCOLLECTION(GEOMETRYCOLLECTION(GEOMETRYCOLLECTION()))')));
-AsText(Centroid(GeomFromText('GEOMETRYCOLLECTION(GEOMETRYCOLLECTION(GEOMETRYCOLLECTION()))')))
-NULL
+SELECT AsText(Centroid(GeomFromText('MULTIPOLYGON(((0 0,5 5,10 10)),((10 10))')));
+ERROR 22023: Invalid GIS data provided to function st_geometryfromtext.
 SELECT AsText(Centroid(0x000000000200000000000000000000000000000000));
 ERROR HY000: Geometry byte string must be little endian.
 SELECT AsText(Centroid(0x010100000001000000010100000000000000000000));
@@ -885,9 +914,25 @@ SELECT AsText(Centroid(0x010300000002000000010300000002000000050000));
 ERROR HY000: Geometry byte string must be little endian.
 SELECT AsText(Centroid(0x010400000002000000010100000000000000000000));
 ERROR HY000: Geometry byte string must be little endian.
+#---------------------------------------------------------------------------------------
+# ST_Centroid()
+SELECT AsText(ST_Centroid());
+ERROR 42000: Incorrect parameter count in the call to native function 'ST_Centroid'
 SELECT AsText(ST_Centroid(NULL));
 AsText(ST_Centroid(NULL))
 NULL
+SELECT AsText(ST_Centroid(GeomFromText('POINT()')));
+ERROR 22023: Invalid GIS data provided to function st_geometryfromtext.
+SELECT AsText(ST_Centroid(GeomFromText('LINESTRING()')));
+ERROR 22023: Invalid GIS data provided to function st_geometryfromtext.
+SELECT AsText(ST_Centroid(GeomFromText('POLYGON(())')));
+ERROR 22023: Invalid GIS data provided to function st_geometryfromtext.
+SELECT AsText(ST_Centroid(GeomFromText('MULTIPOINT()')));
+ERROR 22023: Invalid GIS data provided to function st_geometryfromtext.
+SELECT AsText(ST_Centroid(GeomFromText('MULTILINESTRING(())')));
+ERROR 22023: Invalid GIS data provided to function st_geometryfromtext.
+SELECT AsText(ST_Centroid(GeomFromText('MULTIPOLYGON((()))')));
+ERROR 22023: Invalid GIS data provided to function st_geometryfromtext.
 SELECT AsText(ST_Centroid(GeomFromText('POINT(a 0)')));
 ERROR 22023: Invalid GIS data provided to function st_geometryfromtext.
 SELECT AsText(ST_Centroid(GeomFromText('POINT(! 0)')));
@@ -918,17 +963,12 @@ SELECT AsText(ST_Centroid(GeomFromText('POLYGON((0 0,5 5))')));
 ERROR 22023: Invalid GIS data provided to function st_centroid.
 SELECT AsText(ST_Centroid(GeomFromText('POLYGON((0 0,5 5,10 10))')));
 ERROR 22023: Invalid GIS data provided to function st_centroid.
+SELECT AsText(ST_Centroid(GeomFromText('POLYGON((0 0,0 5,10 10),(0 0))')));
+ERROR 22023: Invalid GIS data provided to function st_centroid.
 SELECT AsText(ST_Centroid(GeomFromText('MULTIPOLYGON(((0 0,5 5,10 10)),((10 10)))')));
 ERROR 22023: Invalid GIS data provided to function st_centroid.
-SELECT AsText(ST_Centroid(GeomFromText('GEOMETRYCOLLECTION()')));
-AsText(ST_Centroid(GeomFromText('GEOMETRYCOLLECTION()')))
-NULL
-SELECT AsText(ST_Centroid(GeomFromText('GEOMETRYCOLLECTION(GEOMETRYCOLLECTION())')));
-AsText(ST_Centroid(GeomFromText('GEOMETRYCOLLECTION(GEOMETRYCOLLECTION())')))
-NULL
-SELECT AsText(ST_Centroid(GeomFromText('GEOMETRYCOLLECTION(GEOMETRYCOLLECTION(GEOMETRYCOLLECTION()))')));
-AsText(ST_Centroid(GeomFromText('GEOMETRYCOLLECTION(GEOMETRYCOLLECTION(GEOMETRYCOLLECTION()))')))
-NULL
+SELECT AsText(ST_Centroid(GeomFromText('MULTIPOLYGON(((0 0,5 5,10 10)),((10 10))')));
+ERROR 22023: Invalid GIS data provided to function st_geometryfromtext.
 SELECT AsText(ST_Centroid(0x000000000200000000000000000000000000000000));
 ERROR HY000: Geometry byte string must be little endian.
 SELECT AsText(ST_Centroid(0x010100000001000000010100000000000000000000));
@@ -945,4 +985,3 @@ SELECT AsText(ST_Centroid(0x010400000002000000010100000000000000000000));
 ERROR HY000: Geometry byte string must be little endian.
 #clean up
 DROP TABLE IF EXISTS gis_geometrycollection;
-DROP TABLE IF EXISTS gis_geometrycollection_2;