Hi Alexey, I just checked 5.6 and 10.0-base, this test is passing as is. I'm a bit worried that something functional was broken during the merge. Regards, Sergey 26.07.2013, в 16:13, <holyfoot@askmonty.org> написал(а):

At file:///home/hf/wmar/10.0-serg/

------------------------------------------------------------ revno: 3792 revision-id: holyfoot@askmonty.org-20130726110356-9s17c1kw558ls14a parent: svoj@mariadb.org-20130726091143-o2v0tt08n81n923m committer: Alexey Botchkov <holyfoot@askmonty.org> branch nick: 10.0-serg timestamp: Fri 2013-07-26 16:03:56 +0500 message: main.gis test fixed. === modified file 'mysql-test/r/gis.result' --- a/mysql-test/r/gis.result 2013-03-27 09:03:28 +0000 +++ b/mysql-test/r/gis.result 2013-07-26 11:03:56 +0000 @@ -918,25 +918,25 @@ SELECT Overlaps(@horiz1, @point2) FROM D Overlaps(@horiz1, @point2) 0 DROP TABLE t1; -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; f1 -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; AsText(f2) AsText(f3) -POINT(1 1) LINESTRING(0 0,1 1,2 2) +LINESTRING(1 1,2 2) LINESTRING(0 0,1 1,2 2) select AsText(a) from (select f2 as a from t1 union select f3 from t1) t; AsText(a) -POINT(1 1) +LINESTRING(1 1,2 2) LINESTRING(0 0,1 1,2 2) create table t2 as select f2 as a from t1 union select f3 from t1; desc t2; Field Type Null Key Default Extra -a point YES NULL +a linestring YES NULL select AsText(a) from t2; AsText(a) -POINT(1 1) +LINESTRING(1 1,2 2) LINESTRING(0 0,1 1,2 2) drop table t1, t2; SELECT 1;

=== modified file 'mysql-test/t/gis.test' --- a/mysql-test/t/gis.test 2013-03-27 09:03:28 +0000 +++ b/mysql-test/t/gis.test 2013-07-26 11:03:56 +0000 @@ -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;

_______________________________________________ commits mailing list commits@mariadb.org https://lists.askmonty.org/cgi-bin/mailman/listinfo/commits