diff options
| author | unknown <hf@deer.(none)> | 2004-01-23 19:54:22 +0400 |
|---|---|---|
| committer | unknown <hf@deer.(none)> | 2004-01-23 19:54:22 +0400 |
| commit | 87b3ca5fe0f66b0d7546b6175d8b1d50d6d3a838 (patch) | |
| tree | ae476e9ed8ee458bfd1e655174e77db462da7ae2 | |
| parent | 214c178f1763c14934a337c2ebce89f10aa18741 (diff) | |
| download | mariadb-git-87b3ca5fe0f66b0d7546b6175d8b1d50d6d3a838.tar.gz | |
SCRUM
WL#1163 (Make spatial code separable)
fixes before the push
include/my_global.h:
Temporary place for these defines
include/mysqld_error.h:
ER_FEATURE_DISABLED definition
sql/item_geofunc.cc:
#ifdef HAVE_SPATIAL moved to the better place
sql/share/english/errmsg.txt:
Message for ER_FEATURE_DISABLED
| -rw-r--r-- | include/my_global.h | 2 | ||||
| -rw-r--r-- | include/mysqld_error.h | 3 | ||||
| -rw-r--r-- | sql/item_geofunc.cc | 4 | ||||
| -rw-r--r-- | sql/share/english/errmsg.txt | 1 |
4 files changed, 7 insertions, 3 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 6a484d0419c..ac3437595fe 100644 --- a/include/mysqld_error.h +++ b/include/mysqld_error.h @@ -303,4 +303,5 @@ #define ER_WARN_HOSTNAME_WONT_WORK 1284 #define ER_UNKNOWN_STORAGE_ENGINE 1285 #define ER_WARN_DEPRECATED_SYNTAX 1286 -#define ER_ERROR_MESSAGES 287 +#define ER_FEATURE_DISABLED 1287 +#define ER_ERROR_MESSAGES 288 diff --git a/sql/item_geofunc.cc b/sql/item_geofunc.cc index 671c4ed6de4..6934ad9d3b0 100644 --- a/sql/item_geofunc.cc +++ b/sql/item_geofunc.cc @@ -17,13 +17,13 @@ /* This file defines all spatial functions */ -#ifdef HAVE_SPATIAL - #ifdef __GNUC__ #pragma implementation // gcc: Class implementation #endif #include "mysql_priv.h" + +#ifdef HAVE_SPATIAL #include "sql_acl.h" #include <m_ctype.h> diff --git a/sql/share/english/errmsg.txt b/sql/share/english/errmsg.txt index afce57a9a74..1c93d0aa5e5 100644 --- a/sql/share/english/errmsg.txt +++ b/sql/share/english/errmsg.txt @@ -290,3 +290,4 @@ character-set=latin1 "MySQL is started in --skip-name-resolve mode. You need to restart it without this switch for this grant to work", "Unknown table engine '%s'", "'%s' is deprecated. Use '%s' instead.", +"The '%s' feature was disabled. You need MySQL built with '%s' define to have it working" |