diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2020-04-25 21:57:52 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2020-04-25 21:57:52 +0300 |
| commit | fbe2712705d464bf8488df249c36115e2c1f63f7 (patch) | |
| tree | 274e728c719611769288afcb10f79549f6e11f8c /mysql-test/main/gis.test | |
| parent | 62903434eb009cb0bcd5003b0a45914bd4c09886 (diff) | |
| parent | a19782522b1eac52d72f5e787b5d96f1fd1a2cb7 (diff) | |
| download | mariadb-git-fbe2712705d464bf8488df249c36115e2c1f63f7.tar.gz | |
Merge 10.4 into 10.5
The functional changes of commit 5836191c8f0658d5d75484766fdcc3d838b0a5c1
(MDEV-21168) are omitted due to MDEV-742 having addressed the issue.
Diffstat (limited to 'mysql-test/main/gis.test')
| -rw-r--r-- | mysql-test/main/gis.test | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/mysql-test/main/gis.test b/mysql-test/main/gis.test index 3249b2579d3..c18966bc0fb 100644 --- a/mysql-test/main/gis.test +++ b/mysql-test/main/gis.test @@ -1796,6 +1796,14 @@ select st_astext(p) from t1; drop table t1; --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 # |