summaryrefslogtreecommitdiff
path: root/mysql-test
diff options
context:
space:
mode:
authorunknown <holyfoot/hf@hfmain.(none)>2007-11-20 17:04:42 +0400
committerunknown <holyfoot/hf@hfmain.(none)>2007-11-20 17:04:42 +0400
commit86744a32d659463c5cc0b56537c23efe14c480b5 (patch)
tree76716816eaea76ab36dd2f50c863a522b696efe3 /mysql-test
parent39da7c8ada8599b217b18f3f61ab5f51f1a59e71 (diff)
parenta8dd1299cc7b1cedd24533a4369970d22a7ba65d (diff)
downloadmariadb-git-86744a32d659463c5cc0b56537c23efe14c480b5.tar.gz
Merge bk@192.168.21.1:mysql-5.0-opt
into mysql.com:/home/hf/work/mysql-5.0-opt
Diffstat (limited to 'mysql-test')
-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