summaryrefslogtreecommitdiff
path: root/sql/item_geofunc.h
diff options
context:
space:
mode:
authorunknown <hf@deer.(none)>2004-01-15 21:06:22 +0400
committerunknown <hf@deer.(none)>2004-01-15 21:06:22 +0400
commit235f1a4d60968bd9083780d13e249aad9fe7120c (patch)
tree24c233c602a5644cbcc259252d10163dc0551fc5 /sql/item_geofunc.h
parent24f8054460a574660730024690786b877afccfd3 (diff)
downloadmariadb-git-235f1a4d60968bd9083780d13e249aad9fe7120c.tar.gz
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
Diffstat (limited to 'sql/item_geofunc.h')
-rw-r--r--sql/item_geofunc.h11
1 files changed, 11 insertions, 0 deletions
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
+