summaryrefslogtreecommitdiff
path: root/sql/lex.h
diff options
context:
space:
mode:
authorram@mysql.r18.ru <>2003-02-28 21:17:08 +0400
committerram@mysql.r18.ru <>2003-02-28 21:17:08 +0400
commit8ecf3a0b21180ae7dddcfbf892fbf49e9c2400a2 (patch)
tree72d3b8c66ff266577ecc657ade20b2a654a82b2e /sql/lex.h
parent8def9a3e9395dcaf735e9d4b974dc9b8749c2a41 (diff)
downloadmariadb-git-8ecf3a0b21180ae7dddcfbf892fbf49e9c2400a2.tar.gz
Added GeometryFromText, MultiPointFromText aliases.
Added GeometryCollection type.
Diffstat (limited to 'sql/lex.h')
-rw-r--r--sql/lex.h4
1 files changed, 3 insertions, 1 deletions
diff --git a/sql/lex.h b/sql/lex.h
index de156af4ae2..c5dfae3921a 100644
--- a/sql/lex.h
+++ b/sql/lex.h
@@ -173,6 +173,7 @@ static SYMBOL symbols[] = {
{ "FULLTEXT", SYM(FULLTEXT_SYM),0,0},
{ "FUNCTION", SYM(UDF_SYM),0,0},
{ "GEOMETRY", SYM(GEOMETRY_SYM),0,0},
+ { "GEOMETRYCOLLECTION",SYM(GEOMETRYCOLLECTION),0,0},
{ "GLOBAL", SYM(GLOBAL_SYM),0,0},
{ "GRANT", SYM(GRANT),0,0},
{ "GRANTS", SYM(GRANTS),0,0},
@@ -488,11 +489,11 @@ static SYMBOL sql_functions[] = {
{ "FROM_DAYS", SYM(FUNC_ARG1),0,CREATE_FUNC(create_func_from_days)},
{ "FROM_UNIXTIME", SYM(FROM_UNIXTIME),0,0},
{ "GET_LOCK", SYM(FUNC_ARG2),0,CREATE_FUNC(create_func_get_lock)},
- { "GEOMETRYCOLLECTION",SYM(GEOMETRYCOLLECTION),0,0},
{ "GEOMETRYN", SYM(FUNC_ARG2),0,CREATE_FUNC(create_func_geometryn)},
{ "GEOMETRYTYPE", SYM(FUNC_ARG1),0,CREATE_FUNC(create_func_geometry_type)},
{ "GEOMCOLLFROMTEXT", SYM(GEOMCOLLFROMTEXT),0,0},
{ "GEOMFROMTEXT", SYM(GEOMFROMTEXT),0,0},
+ { "GEOMETRYFROMTEXT", SYM(GEOMFROMTEXT),0,0},
{ "GLENGTH", SYM(FUNC_ARG1),0,CREATE_FUNC(create_func_glength)},
{ "GREATEST", SYM(GREATEST_SYM),0,0},
{ "GROUP_UNIQUE_USERS", SYM(GROUP_UNIQUE_USERS),0,0},
@@ -534,6 +535,7 @@ static SYMBOL sql_functions[] = {
{ "MPOLYFROMTEXT", SYM(MPOLYFROMTEXT),0,0},
{ "MONTHNAME", SYM(FUNC_ARG1),0,CREATE_FUNC(create_func_monthname)},
{ "MULTILINESTRINGFROMTEXT",SYM(MLINEFROMTEXT),0,0},
+ { "MULTIPOINTFROMTEXT",SYM(MPOINTFROMTEXT),0,0},
{ "MULTIPOLYGONFROMTEXT",SYM(MPOLYFROMTEXT),0,0},
{ "NOW", SYM(NOW_SYM),0,0},
{ "NULLIF", SYM(FUNC_ARG2),0,CREATE_FUNC(create_func_nullif)},