diff options
| author | hf@deer.(none) <> | 2004-01-23 20:00:10 +0400 |
|---|---|---|
| committer | hf@deer.(none) <> | 2004-01-23 20:00:10 +0400 |
| commit | 52f2529536009624d669e453053e9f0d482cb8bb (patch) | |
| tree | 49de7fcd3c746734425c8deed43728660a8047dc /include | |
| parent | 0680d1659583981cac94e3765492e335fdaea14a (diff) | |
| parent | c13f757c4319b3831368adabfc11ace730f3014b (diff) | |
| download | mariadb-git-52f2529536009624d669e453053e9f0d482cb8bb.tar.gz | |
Conflicts resolved
Diffstat (limited to 'include')
| -rw-r--r-- | include/my_global.h | 2 | ||||
| -rw-r--r-- | include/mysqld_error.h | 3 |
2 files changed, 4 insertions, 1 deletions
diff --git a/include/my_global.h b/include/my_global.h index 32516cd5810..c9660d4d649 100644 --- a/include/my_global.h +++ b/include/my_global.h @@ -1168,4 +1168,6 @@ typedef union { #define MYSQL_UNIVERSAL_CLIENT_CHARSET MYSQL_DEFAULT_CHARSET_NAME #endif +#define HAVE_SPATIAL +#define HAVE_RTREE_KEYS #endif /* my_global_h */ diff --git a/include/mysqld_error.h b/include/mysqld_error.h index 179a2f823d7..80cfed9e338 100644 --- a/include/mysqld_error.h +++ b/include/mysqld_error.h @@ -304,4 +304,5 @@ #define ER_UNKNOWN_STORAGE_ENGINE 1285 #define ER_WARN_DEPRECATED_SYNTAX 1286 #define ER_NON_UPDATABLE_TABLE 1287 -#define ER_ERROR_MESSAGES 288 +#define ER_FEATURE_DISABLED 1288 +#define ER_ERROR_MESSAGES 289 |