summaryrefslogtreecommitdiff
path: root/mysql-test/main
diff options
context:
space:
mode:
authorSergei Golubchik <serg@mariadb.org>2022-10-25 21:21:19 +0200
committerSergei Golubchik <serg@mariadb.org>2022-10-25 21:26:51 +0200
commite910dff81ebaa84d0028705d20a40abe8f779afd (patch)
tree1994f98b7073fd20a7ac5b5df6454fdf3b9b9cd6 /mysql-test/main
parent72e79eaaf3e4619bbaf900f6710ffb6a00ff95bf (diff)
downloadmariadb-git-e910dff81ebaa84d0028705d20a40abe8f779afd.tar.gz
MDEV-26161 crash in Gis_point::calculate_haversine
return an error on invalid gis data
Diffstat (limited to 'mysql-test/main')
-rw-r--r--mysql-test/main/gis.result5
-rw-r--r--mysql-test/main/gis.test5
2 files changed, 10 insertions, 0 deletions
diff --git a/mysql-test/main/gis.result b/mysql-test/main/gis.result
index bfe1d3f40a5..3d8c64b0ce8 100644
--- a/mysql-test/main/gis.result
+++ b/mysql-test/main/gis.result
@@ -4977,5 +4977,10 @@ ERROR HY000: Illegal parameter data type geometry for operation 'is_free_lock'
SELECT IS_USED_LOCK(POINT(1,1));
ERROR HY000: Illegal parameter data type geometry for operation 'is_used_lock'
#
+# MDEV-26161 crash in Gis_point::calculate_haversine
+#
+select st_distance_sphere(x'01030000000400000004000000000000', multipoint(point(124,204)), 10);
+ERROR 22003: Cannot get geometry object from data you send to the GEOMETRY field
+#
# End of 10.3 tests
#
diff --git a/mysql-test/main/gis.test b/mysql-test/main/gis.test
index c7bdb366124..1d202e9be08 100644
--- a/mysql-test/main/gis.test
+++ b/mysql-test/main/gis.test
@@ -3090,6 +3090,11 @@ SELECT IS_FREE_LOCK(POINT(1,1));
--error ER_ILLEGAL_PARAMETER_DATA_TYPE_FOR_OPERATION
SELECT IS_USED_LOCK(POINT(1,1));
+--echo #
+--echo # MDEV-26161 crash in Gis_point::calculate_haversine
+--echo #
+--error ER_CANT_CREATE_GEOMETRY_OBJECT
+select st_distance_sphere(x'01030000000400000004000000000000', multipoint(point(124,204)), 10);
--echo #
--echo # End of 10.3 tests