summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorunknown <holyfoot/hf@mysql.com/hfmain.(none)>2007-11-20 17:04:24 +0400
committerunknown <holyfoot/hf@mysql.com/hfmain.(none)>2007-11-20 17:04:24 +0400
commita8dd1299cc7b1cedd24533a4369970d22a7ba65d (patch)
treea1fa72e764c4e1488698e5b216c4ac7e2d0e98db
parent524e1cd93d1a977004956ce675d01e970e310588 (diff)
downloadmariadb-git-a8dd1299cc7b1cedd24533a4369970d22a7ba65d.tar.gz
test case added for the bug #31155
mysql-test/r/gis.result: test result complete mysql-test/t/gis.test: test case added for the bug
-rw-r--r--mysql-test/r/gis.result6
-rw-r--r--mysql-test/t/gis.test9
2 files changed, 15 insertions, 0 deletions
diff --git a/mysql-test/r/gis.result b/mysql-test/r/gis.result
index 84b7b449cb5..953dd94be7a 100644
--- a/mysql-test/r/gis.result
+++ b/mysql-test/r/gis.result
@@ -957,4 +957,10 @@ COUNT(*)
2
DROP TABLE t1, t2;
End of 5.0 tests
+create table `t1` (`col002` point)engine=myisam;
+insert into t1 values (),(),();
+select min(`col002`) from t1 union select `col002` from t1;
+min(`col002`)
+NULL
+drop table t1;
End of 5.0 tests
diff --git a/mysql-test/t/gis.test b/mysql-test/t/gis.test
index 2520c9c478e..c115396ec03 100644
--- a/mysql-test/t/gis.test
+++ b/mysql-test/t/gis.test
@@ -631,4 +631,13 @@ SELECT 1;
-- source include/gis_keys.inc
+#
+# Bug #31155 gis types in union'd select cause crash
+#
+
+create table `t1` (`col002` point)engine=myisam;
+insert into t1 values (),(),();
+select min(`col002`) from t1 union select `col002` from t1;
+drop table t1;
+
--echo End of 5.0 tests