SCRUM

WL#1163 (Make spatial code separable)
fixes before the push

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 */

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

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>
 

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"