diff options
| author | Sergey Petrunya <psergey@askmonty.org> | 2013-08-07 17:21:37 +0400 |
|---|---|---|
| committer | Sergey Petrunya <psergey@askmonty.org> | 2013-08-07 17:21:37 +0400 |
| commit | a3d79f2e58562c7b50d50827a0149234c225ea43 (patch) | |
| tree | c266edef9eaf41a612e77972163d3d8eb0d280ba /mysql-test/t/gis.test | |
| parent | 8e36dde7e1f149d8973fe14d8288e678d1ba9b61 (diff) | |
| parent | a765e035a0c40ee04df42fba5c02484e83d31483 (diff) | |
| download | mariadb-git-a3d79f2e58562c7b50d50827a0149234c225ea43.tar.gz | |
Merge 10.0-serg -> 10.0
Diffstat (limited to 'mysql-test/t/gis.test')
| -rw-r--r-- | mysql-test/t/gis.test | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mysql-test/t/gis.test b/mysql-test/t/gis.test index cff93fc13ee..c1153d5071d 100644 --- a/mysql-test/t/gis.test +++ b/mysql-test/t/gis.test @@ -609,9 +609,9 @@ DROP TABLE t1; # # Bug#28763: Selecting geometry fields in UNION caused server crash. # -create table t1(f1 geometry, f2 point, f3 linestring); +create table t1(f1 geometry, f2 linestring, f3 linestring); select f1 from t1 union select f1 from t1; -insert into t1 (f2,f3) values (GeomFromText('POINT(1 1)'), +insert into t1 (f2,f3) values (GeomFromText('LINESTRING(1 1, 2 2)'), GeomFromText('LINESTRING(0 0,1 1,2 2)')); select AsText(f2),AsText(f3) from t1; select AsText(a) from (select f2 as a from t1 union select f3 from t1) t; |