Bug#21651588 VIEW RETURNS ERROR WITH ST_CONVEXHULL() FUNCTION

Issue:
The function name of ST_ConvexHull was wrongly written so it could not be found.

Fix:
Fix the function name. Also fix another function name ST_SRID(), it should be
"ST_SRID" because "SRID()" is deprecated now.

Author: david-zhao

mysql-test/r/gis-precise.result

@@ -747,7 +747,7 @@ POLYGON((0 0,30 0,30 30,0 30,0 0))
 select ST_astext(ST_centroid(ST_PolyFromWKB(ST_AsWKB(Polygon(LineString(Point(0, 0), Point(30, 0), Point(30, 30), Point(1, 0), Point(0, 0)))))));
 ERROR 22023: Invalid GIS data provided to function st_centroid.
 select ST_astext(ST_convexhull(ST_PolyFromWKB(ST_AsWKB(Polygon(LineString(Point(0, 0), Point(30, 0), Point(30, 30), Point(1, 0), Point(0, 0)))))));
-ERROR 22023: Invalid GIS data provided to function st_convex_hull.
+ERROR 22023: Invalid GIS data provided to function st_convexhull.
 SELECT ST_AsText(ST_Centroid(ST_GeomFromText('GEOMETRYCOLLECTION(POINT(10 10),MULTIPOINT(0 0,10 10))')));
 ST_AsText(ST_Centroid(ST_GeomFromText('GEOMETRYCOLLECTION(POINT(10 10),MULTIPOINT(0 0,10 10))')))
 POINT(6.666666666666667 6.666666666666667)
