summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorhf@deer.(none) <>2004-05-27 17:37:47 +0500
committerhf@deer.(none) <>2004-05-27 17:37:47 +0500
commit3a5e8d58cc0c804447d4ab7b83c432d4102a8bb3 (patch)
treefaac7d06fba2e2d566b8ca6772b17dd2f1873c1f /include
parente27322d8264c56e2f86435c6f6b1f80dbb448f1c (diff)
parent6b42f932d6d01d8ed8a67a82da177e3a35dce66e (diff)
downloadmariadb-git-3a5e8d58cc0c804447d4ab7b83c432d4102a8bb3.tar.gz
Merge bk@192.168.21.1:/usr/home/bk/mysql-4.1
into deer.(none):/home/hf/work/mysql-4.1.ftr
Diffstat (limited to 'include')
-rw-r--r--include/my_global.h6
1 files changed, 4 insertions, 2 deletions
diff --git a/include/my_global.h b/include/my_global.h
index 88756742552..79bc24b3728 100644
--- a/include/my_global.h
+++ b/include/my_global.h
@@ -1196,6 +1196,8 @@ do { doubleget_union _tmp; \
#define MYSQL_UNIVERSAL_CLIENT_CHARSET MYSQL_DEFAULT_CHARSET_NAME
#endif
-#define HAVE_SPATIAL
-#define HAVE_RTREE_KEYS
+#if defined(EMBEDDED_LIBRARY) && !defined(HAVE_EMBEDDED_PRIVILEGE_CONTROL)
+#define NO_EMBEDDED_ACCESS_CHECKS
+#endif
+
#endif /* my_global_h */