summaryrefslogtreecommitdiff
path: root/mysql-test
diff options
context:
space:
mode:
authorMonty <monty@mariadb.org>2020-04-18 00:22:52 +0300
committerMonty <monty@mariadb.org>2020-04-18 11:51:42 +0300
commit48eda61cd41725498908308e0004897f10dd7307 (patch)
tree4e3bacc7c06af093b67f502077b60b052c27cc64 /mysql-test
parenta6d32976aee8e77caae66e1592011df248c7ffbb (diff)
downloadmariadb-git-48eda61cd41725498908308e0004897f10dd7307.tar.gz
Fixed memory leak with DEFAULT(f) on Geometry field
MDEV-21056 Assertion `global_status_var.global_memory_used == 0' failed upon shutdown after query with DEFAULT on a geometry field
Diffstat (limited to 'mysql-test')
-rw-r--r--mysql-test/r/gis.result7
-rw-r--r--mysql-test/t/gis.test8
2 files changed, 15 insertions, 0 deletions
diff --git a/mysql-test/r/gis.result b/mysql-test/r/gis.result
index ecbdd5b586c..48618a7c2d8 100644
--- a/mysql-test/r/gis.result
+++ b/mysql-test/r/gis.result
@@ -2283,5 +2283,12 @@ ERROR 22003: Cannot get geometry object from data you send to the GEOMETRY field
drop table t1;
SET timestamp=default;
#
+# MDEV-21056 Memory leak after query with DEFAULT on a geometry field
+#
+CREATE TABLE t1 (f POINT DEFAULT ST_GEOMFROMTEXT('Point(0 0)'));
+SELECT ST_GEOMFROMTEXT('Point(1 1)') IN ( DEFAULT( `f` ), ST_GEOMFROMTEXT('Point(2 2)') ) AS x FROM t1;
+x
+DROP TABLE t1;
+#
# End of 10.2 tests
#
diff --git a/mysql-test/t/gis.test b/mysql-test/t/gis.test
index f630a6dc8bf..d1dff584c8f 100644
--- a/mysql-test/t/gis.test
+++ b/mysql-test/t/gis.test
@@ -1806,5 +1806,13 @@ drop table t1;
SET timestamp=default;
--echo #
+--echo # MDEV-21056 Memory leak after query with DEFAULT on a geometry field
+--echo #
+
+CREATE TABLE t1 (f POINT DEFAULT ST_GEOMFROMTEXT('Point(0 0)'));
+SELECT ST_GEOMFROMTEXT('Point(1 1)') IN ( DEFAULT( `f` ), ST_GEOMFROMTEXT('Point(2 2)') ) AS x FROM t1;
+DROP TABLE t1;
+
+--echo #
--echo # End of 10.2 tests
--echo #