diff options
| author | Alexey Botchkov <holyfoot@askmonty.org> | 2019-04-22 23:28:44 +0400 |
|---|---|---|
| committer | Alexey Botchkov <holyfoot@askmonty.org> | 2019-04-22 23:28:44 +0400 |
| commit | a4f7d859322ab771289abf13f50752266af43187 (patch) | |
| tree | ca6c122275d10c7346ab0960245ee238d62eb2c0 /mysql-test | |
| parent | 6c5e4c9bc0d9ac30f7ec7ee334630bacb58687ba (diff) | |
| download | mariadb-git-a4f7d859322ab771289abf13f50752266af43187.tar.gz | |
MDEV-18920 Prepared statements with st_convexhull hang and eat 100% cpu.
In the case of error when object shapes are half-collected we need
to set the NULL at the vertice's list.
Diffstat (limited to 'mysql-test')
| -rw-r--r-- | mysql-test/r/gis-precise.result | 4 | ||||
| -rw-r--r-- | mysql-test/t/gis-precise.test | 6 |
2 files changed, 10 insertions, 0 deletions
diff --git a/mysql-test/r/gis-precise.result b/mysql-test/r/gis-precise.result index 89e5c237413..76f72bb8102 100644 --- a/mysql-test/r/gis-precise.result +++ b/mysql-test/r/gis-precise.result @@ -505,6 +505,10 @@ GEOMETRYFROMTEXT('POINT(4599 60359)'), ) as relate_res; relate_res 0 +prepare s from 'do st_convexhull(st_aswkb(multipoint(point(-11702,15179),point(-5031,27960),point(-30557,11158),point(-27804,30314))))'; +execute s; +execute s; +deallocate prepare s; DROP TABLE IF EXISTS p1; CREATE PROCEDURE p1(dist DOUBLE, geom TEXT) BEGIN diff --git a/mysql-test/t/gis-precise.test b/mysql-test/t/gis-precise.test index 7391b2114f3..7626da650b4 100644 --- a/mysql-test/t/gis-precise.test +++ b/mysql-test/t/gis-precise.test @@ -381,5 +381,11 @@ SELECT ST_RELATE( 'F*FFFF**F' ) as relate_res; +# MDEV-18920 Prepared statements with st_convexhull hang and eat 100% cpu. +prepare s from 'do st_convexhull(st_aswkb(multipoint(point(-11702,15179),point(-5031,27960),point(-30557,11158),point(-27804,30314))))'; +execute s; +execute s; +deallocate prepare s; + --source include/gis_debug.inc |