summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOleksandr Byelkin <sanja@mariadb.com>2022-12-06 10:22:06 +0100
committerOleksandr Byelkin <sanja@mariadb.com>2022-12-06 10:22:06 +0100
commit6ff49e48e4fd4777c5d663f40b19a1fd42df9cb6 (patch)
treee784bfaffb2b5b36569e6d8ac82956cc2a72b22d
parent92ff948d021ab706a1d534b186bec1a8f8263966 (diff)
downloadmariadb-git-bb-10.3-MDEV-29231.tar.gz
MDEV-26161: fix of view protocolbb-10.3-MDEV-29231
-rw-r--r--mysql-test/main/gis.result6
-rw-r--r--mysql-test/main/gis.test6
2 files changed, 6 insertions, 6 deletions
diff --git a/mysql-test/main/gis.result b/mysql-test/main/gis.result
index 358be520b06..37613bc71a0 100644
--- a/mysql-test/main/gis.result
+++ b/mysql-test/main/gis.result
@@ -4980,11 +4980,11 @@ 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
+Got one of the listed errors
select st_distance_sphere(x'010300000004000000040000', multipoint(point(124,204)), 10);
-ERROR 22003: Cannot get geometry object from data you send to the GEOMETRY field
+Got one of the listed errors
select st_distance_sphere(x'010300000001000000040000', multipoint(point(124,204)), 10);
-ERROR 22003: Cannot get geometry object from data you send to the GEOMETRY field
+Got one of the listed errors
#
# End of 10.3 tests
#
diff --git a/mysql-test/main/gis.test b/mysql-test/main/gis.test
index 716fab9bfeb..07b207dcdc9 100644
--- a/mysql-test/main/gis.test
+++ b/mysql-test/main/gis.test
@@ -3093,11 +3093,11 @@ SELECT IS_USED_LOCK(POINT(1,1));
--echo #
--echo # MDEV-26161 crash in Gis_point::calculate_haversine
--echo #
---error ER_CANT_CREATE_GEOMETRY_OBJECT
+--error ER_CANT_CREATE_GEOMETRY_OBJECT,ER_INTERNAL_ERROR
select st_distance_sphere(x'01030000000400000004000000000000', multipoint(point(124,204)), 10);
---error ER_CANT_CREATE_GEOMETRY_OBJECT
+--error ER_CANT_CREATE_GEOMETRY_OBJECT,ER_INTERNAL_ERROR
select st_distance_sphere(x'010300000004000000040000', multipoint(point(124,204)), 10);
---error ER_CANT_CREATE_GEOMETRY_OBJECT
+--error ER_CANT_CREATE_GEOMETRY_OBJECT,ER_INTERNAL_ERROR
select st_distance_sphere(x'010300000001000000040000', multipoint(point(124,204)), 10);
--echo #