bk commit into 5.0 tree (holyfoot:1.2573) BUG#31155

[holyfoot]

Below is the list of changes that have just been committed into a local
5.0 repository of hf. When hf does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet@stripped, 2007-11-20 17:04:24+04:00, holyfoot@stripped +2 -0
  test case added for the bug #31155

  mysql-test/r/gis.result@stripped, 2007-11-20 17:04:22+04:00, holyfoot@stripped +6 -0
    test result complete

  mysql-test/t/gis.test@stripped, 2007-11-20 17:04:22+04:00, holyfoot@stripped +9 -0
    test case added for the bug

diff -Nrup a/mysql-test/r/gis.result b/mysql-test/r/gis.result
--- a/mysql-test/r/gis.result	2007-11-17 17:11:04 +04:00
+++ b/mysql-test/r/gis.result	2007-11-20 17:04:22 +04:00
@@ -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 -Nrup a/mysql-test/t/gis.test b/mysql-test/t/gis.test
--- a/mysql-test/t/gis.test	2007-11-17 16:42:36 +04:00
+++ b/mysql-test/t/gis.test	2007-11-20 17:04:22 +04:00
@@ -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