From 235f1a4d60968bd9083780d13e249aad9fe7120c Mon Sep 17 00:00:00 2001 From: unknown Date: Thu, 15 Jan 2004 21:06:22 +0400 Subject: SCRUM: WL#1163 (Making spatial code optional) Pack of changes to do in sql/ code. sql/field.cc: Spatial code #ifdef-ed sql/field.h: Spatial code #ifdef-ed sql/item_create.cc: Spatial code #ifdef-ed sql/item_create.h: Spatial code #ifdef-ed sql/item_geofunc.cc: Spatial code #ifdef-ed sql/item_geofunc.h: Spatial code #ifdef-ed GEOM_NEW implementation sql/lex.h: Code was significally modified to support optional group of functions sql/lex_symbol.h: SYM_GROUP structure presented sql/sql_table.cc: Spatial code #ifdef-ed sql/sql_yacc.yy: Several modifications to make spatial code optional sql/table.cc: Spatial code #ifdef-ed sql/unireg.cc: Spatial code #ifdef-ed --- sql/item_geofunc.h | 11 +++++++++++ 1 file changed, 11 insertions(+) (limited to 'sql/item_geofunc.h') diff --git a/sql/item_geofunc.h b/sql/item_geofunc.h index f6f00ed2bab..545052807ec 100644 --- a/sql/item_geofunc.h +++ b/sql/item_geofunc.h @@ -17,6 +17,8 @@ /* This file defines all spatial functions */ +#ifdef HAVE_SPATIAL + #ifdef __GNUC__ #pragma interface /* gcc class implementation */ #endif @@ -338,3 +340,12 @@ public: const char *func_name() const { return "srid"; } void fix_length_and_dec() { max_length= 10; } }; + +#define GEOM_NEW(obj_constructor) new obj_constructor + +#else /*HAVE_SPATIAL*/ + +#define GEOM_NEW(obj_constructor) NULL + +#endif + -- cgit v1.2.1