diff options
| author | unknown <hf@deer.(none)> | 2004-06-01 22:37:39 +0500 |
|---|---|---|
| committer | unknown <hf@deer.(none)> | 2004-06-01 22:37:39 +0500 |
| commit | d47becb5a63891b70a2d28f8e4d01fbe96be3a89 (patch) | |
| tree | ca5acfdebdd01f67435c581ee8916ac562d717b0 /include | |
| parent | 68ca92448d70e345299c79a90e93d2fca298ca64 (diff) | |
| parent | f2a53248a19ae9c300ab0bb230a6822bb4906d77 (diff) | |
| download | mariadb-git-d47becb5a63891b70a2d28f8e4d01fbe96be3a89.tar.gz | |
Merge bk@192.168.21.1:/usr/home/bk/mysql-4.1
into deer.(none):/home/hf/work/mysql-4.1.ftr
configure.in:
Auto merged
include/my_global.h:
Auto merged
sql/mysqld.cc:
Auto merged
Diffstat (limited to 'include')
| -rw-r--r-- | include/my_global.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/include/my_global.h b/include/my_global.h index 57c736d6f75..3d1a770d877 100644 --- a/include/my_global.h +++ b/include/my_global.h @@ -1194,6 +1194,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 */ |