[Commits] Rev 4434: MDEV-7512 GIS: ST_ synonyms for functions are not consistent. in file:///home/hf/wmar/55exp/

holyfoot at askmonty.org holyfoot at askmonty.org
Sun Feb 15 19:28:18 EET 2015


At file:///home/hf/wmar/55exp/

------------------------------------------------------------
revno: 4434
revision-id: holyfoot at askmonty.org-20150215160831-dfnfjccan7bscua3
parent: sergii at pisem.net-20150211140215-e9bb30vxglepyf13
committer: Alexey Botchkov <holyfoot at askmonty.org>
branch nick: 55exp
timestamp: Sun 2015-02-15 20:08:31 +0400
message:
  MDEV-7512 GIS: ST_ synonyms for functions are not consistent.
          ST_MULTIPOLYGONFROMTEXT, ST_MULTIPOINTFROMTEXT, ST_MULTILINESTRINGFROMTEXT added.
-------------- next part --------------
=== modified file 'mysql-test/r/gis.result'
--- a/mysql-test/r/gis.result	2015-02-10 12:16:31 +0000
+++ b/mysql-test/r/gis.result	2015-02-15 16:08:31 +0000
@@ -1610,4 +1610,13 @@ drop table t1;
 SELECT st_astext(ST_Buffer(ST_PolygonFromText('POLYGON((3 5, 2 4, 2 5, 3 5))'), -100));
 st_astext(ST_Buffer(ST_PolygonFromText('POLYGON((3 5, 2 4, 2 5, 3 5))'), -100))
 GEOMETRYCOLLECTION EMPTY
+SELECT st_astext(ST_MultiPointFromText('MULTIPOINT(0 0,10 10,10 20,20 20)'));
+st_astext(ST_MultiPointFromText('MULTIPOINT(0 0,10 10,10 20,20 20)'))
+MULTIPOINT(0 0,10 10,10 20,20 20)
+SELECT st_astext(ST_MultiLineStringFromText('MULTILINESTRING((10 48,10 21,10 0),(16 0,16 23,16 48))'));
+st_astext(ST_MultiLineStringFromText('MULTILINESTRING((10 48,10 21,10 0),(16 0,16 23,16 48))'))
+MULTILINESTRING((10 48,10 21,10 0),(16 0,16 23,16 48))
+SELECT st_astext(ST_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)))'));
+st_astext(ST_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)))'))
+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)))
 End of 5.5 tests

=== modified file 'mysql-test/t/gis.test'
--- a/mysql-test/t/gis.test	2015-02-10 12:16:31 +0000
+++ b/mysql-test/t/gis.test	2015-02-15 16:08:31 +0000
@@ -1470,4 +1470,11 @@ drop table t1;
 #
 SELECT st_astext(ST_Buffer(ST_PolygonFromText('POLYGON((3 5, 2 4, 2 5, 3 5))'), -100));
 
+#
+# MDEV-7512 GIS: ST_ synonyms for functions are not consistent.
+#
+SELECT st_astext(ST_MultiPointFromText('MULTIPOINT(0 0,10 10,10 20,20 20)'));
+SELECT st_astext(ST_MultiLineStringFromText('MULTILINESTRING((10 48,10 21,10 0),(16 0,16 23,16 48))'));
+SELECT st_astext(ST_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)))'));
+
 --echo End of 5.5 tests

=== modified file 'sql/item_create.cc'
--- a/sql/item_create.cc	2013-03-27 09:03:28 +0000
+++ b/sql/item_create.cc	2015-02-15 16:08:31 +0000
@@ -5439,6 +5439,12 @@ static Native_func_registry func_array[]
   { { C_STRING_WITH_LEN("ST_LINEFROMWKB") }, GEOM_BUILDER(Create_func_geometry_from_wkb)},
   { { C_STRING_WITH_LEN("ST_LINESTRINGFROMTEXT") }, GEOM_BUILDER(Create_func_geometry_from_text)},
   { { C_STRING_WITH_LEN("ST_LINESTRINGFROMWKB") }, GEOM_BUILDER(Create_func_geometry_from_wkb)},
+  { { C_STRING_WITH_LEN("ST_MULTILINESTRINGFROMTEXT") }, GEOM_BUILDER(Create_func_geometry_from_text)},
+  { { C_STRING_WITH_LEN("ST_MULTILINESTRINGFROMWKB") }, GEOM_BUILDER(Create_func_geometry_from_wkb)},
+  { { C_STRING_WITH_LEN("ST_MULTIPOINTFROMTEXT") }, GEOM_BUILDER(Create_func_geometry_from_text)},
+  { { C_STRING_WITH_LEN("ST_MULTIPOINTFROMWKB") }, GEOM_BUILDER(Create_func_geometry_from_wkb)},
+  { { C_STRING_WITH_LEN("ST_MULTIPOLYGONFROMTEXT") }, GEOM_BUILDER(Create_func_geometry_from_text)},
+  { { C_STRING_WITH_LEN("ST_MULTIPOLYGONFROMWKB") }, GEOM_BUILDER(Create_func_geometry_from_wkb)},
   { { C_STRING_WITH_LEN("ST_NUMGEOMETRIES") }, GEOM_BUILDER(Create_func_numgeometries)},
   { { C_STRING_WITH_LEN("ST_NUMINTERIORRINGS") }, GEOM_BUILDER(Create_func_numinteriorring)},
   { { C_STRING_WITH_LEN("ST_NUMPOINTS") }, GEOM_BUILDER(Create_func_numpoints)},



More information about the commits mailing list