@@ -795,9 +795,9 @@ SELECT ST_AsText(ST_Convexhull(ST_GeomFromText('multilinestring((0 0, 1 1, 2 2),
 ST_AsText(ST_Convexhull(ST_GeomFromText('multilinestring((0 0, 1 1, 2 2), (3 3, 4 4, 5 5))')))
 LINESTRING(0 0,5 5)
 SELECT ST_AsText(ST_Convexhull(ST_GeomFromText('polygon((0 0, 1 1, 2 2, 0 0), (3 3, 4 4, 5 5, 3 3))')));
-ERROR 22023: Invalid GIS data provided to function st_convex_hull.
+ERROR 22023: Invalid GIS data provided to function st_convexhull.
 SELECT ST_AsText(ST_Convexhull(ST_GeomFromText('multipolygon(((0 0, 1 1, 2 2, 0 0), (3 3, 4 4, 5 5, 3 3)), ((0 0, 1 0, 1 1, 0 1, 0 0)))')));
-ERROR 22023: Invalid GIS data provided to function st_convex_hull.
+ERROR 22023: Invalid GIS data provided to function st_convexhull.
 SELECT ST_AsText(ST_Convexhull(ST_GeomFromText('geometrycollection(polygon((0 0, 3 0, 3 3, 0 3, 0 0), (1 1, 2 1, 2 2, 1 2, 1 1)), polygon((0 0, 1 0, 1 1, 0 1, 0 0)))')));
 ST_AsText(ST_Convexhull(ST_GeomFromText('geometrycollection(polygon((0 0, 3 0, 3 3, 0 3, 0 0), (1 1, 2 1, 2 2, 1 2, 1 1)), polygon((0 0, 1 0, 1 1, 0 1, 0 0)))')))
 POLYGON((0 0,3 0,3 3,0 3,0 0))

mysql-test/r/gis.result

@@ -465,7 +465,7 @@ id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered
 1	SIMPLE	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	No tables used
 Warnings:
 Warning	1681	'EXTENDED' is deprecated and will be removed in a future release.
-Note	1003	/* select#1 */ select srid(st_geometryfromtext('LineString(1 1,2 2)',101)) AS `ST_SRID(ST_GeomFromText('LineString(1 1,2 2)',101))`
+Note	1003	/* select#1 */ select st_srid(st_geometryfromtext('LineString(1 1,2 2)',101)) AS `ST_SRID(ST_GeomFromText('LineString(1 1,2 2)',101))`
 explain extended select ST_issimple(MultiPoint(Point(3, 6), Point(4, 10))), ST_issimple(Point(3, 6));
 id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
 1	SIMPLE	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	No tables used
@@ -2254,3 +2254,21 @@ ST_GEOMFROMTEXT(
   )
 )
 1
+#
+# Bug#21651588 VIEW RETURNS ERROR WITH ST_CONVEXHULL() FUNCTION
+#
+SELECT ST_ASTEXT(ST_CONVEXHULL(ST_GEOMFROMTEXT('LINESTRING(0 0, 5 5)'))) as result;
+result
+LINESTRING(0 0,5 5)
+CREATE VIEW v1 AS SELECT
+ST_ASTEXT(ST_CONVEXHULL(ST_GEOMFROMTEXT('LINESTRING(0 0, 5 5)')));
+CREATE VIEW v2 AS SELECT
+ST_SRID(ST_CONVEXHULL(ST_GEOMFROMTEXT('LINESTRING(0 0, 5 5)')));
+SELECT * FROM v1;
+Name_exp_1
+LINESTRING(0 0,5 5)
+SELECT * FROM v2;
+ST_SRID(ST_CONVEXHULL(ST_GEOMFROMTEXT('LINESTRING(0 0, 5 5)')))
+0
+DROP VIEW v1;
+DROP VIEW v2;

mysql-test/suite/innodb_gis/r/1.result

@@ -463,7 +463,7 @@ id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered
 1	SIMPLE	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	No tables used
 Warnings:
 Warning	1681	'EXTENDED' is deprecated and will be removed in a future release.
-Note	1003	/* select#1 */ select srid(st_geometryfromtext('LineString(1 1,2 2)',101)) AS `ST_SRID(ST_GeomFromText('LineString(1 1,2 2)',101))`
+Note	1003	/* select#1 */ select st_srid(st_geometryfromtext('LineString(1 1,2 2)',101)) AS `ST_SRID(ST_GeomFromText('LineString(1 1,2 2)',101))`
 explain extended select ST_issimple(MultiPoint(Point(3, 6), Point(4, 10))), ST_issimple(Point(3, 6));
 id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
 1	SIMPLE	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	No tables used

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

@@ -463,7 +463,7 @@ id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered
 1	SIMPLE	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	No tables used
 Warnings:
 Warning	1681	'EXTENDED' is deprecated and will be removed in a future release.
-Note	1003	/* select#1 */ select srid(st_geometryfromtext('LineString(1 1,2 2)',101)) AS `ST_SRID(ST_GeomFromText('LineString(1 1,2 2)',101))`
+Note	1003	/* select#1 */ select st_srid(st_geometryfromtext('LineString(1 1,2 2)',101)) AS `ST_SRID(ST_GeomFromText('LineString(1 1,2 2)',101))`
 explain extended select ST_issimple(MultiPoint(Point(3, 6), Point(4, 10))), ST_issimple(Point(3, 6));
 id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
 1	SIMPLE	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	No tables used

mysql-test/t/gis.test

@@ -2281,3 +2281,17 @@ SELECT ST_NUMINTERIORRING(
     'POLYGON((0 0, 1 0, 1 1, 0 0),(0.1 0.1, 0.9 0.8, 0.9 0.1, 0.1 0.1))'
   )
 );
+
+
+--echo #
+--echo # Bug#21651588 VIEW RETURNS ERROR WITH ST_CONVEXHULL() FUNCTION
+--echo #
+SELECT ST_ASTEXT(ST_CONVEXHULL(ST_GEOMFROMTEXT('LINESTRING(0 0, 5 5)'))) as result;
+CREATE VIEW v1 AS SELECT
+ST_ASTEXT(ST_CONVEXHULL(ST_GEOMFROMTEXT('LINESTRING(0 0, 5 5)')));
+CREATE VIEW v2 AS SELECT
+ST_SRID(ST_CONVEXHULL(ST_GEOMFROMTEXT('LINESTRING(0 0, 5 5)')));
+SELECT * FROM v1;
+SELECT * FROM v2;
+DROP VIEW v1;
+DROP VIEW v2;

sql/item_geofunc.h

@@ -461,7 +461,7 @@ class Item_func_convex_hull: public Item_geometry_func
   bool bg_convex_hull(const Geometry *geom, String *wkb);
 public:
   Item_func_convex_hull(const POS &pos, Item *a): Item_geometry_func(pos, a) {}
-  const char *func_name() const { return "st_convex_hull"; }
+  const char *func_name() const { return "st_convexhull"; }
   String *val_str(String *);
   Field::geometry_type get_geometry_type() const;
 };
@@ -1102,7 +1102,7 @@ class Item_func_srid: public Item_int_func
 public:
   Item_func_srid(const POS &pos, Item *a): Item_int_func(pos, a) {}
   longlong val_int();
-  const char *func_name() const { return "srid"; }
+  const char *func_name() const { return "st_srid"; }
   void fix_length_and_dec() { max_length= 10; maybe_null= 1; }
 };