summaryrefslogtreecommitdiff
path: root/mysql-test
diff options
context:
space:
mode:
authorAlexey Botchkov <holyfoot@mysql.com>2011-01-12 17:11:31 +0400
committerAlexey Botchkov <holyfoot@mysql.com>2011-01-12 17:11:31 +0400
commit75c2a822b8d71e827be8e507c27250a08820000c (patch)
treeb3f6f73d2fda09077ee0c3be8e18edb80288c706 /mysql-test
parent7aa999607a5ed0dcf6c93bf511b858afa4563297 (diff)
parent33c78e328f4d8238b7b53c246e28bb44a97ee3c0 (diff)
downloadmariadb-git-75c2a822b8d71e827be8e507c27250a08820000c.tar.gz
merging.
Diffstat (limited to 'mysql-test')
-rw-r--r--mysql-test/r/gis.result8
-rw-r--r--mysql-test/t/gis.test10
2 files changed, 18 insertions, 0 deletions
diff --git a/mysql-test/r/gis.result b/mysql-test/r/gis.result
index 5663f167d00..7939d01beff 100644
--- a/mysql-test/r/gis.result
+++ b/mysql-test/r/gis.result
@@ -1014,6 +1014,14 @@ SET @a=0x00000000030000000100000000000000000000000000144000000000000014400000000
SET @a=POLYFROMWKB(@a);
SET @a=0x00000000030000000000000000000000000000000000144000000000000014400000000000001840000000000000184000000000000014400000000000001440;
SET @a=POLYFROMWKB(@a);
+create table t1(a polygon NOT NULL)engine=myisam;
+insert into t1 values (geomfromtext("point(0 1)"));
+insert into t1 values (geomfromtext("point(1 0)"));
+select * from (select polygon(t1.a) as p from t1 order by t1.a) d;
+p
+NULL
+NULL
+drop table t1;
End of 5.1 tests
CREATE TABLE t1(
col0 BINARY NOT NULL,
diff --git a/mysql-test/t/gis.test b/mysql-test/t/gis.test
index 4aad3f80b68..6c0fdda1cea 100644
--- a/mysql-test/t/gis.test
+++ b/mysql-test/t/gis.test
@@ -747,6 +747,16 @@ SET @a=0x00000000030000000000000000000000000000000000144000000000000014400000000
SET @a=POLYFROMWKB(@a);
+#
+# Bug #57321 crashes and valgrind errors from spatial types
+#
+
+create table t1(a polygon NOT NULL)engine=myisam;
+insert into t1 values (geomfromtext("point(0 1)"));
+insert into t1 values (geomfromtext("point(1 0)"));
+select * from (select polygon(t1.a) as p from t1 order by t1.a) d;
+drop table t1;
+
--echo End of 5.1 tests
#