Merge sinisa@work.mysql.com:/home/bk/mysql-4.1

into sinisa.nasamreza.org:/mnt/work/mysql-4.1

Docs/gis.txt

@@ -496,18 +496,28 @@ built GEOMETRY value.
     * |*LineFromText(lineStringTaggedText String [,SRID
       Integer]):LineString *| - constructs a LineString
 
+      . |*LineStringFromText()*| - synonym for LineFromText().
+
     * |*PolyFromText(polygonTaggedText String [,SRID Integer]):Polygon
       *|- constructs a Polygon
 
+      |*PolygonFromText()*| - synonym for PolyFromText().
+
     * |*MPointFromText(multiPointTaggedText String [,SRID
       Integer]):MultiPoint *| - constructs a MultiPoint
 
+      |*MultiPointFromText()*| - synonym for MPointFromText().
+
     * |*MLineFromText(multiLineStringTaggedText String [,SRID
       Integer]):MultiLineString *| - constructs a MultiLineString
 
+      |*MultiLineStringFromText()*| - synonym for MLineFromText().
+
     * |*MPolyFromText(multiPolygonTaggedText String [,SRID
       Integer]):MultiPolygon *| - constructs a MultiPolygon
 
+      |*MultiPolygonFromText()*| - synonym for MPolyFromText().
+
     * |*GeomCollFromText(geometryCollectionTaggedText String [,SRID
       Integer]):GeomCollection *| - constructs a GeometryCollection
 
@@ -844,7 +854,10 @@ implementation of several spatial field types correspondent to every
 instansiable object subclass. For example a *Point* type is proposed to
 restrict data stored in a field of this type to only Point OpenGIS
 subclass. MySQL provides an implementation of single GEOMETRY type which
-doesn't restrict objects to certain OpenGIS subclass.
+doesn't restrict objects to certain OpenGIS subclass. Other proposed
+spatial field types are mapped into GEOMETRY type, so all these types
+can be used as a symonym for GEOMETRY: POINT, MULTIPOINT, LINESTRING,
+MULTILINESTRING, POLYGON, MULTIPOLYGON.
 
 
       9.2 No additional Metadata Views

sql/lex.h

