summaryrefslogtreecommitdiff
path: root/sql/item_create.h
diff options
context:
space:
mode:
authorpem@mysql.com <>2004-02-10 18:44:02 +0100
committerpem@mysql.com <>2004-02-10 18:44:02 +0100
commitc8585f3283816dea04c28774ef87537521b6aa80 (patch)
treef04786f8a211a4c03eab547b7332792201289ac1 /sql/item_create.h
parent5344528b0034f0254d4c72b203c5888f1c8526c2 (diff)
parent9de20058342fa7387071a3d70291a26db2e210c0 (diff)
downloadmariadb-git-c8585f3283816dea04c28774ef87537521b6aa80.tar.gz
Merge 4.1 into 5.0.
Diffstat (limited to 'sql/item_create.h')
-rw-r--r--sql/item_create.h4
1 files changed, 4 insertions, 0 deletions
diff --git a/sql/item_create.h b/sql/item_create.h
index b445eab3bac..5dc53fb04b8 100644
--- a/sql/item_create.h
+++ b/sql/item_create.h
@@ -98,6 +98,8 @@ Item *create_func_is_free_lock(Item* a);
Item *create_func_is_used_lock(Item* a);
Item *create_func_quote(Item* a);
+#ifdef HAVE_SPATIAL
+
Item *create_func_geometry_from_text(Item *a);
Item *create_func_as_wkt(Item *a);
Item *create_func_as_wkb(Item *a);
@@ -137,6 +139,8 @@ Item *create_func_numgeometries(Item *a);
Item *create_func_point(Item *a, Item *b);
+#endif /*HAVE_SPATIAL*/
+
Item *create_func_compress(Item *a);
Item *create_func_uncompress(Item *a);
Item *create_func_uncompressed_length(Item *a);