Commit 7ab844c9 authored by holyfoot/hf@hfmain.(none)'s avatar holyfoot/hf@hfmain.(none)
Browse files

Merge bk@192.168.21.1:mysql-5.0-opt 

into  mysql.com:/home/hf/work/mysql-5.0-opt
parents 93023d31 f434cb60

mysql-test/r/gis.result

+6 −0
Original line number Diff line number Diff line
@@ -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

mysql-test/t/gis.test

+9 −0
Original line number Diff line number Diff line
@@ -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