diff options
| author | unknown <hf@deer.(none)> | 2004-01-23 16:02:57 +0400 |
|---|---|---|
| committer | unknown <hf@deer.(none)> | 2004-01-23 16:02:57 +0400 |
| commit | 214c178f1763c14934a337c2ebce89f10aa18741 (patch) | |
| tree | 8172c7f6f96ab3801ef15dfbb93d61a10809047f /sql/lex.h | |
| parent | 235f1a4d60968bd9083780d13e249aad9fe7120c (diff) | |
| download | mariadb-git-214c178f1763c14934a337c2ebce89f10aa18741.tar.gz | |
SCRUM
wl #1163 (Make spatial code optional)
Patch I cleaned with Serg & Monty's suggestions
sql/gen_lex_hash.cc:
mysql_priv.h was included for SYM_GROUP declaration
sql/lex.h:
sym_group_xxx made global so we can use texts from them
throughout the code
sql/lex_symbol.h:
SYM_GROUP declaration moved to mysql_priv.h
sql/mysql_priv.h:
declarations about SYM_GROUP
sql/sql_table.cc:
sym_group_xxx objects used instead of text constants
a couple of HAVE_SPATIAL removed
sql/sql_yacc.yy:
sym_group_xxx used instead of text constants
some duplicated code restructured
MYF(0) parameters removed from net_printf calls
Diffstat (limited to 'sql/lex.h')
| -rw-r--r-- | sql/lex.h | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/sql/lex.h b/sql/lex.h index 78a22fad153..93c3ec2f01e 100644 --- a/sql/lex.h +++ b/sql/lex.h @@ -20,8 +20,9 @@ #include "lex_symbol.h" /* We don't want to include sql_yacc.h into gen_lex_hash */ -static SYM_GROUP sym_group_common= {"", ""}; -static SYM_GROUP sym_group_geom= {"Spatial extentions", "HAVE_SPATIAL"}; +SYM_GROUP sym_group_common= {"", ""}; +SYM_GROUP sym_group_geom= {"Spatial extentions", "HAVE_SPATIAL"}; +SYM_GROUP sym_group_rtree= {"RTree keys", "HAVE_RTREE_KEYS"}; #ifdef NO_YACC_SYMBOLS #define SYM_OR_NULL(A) 0 @@ -457,7 +458,6 @@ static SYMBOL symbols[] = { static SYMBOL sql_functions[] = { { "ABS", F_SYM(FUNC_ARG1),0,CREATE_FUNC(create_func_abs)}, -#ifdef DUMMY { "ACOS", F_SYM(FUNC_ARG1),0,CREATE_FUNC(create_func_acos)}, { "ADDDATE", SYM(ADDDATE_SYM)}, { "ADDTIME", F_SYM(FUNC_ARG2),0,CREATE_FUNC(create_func_addtime)}, @@ -534,7 +534,7 @@ static SYMBOL sql_functions[] = { { "FROM_UNIXTIME", SYM(FROM_UNIXTIME)}, { "GET_LOCK", F_SYM(FUNC_ARG2),0,CREATE_FUNC(create_func_get_lock)}, { "GEOMETRYN", F_SYM(FUNC_ARG2),0,CREATE_FUNC_GEOM(create_func_geometryn)}, - { "GEOMETRYTYPE", SYM(FUNC_ARG1),0,CREATE_FUNC_GEOM(create_func_geometry_type)}, + { "GEOMETRYTYPE", F_SYM(FUNC_ARG1),0,CREATE_FUNC_GEOM(create_func_geometry_type)}, { "GEOMCOLLFROMTEXT", SYM(GEOMCOLLFROMTEXT)}, { "GEOMCOLLFROMWKB", SYM(GEOMFROMWKB)}, { "GEOMETRYCOLLECTIONFROMTEXT",SYM(GEOMCOLLFROMTEXT)}, @@ -657,7 +657,6 @@ static SYMBOL sql_functions[] = { { "SUBSTR", SYM(SUBSTRING)}, { "SUBSTRING", SYM(SUBSTRING)}, { "SUBSTRING_INDEX", SYM(SUBSTRING_INDEX)}, -#endif /*dummy*/ { "SUBTIME", F_SYM(FUNC_ARG2),0,CREATE_FUNC(create_func_subtime)}, { "SUM", SYM(SUM_SYM)}, { "SYSDATE", SYM(NOW_SYM)}, |