diff options
| author | unknown <ram@mysql.r18.ru> | 2003-03-18 15:30:32 +0400 |
|---|---|---|
| committer | unknown <ram@mysql.r18.ru> | 2003-03-18 15:30:32 +0400 |
| commit | 3ccd93c704556d9496b643e580dca8a9fcd2f4d4 (patch) | |
| tree | 0e83c851e37727716fb38186353324ae67952771 /mysql-test/r/gis.result | |
| parent | 1c1f407dd33951d44b4e2eaa30d4025998514e47 (diff) | |
| download | mariadb-git-3ccd93c704556d9496b643e580dca8a9fcd2f4d4.tar.gz | |
SRID support.
GeomertyFromWKB() function.
SRID() function.
::store() methods for Field_geom.
Code cleanup.
myisam/sp_key.c:
SRID support.
mysql-test/r/gis.result:
We should use GeometryFromWKB().
mysql-test/t/gis.test:
We should use GeometryFromWKB().
sql/field.cc:
SRID support.
::store() methods for Field_geom.
Code cleanup.
sql/field.h:
SRID support.
::store() methods for Field_geom.
Code cleanup.
sql/item_cmpfunc.cc:
SRID support.
Code cleanup.
sql/item_create.cc:
Code cleanup.
sql/item_create.h:
Code cleanup.
sql/item_func.cc:
SRID support.
Code cleanup.
sql/item_func.h:
SRID support.
sql/item_strfunc.cc:
SRID support.
GeometryFromWKB() function.
Code cleanup.
sql/item_strfunc.h:
SRID support.
GeometryFromWKB() function.
Code cleanup.
sql/lex.h:
GeometryFromWKB() function.
SRID() function.
sql/spatial.cc:
Code cleanup.
sql/spatial.h:
Code cleanup.
sql/sql_yacc.yy:
Fix for xxxFromText() functions.
GeometryFromWKB() function.
Diffstat (limited to 'mysql-test/r/gis.result')
| -rw-r--r-- | mysql-test/r/gis.result | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/mysql-test/r/gis.result b/mysql-test/r/gis.result index 25c3d14212b..9118fa8cfed 100644 --- a/mysql-test/r/gis.result +++ b/mysql-test/r/gis.result @@ -15,26 +15,26 @@ INSERT INTO pt VALUES INSERT INTO ls VALUES (105, LineFromText('LINESTRING(0 0,0 10,10 0)')), (106, LineStringFromText('LINESTRING(10 10,20 10,20 20,10 20,10 10)')), -(107, LineString(Point(10, 10), Point(40, 10))); +(107, GeometryFromWKB(LineString(Point(10, 10), Point(40, 10)))); INSERT INTO p VALUES (108, PolygonFromText('POLYGON((10 10,20 10,20 20,10 20,10 10))')), (109, PolyFromText('POLYGON((0 0,50 0,50 50,0 50,0 0), (10 10,20 10,20 20,10 20,10 10))')), -(110, Polygon(LineString(Point(0, 0), Point(30, 0), Point(30, 30), Point(0, 0)))); +(110, GeometryFromWKB(Polygon(LineString(Point(0, 0), Point(30, 0), Point(30, 30), Point(0, 0))))); INSERT INTO mpt VALUES (111, MultiPointFromText('MULTIPOINT(0 0,10 10,10 20,20 20)')), (112, MPointFromText('MULTIPOINT(1 1,11 11,11 21,21 21)')), -(113, MultiPoint(Point(3, 6), Point(4, 10))); +(113, GeometryFromWKB(MultiPoint(Point(3, 6), Point(4, 10)))); INSERT INTO mls VALUES (114, MultiLineStringFromText('MULTILINESTRING((10 48,10 21,10 0),(16 0,16 23,16 48))')), (115, MLineFromText('MULTILINESTRING((10 48,10 21,10 0))')), -(116, MultiLineString(LineString(Point(1, 2), Point(3, 5)), LineString(Point(2, 5), Point(5, 8), Point(21, 7)))); +(116, GeometryFromWKB(MultiLineString(LineString(Point(1, 2), Point(3, 5)), LineString(Point(2, 5), Point(5, 8), Point(21, 7))))); INSERT INTO mp VALUES (117, MultiPolygonFromText('MULTIPOLYGON(((28 26,28 0,84 0,84 42,28 26),(52 18,66 23,73 9,48 6,52 18)),((59 18,67 18,67 13,59 13,59 18)))')), (118, MPolyFromText('MULTIPOLYGON(((28 26,28 0,84 0,84 42,28 26),(52 18,66 23,73 9,48 6,52 18)),((59 18,67 18,67 13,59 13,59 18)))')), -(119, MultiPolygon(Polygon(LineString(Point(0, 3), Point(3, 3), Point(3, 0), Point(0, 3))))); +(119, GeometryFromWKB(MultiPolygon(Polygon(LineString(Point(0, 3), Point(3, 3), Point(3, 0), Point(0, 3)))))); INSERT INTO gc VALUES (120, GeomCollFromText('GEOMETRYCOLLECTION(POINT(0 0), LINESTRING(0 0,10 10))')), -(121, GeometryCollection(Point(44, 6), LineString(Point(3, 6), Point(7, 9)))); +(121, GeometryFromWKB(GeometryCollection(Point(44, 6), LineString(Point(3, 6), Point(7, 9))))); INSERT into geo SELECT * FROM pt; INSERT into geo SELECT * FROM ls; INSERT into geo SELECT * FROM p; |