@@ -222,6 +222,7 @@ static SYMBOL symbols[] = {
   { "LEVEL",		SYM(LEVEL_SYM),0,0},
   { "LIKE",		SYM(LIKE),0,0},
   { "LINES",		SYM(LINES),0,0},
+  { "LINESTRING",	SYM(LINESTRING),0,0},
   { "LIMIT",		SYM(LIMIT),0,0},
   { "LOAD",		SYM(LOAD),0,0},
   { "LOCAL",		SYM(LOCAL_SYM),0,0},
@@ -261,6 +262,9 @@ static SYMBOL symbols[] = {
   { "MODE",		SYM(MODE_SYM),0,0},
   { "MODIFY",		SYM(MODIFY_SYM),0,0},
   { "MONTH",		SYM(MONTH_SYM),0,0},
+  { "MULTILINESTRING",	SYM(MULTILINESTRING),0,0},
+  { "MULTIPOINT",	SYM(MULTIPOINT),0,0},
+  { "MULTIPOLYGON",	SYM(MULTIPOLYGON),0,0},
   { "MRG_MYISAM",	SYM(MERGE_SYM),0,0},
   { "MYISAM",		SYM(MYISAM_SYM),0,0},
   { "NATURAL",		SYM(NATURAL),0,0},
@@ -286,6 +290,8 @@ static SYMBOL symbols[] = {
   { "PACK_KEYS",	SYM(PACK_KEYS_SYM),0,0},
   { "PARTIAL",		SYM(PARTIAL),0,0},
   { "PASSWORD",		SYM(PASSWORD),0,0},
+  { "POINT",		SYM(POINT),0,0},
+  { "POLYGON",		SYM(POLYGON),0,0},
   { "PURGE",		SYM(PURGE),0,0},
   { "PRECISION",	SYM(PRECISION),0,0},
   { "PREV",		SYM(PREV_SYM),0,0},
@@ -503,7 +509,7 @@ static SYMBOL sql_functions[] = {
   { "LENGTH",		SYM(FUNC_ARG1),0,CREATE_FUNC(create_func_length)},
   { "LN",		SYM(FUNC_ARG1),0,CREATE_FUNC(create_func_ln)},
   { "LINEFROMTEXT",	SYM(LINEFROMTEXT),0,0},
-  { "LINESTRING",	SYM(LINESTRING),0,0},
+  { "LINESTRINGFROMTEXT",SYM(LINEFROMTEXT),0,0},
   { "LOAD_FILE",	SYM(FUNC_ARG1),0,CREATE_FUNC(create_load_file)},
   { "LOCATE",		SYM(LOCATE),0,0},
   { "LOG",		SYM(LOG_SYM),0,0},
@@ -522,14 +528,13 @@ static SYMBOL sql_functions[] = {
   { "MLINEFROMTEXT",	SYM(MLINEFROMTEXT),0,0},
   { "MPOINTFROMTEXT",	SYM(MPOINTFROMTEXT),0,0},
   { "MPOLYFROMTEXT",	SYM(MPOLYFROMTEXT),0,0},
-  { "MULTILINESTRING",	SYM(MULTILINESTRING),0,0},
-  { "MULTIPOINT",	SYM(MULTIPOINT),0,0},
-  { "MULTIPOLYGON",	SYM(MULTIPOLYGON),0,0},
   { "MONTHNAME",	SYM(FUNC_ARG1),0,CREATE_FUNC(create_func_monthname)},
+  { "MULTILINESTRINGFROMTEXT",SYM(MLINEFROMTEXT),0,0},
+  { "MULTIPOLYGONFROMTEXT",SYM(MPOLYFROMTEXT),0,0},
   { "NOW",		SYM(NOW_SYM),0,0},
   { "NULLIF",		SYM(FUNC_ARG2),0,CREATE_FUNC(create_func_nullif)},
   { "NUMGEOMETRIES",	SYM(FUNC_ARG1),0,CREATE_FUNC(create_func_numgeometries)},
-  { "NUMINTERIORRING",	SYM(FUNC_ARG1),0,CREATE_FUNC(create_func_numinteriorring)},
+  { "NUMINTERIORRINGS",	SYM(FUNC_ARG1),0,CREATE_FUNC(create_func_numinteriorring)},
   { "NUMPOINTS",	SYM(FUNC_ARG1),0,CREATE_FUNC(create_func_numpoints)},
   { "OCTET_LENGTH",	SYM(FUNC_ARG1),0,CREATE_FUNC(create_func_length)},
   { "OCT",		SYM(FUNC_ARG1),0,CREATE_FUNC(create_func_oct)},
@@ -539,11 +544,10 @@ static SYMBOL sql_functions[] = {
   { "PERIOD_ADD",	SYM(FUNC_ARG2),0,CREATE_FUNC(create_func_period_add)},
   { "PERIOD_DIFF",	SYM(FUNC_ARG2),0,CREATE_FUNC(create_func_period_diff)},
   { "PI",		SYM(FUNC_ARG0),0,CREATE_FUNC(create_func_pi)},
-  { "POINT",		SYM(FUNC_ARG2),0,CREATE_FUNC(create_func_point)},
   { "POINTFROMTEXT",	SYM(POINTFROMTEXT),0,0},
   { "POINTN",		SYM(FUNC_ARG2),0,CREATE_FUNC(create_func_pointn)},
   { "POLYFROMTEXT",	SYM(POLYFROMTEXT),0,0},
-  { "POLYGON",		SYM(POLYGON),0,0},
+  { "POLYGONFROMTEXT",	SYM(POLYFROMTEXT),0,0},
   { "POSITION",		SYM(POSITION_SYM),0,0},
   { "POW",		SYM(FUNC_ARG2),0,CREATE_FUNC(create_func_pow)},
   { "POWER",		SYM(FUNC_ARG2),0,CREATE_FUNC(create_func_pow)},

sql/sql_yacc.yy

@@ -484,6 +484,7 @@ bool my_yyoverflow(short **a, YYSTYPE **b,int *yystacksize);
 %token	NOW_SYM
 %token	PASSWORD
 %token	POINTFROMTEXT
+%token	POINT
 %token	POLYFROMTEXT
 %token  POLYGON
 %token	POSITION_SYM
@@ -1144,6 +1145,18 @@ type:
 					  $$=FIELD_TYPE_BLOB; }
 	| GEOMETRY_SYM			{ Lex->charset=&my_charset_bin;
 					  $$=FIELD_TYPE_GEOMETRY; }
+	| POINT				{ Lex->charset=&my_charset_bin;
+					  $$=FIELD_TYPE_GEOMETRY; }
+	| MULTIPOINT			{ Lex->charset=&my_charset_bin;
+					  $$=FIELD_TYPE_GEOMETRY; }
+	| LINESTRING			{ Lex->charset=&my_charset_bin;
+					  $$=FIELD_TYPE_GEOMETRY; }
+	| MULTILINESTRING		{ Lex->charset=&my_charset_bin;
+					  $$=FIELD_TYPE_GEOMETRY; }
+	| POLYGON			{ Lex->charset=&my_charset_bin;
+					  $$=FIELD_TYPE_GEOMETRY; }
+	| MULTIPOLYGON			{ Lex->charset=&my_charset_bin;
+					  $$=FIELD_TYPE_GEOMETRY; }
 	| MEDIUMBLOB			{ Lex->charset=&my_charset_bin;
 					  $$=FIELD_TYPE_MEDIUM_BLOB; }
 	| LONGBLOB			{ Lex->charset=&my_charset_bin;
@@ -2276,6 +2289,8 @@ simple_expr:
 	  { $$= new Item_func_password($3); }
         | PASSWORD '(' expr ',' expr ')'
           { $$= new Item_func_password($3,$5); }
+	| POINT '(' expr ',' expr ')'
+	  { $$= new Item_func_point($3,$5); }
  	| POINTFROMTEXT '(' expr ')'
 	  { $$= new Item_func_geometry_from_text($3); }
 	| POINTFROMTEXT '(' expr ',' expr ')'
@@ -3919,6 +3934,7 @@ keyword:
 	| FIRST_SYM		{}
 	| FIXED_SYM		{}
 	| FLUSH_SYM		{}
+	| GEOMETRY_SYM		{}
 	| GRANTS		{}
 	| GLOBAL_SYM		{}
 	| HEAP_SYM		{}
@@ -3935,6 +3951,7 @@ keyword:
 	| IO_THREAD		{}
 	| LAST_SYM		{}
 	| LEVEL_SYM		{}
+	| LINESTRING		{}
 	| LOCAL_SYM		{}
 	| LOCKS_SYM		{}
 	| LOGS_SYM		{}
@@ -3957,6 +3974,9 @@ keyword:
 	| MODIFY_SYM		{}
 	| MODE_SYM		{}
 	| MONTH_SYM		{}
+	| MULTILINESTRING	{}
+	| MULTIPOINT		{}
+	| MULTIPOLYGON		{}
 	| MYISAM_SYM		{}
 	| NATIONAL_SYM		{}
 	| NCHAR_SYM		{}
@@ -3969,6 +3989,8 @@ keyword:
 	| PACK_KEYS_SYM		{}
 	| PARTIAL		{}
 	| PASSWORD		{}
+	| POINT			{}
+	| POLYGON		{}
 	| PREV_SYM		{}
 	| PROCESS		{}
 	| PROCESSLIST_SYM	{}