diff options
| author | unknown <igor@rurik.mysql.com> | 2004-02-19 01:09:54 -0800 |
|---|---|---|
| committer | unknown <igor@rurik.mysql.com> | 2004-02-19 01:09:54 -0800 |
| commit | f4353d48ccc39527540daf709a1167462b39738c (patch) | |
| tree | aa627335f475f099e0d352b39af4e24d6e1ac189 /include/my_global.h | |
| parent | c88e5213d4f8acbbba33d293a9573042818f0aec (diff) | |
| parent | 9ce4695da0bfe74e840dcf708da10cac9740e137 (diff) | |
| download | mariadb-git-f4353d48ccc39527540daf709a1167462b39738c.tar.gz | |
Manual merge
mysql-test/r/func_test.result:
Auto merged
mysql-test/r/subselect.result:
Auto merged
mysql-test/r/user_var.result:
Auto merged
sql/item_cmpfunc.cc:
Auto merged
sql/item_cmpfunc.h:
Auto merged
sql/item_func.cc:
Auto merged
sql/item_func.h:
Auto merged
sql/item_row.cc:
Auto merged
sql/item_row.h:
Auto merged
sql/item_strfunc.h:
Auto merged
sql/sql_list.h:
Auto merged
sql/sql_select.h:
Auto merged
Diffstat (limited to 'include/my_global.h')
| -rw-r--r-- | include/my_global.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/my_global.h b/include/my_global.h index 3275b010bb4..8523df629a2 100644 --- a/include/my_global.h +++ b/include/my_global.h @@ -1186,4 +1186,6 @@ typedef union { #define MYSQL_UNIVERSAL_CLIENT_CHARSET MYSQL_DEFAULT_CHARSET_NAME #endif +#define HAVE_SPATIAL +#define HAVE_RTREE_KEYS #endif /* my_global_h */ |