diff options
| author | unknown <ram@mysql.r18.ru> | 2003-04-02 15:39:57 +0500 |
|---|---|---|
| committer | unknown <ram@mysql.r18.ru> | 2003-04-02 15:39:57 +0500 |
| commit | 16ce6b7173ff558a51de3d5e7d1b6eecdf7367dd (patch) | |
| tree | 7d6405a3ecec5561ccd9175d26164600ee82b37a /sql/lex.h | |
| parent | a58b66206b57b97e39e8ee01c2a7b72a319618c5 (diff) | |
| parent | 1e32810ad87152d2e0b85b5976fcab4483a02230 (diff) | |
| download | mariadb-git-16ce6b7173ff558a51de3d5e7d1b6eecdf7367dd.tar.gz | |
Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.r18.ru:/usr/home/ram/work/mysql-4.1.sp
Diffstat (limited to 'sql/lex.h')
| -rw-r--r-- | sql/lex.h | 17 |
1 files changed, 15 insertions, 2 deletions
diff --git a/sql/lex.h b/sql/lex.h index 446849bbf45..01a289e4f7a 100644 --- a/sql/lex.h +++ b/sql/lex.h @@ -494,11 +494,13 @@ static SYMBOL sql_functions[] = { { "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}, + { "GEOMCOLLFROMWKB", SYM(GEOMFROMWKB),0,0}, { "GEOMETRYCOLLECTIONFROMTEXT",SYM(GEOMCOLLFROMTEXT),0,0}, - { "GEOMFROMTEXT", SYM(GEOMFROMTEXT),0,0}, + { "GEOMETRYCOLLECTIONFROMWKB",SYM(GEOMFROMWKB),0,0}, { "GEOMETRYFROMTEXT", SYM(GEOMFROMTEXT),0,0}, - { "GEOMFROMWKB", SYM(GEOMFROMWKB),0,0}, { "GEOMETRYFROMWKB", SYM(GEOMFROMWKB),0,0}, + { "GEOMFROMTEXT", SYM(GEOMFROMTEXT),0,0}, + { "GEOMFROMWKB", SYM(GEOMFROMWKB),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}, @@ -521,7 +523,9 @@ 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}, + { "LINEFROMWKB", SYM(GEOMFROMWKB),0,0}, { "LINESTRINGFROMTEXT",SYM(LINEFROMTEXT),0,0}, + { "LINESTRINGFROMWKB",SYM(GEOMFROMWKB),0,0}, { "LOAD_FILE", SYM(FUNC_ARG1),0,CREATE_FUNC(create_load_file)}, { "LOCATE", SYM(LOCATE),0,0}, { "LOG", SYM(LOG_SYM),0,0}, @@ -544,12 +548,18 @@ static SYMBOL sql_functions[] = { { "MID", SYM(SUBSTRING),0,0}, /* unireg function */ { "MIN", SYM(MIN_SYM),0,0}, { "MLINEFROMTEXT", SYM(MLINEFROMTEXT),0,0}, + { "MLINEFROMWKB", SYM(GEOMFROMWKB),0,0}, { "MPOINTFROMTEXT", SYM(MPOINTFROMTEXT),0,0}, + { "MPOINTFROMWKB", SYM(GEOMFROMWKB),0,0}, { "MPOLYFROMTEXT", SYM(MPOLYFROMTEXT),0,0}, + { "MPOLYFROMWKB", SYM(GEOMFROMWKB),0,0}, { "MONTHNAME", SYM(FUNC_ARG1),0,CREATE_FUNC(create_func_monthname)}, { "MULTILINESTRINGFROMTEXT",SYM(MLINEFROMTEXT),0,0}, + { "MULTILINESTRINGFROMWKB",SYM(GEOMFROMWKB),0,0}, { "MULTIPOINTFROMTEXT",SYM(MPOINTFROMTEXT),0,0}, + { "MULTIPOINTFROMWKB",SYM(GEOMFROMWKB),0,0}, { "MULTIPOLYGONFROMTEXT",SYM(MPOLYFROMTEXT),0,0}, + { "MULTIPOLYGONFROMWKB",SYM(GEOMFROMWKB),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)}, @@ -564,9 +574,12 @@ static SYMBOL sql_functions[] = { { "PERIOD_DIFF", SYM(FUNC_ARG2),0,CREATE_FUNC(create_func_period_diff)}, { "PI", SYM(FUNC_ARG0),0,CREATE_FUNC(create_func_pi)}, { "POINTFROMTEXT", SYM(POINTFROMTEXT),0,0}, + { "POINTFROMWKB", SYM(GEOMFROMWKB),0,0}, { "POINTN", SYM(FUNC_ARG2),0,CREATE_FUNC(create_func_pointn)}, { "POLYFROMTEXT", SYM(POLYFROMTEXT),0,0}, + { "POLYFROMWKB", SYM(GEOMFROMWKB),0,0}, { "POLYGONFROMTEXT", SYM(POLYFROMTEXT),0,0}, + { "POLYGONFROMWKB", SYM(GEOMFROMWKB),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)}, |