Merge with 4.1

BitKeeper/etc/logging_ok:
  auto-union
client/mysqltest.c:
  Auto merged
configure.in:
  Auto merged
include/my_global.h:
  Auto merged
mysql-test/r/bdb.result:
  Auto merged
mysql-test/r/connect.result:
  Auto merged
mysql-test/r/multi_update.result:
  Auto merged
mysql-test/r/show_check.result:
  Auto merged
mysql-test/r/system_mysql_db.result:
  Auto merged
mysql-test/t/multi_update.test:
  Auto merged
sql/ha_berkeley.cc:
  Auto merged
sql/ha_berkeley.h:
  Auto merged
sql/ha_heap.h:
  Auto merged
sql/ha_innodb.h:
  Auto merged
sql/handler.h:
  Auto merged
sql/item_cmpfunc.cc:
  Auto merged
sql/log.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/sql_acl.cc:
  Auto merged
sql/sql_class.cc:
  Auto merged
sql/sql_db.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_show.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
sql/sql_update.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
sql/opt_range.cc:
  Merge with 4.1
  true -> TRUE and false -> FALSE

4 files changed, 64 insertions, 49 deletions

diff --git a/include/config-win.h b/include/config-win.h
index 0298c9012ce..91697c985d1 100644
--- a/include/config-win.h
+++ b/include/config-win.h
@@ -348,6 +348,9 @@ inline double ulonglong2double(ulonglong value)
 #define MYSQL_DEFAULT_CHARSET_NAME "latin1"
 #define MYSQL_DEFAULT_COLLATION_NAME "latin1_swedish_ci"
 
+#define HAVE_SPATIAL 1
+#define HAVE_RTREE_KEYS 1
+
 /* Define charsets you want */
 /* #undef HAVE_CHARSET_armscii8 */
 /* #undef HAVE_CHARSET_ascii */
diff --git a/include/my_getopt.h b/include/my_getopt.h
index 5f4025efa0e..bf119892a31 100644
--- a/include/my_getopt.h
+++ b/include/my_getopt.h
@@ -16,10 +16,17 @@
 
 C_MODE_START
 
-enum get_opt_var_type { GET_NO_ARG, GET_BOOL, GET_INT, GET_UINT, GET_LONG,
-			GET_ULONG, GET_LL, GET_ULL, GET_STR, GET_STR_ALLOC,
-			GET_DISABLED
-                      };
+#define GET_NO_ARG     1
+#define GET_BOOL       2
+#define GET_INT        3
+#define GET_UINT       4
+#define GET_LONG       5
+#define GET_ULONG      6
+#define GET_LL         7
+#define GET_ULL        8
+#define GET_STR        9
+#define GET_STR_ALLOC 10
+#define GET_DISABLED  11
 
 #define GET_ASK_ADDR	 128
 #define GET_TYPE_MASK	 127
@@ -34,7 +41,7 @@ struct my_option
   gptr       *value;                    /* The variable value */
   gptr       *u_max_value;              /* The user def. max variable value */
   const char **str_values;              /* Pointer to possible values */
-  enum get_opt_var_type var_type;
+  ulong     var_type;
   enum get_opt_arg_type arg_type;
   longlong   def_value;                 /* Default value */
   longlong   min_value;                 /* Min allowed value */
diff --git a/include/my_global.h b/include/my_global.h
index 6490a775e7c..df42a91a739 100644
--- a/include/my_global.h
+++ b/include/my_global.h
@@ -213,7 +213,11 @@ C_MODE_END
 
 /* Fix problem when linking c++ programs with gcc 3.x */
 #ifdef DEFINE_CXA_PURE_VIRTUAL
-#define FIX_GCC_LINKING_PROBLEM extern "C" { int __cxa_pure_virtual() {return 0;} }
+#define FIX_GCC_LINKING_PROBLEM \
+extern "C" { int __cxa_pure_virtual() {\
+  DBUG_ASSERT("Pure virtual method called." == "Aborted");\
+  return 0;\
+} }
 #else
 #define FIX_GCC_LINKING_PROBLEM
 #endif
diff --git a/include/mysqld_error.h b/include/mysqld_error.h
index 840b9c7f42a..d4848150c3f 100644
--- a/include/mysqld_error.h
+++ b/include/mysqld_error.h
@@ -316,46 +316,47 @@
 #define ER_GET_TEMPORARY_ERRMSG 1297
 #define ER_UNKNOWN_TIME_ZONE 1298
 #define ER_WARN_INVALID_TIMESTAMP 1299
-#define ER_SP_NO_RECURSIVE_CREATE 1300
-#define ER_SP_ALREADY_EXISTS 1301
-#define ER_SP_DOES_NOT_EXIST 1302
-#define ER_SP_DROP_FAILED 1303
-#define ER_SP_STORE_FAILED 1304
-#define ER_SP_LILABEL_MISMATCH 1305
-#define ER_SP_LABEL_REDEFINE 1306
-#define ER_SP_LABEL_MISMATCH 1307
-#define ER_SP_UNINIT_VAR 1308
-#define ER_SP_BADSELECT 1309
-#define ER_SP_BADRETURN 1310
-#define ER_SP_BADSTATEMENT 1311
-#define ER_UPDATE_LOG_DEPRECATED_IGNORED 1312
-#define ER_UPDATE_LOG_DEPRECATED_TRANSLATED 1313
-#define ER_QUERY_INTERRUPTED 1314
-#define ER_SP_WRONG_NO_OF_ARGS 1315
-#define ER_SP_COND_MISMATCH 1316
-#define ER_SP_NORETURN 1317
-#define ER_SP_NORETURNEND 1318
-#define ER_SP_BAD_CURSOR_QUERY 1319
-#define ER_SP_BAD_CURSOR_SELECT 1320
-#define ER_SP_CURSOR_MISMATCH 1321
-#define ER_SP_CURSOR_ALREADY_OPEN 1322
-#define ER_SP_CURSOR_NOT_OPEN 1323
-#define ER_SP_UNDECLARED_VAR 1324
-#define ER_SP_WRONG_NO_OF_FETCH_ARGS 1325
-#define ER_SP_FETCH_NO_DATA 1326
-#define ER_SP_DUP_PARAM 1327
-#define ER_SP_DUP_VAR 1328
-#define ER_SP_DUP_COND 1329
-#define ER_SP_DUP_CURS 1330
-#define ER_SP_CANT_ALTER 1331
-#define ER_SP_SUBSELECT_NYI 1332
-#define ER_SP_NO_USE 1333
-#define ER_SP_VARCOND_AFTER_CURSHNDLR 1334
-#define ER_SP_CURSOR_AFTER_HANDLER 1335
-#define ER_SP_CASE_NOT_FOUND 1336
-#define ER_FPARSER_TOO_BIG_FILE 1337
-#define ER_FPARSER_BAD_HEADER 1338
-#define ER_FPARSER_EOF_IN_COMMENT 1339
-#define ER_FPARSER_ERROR_IN_PARAMETER 1340
-#define ER_FPARSER_EOF_IN_UNKNOWN_PARAMETER 1341
-#define ER_ERROR_MESSAGES 342
+#define ER_INVALID_CHARACTER_STRING 1300
+#define ER_SP_NO_RECURSIVE_CREATE 1301
+#define ER_SP_ALREADY_EXISTS 1302
+#define ER_SP_DOES_NOT_EXIST 1303
+#define ER_SP_DROP_FAILED 1304
+#define ER_SP_STORE_FAILED 1305
+#define ER_SP_LILABEL_MISMATCH 1306
+#define ER_SP_LABEL_REDEFINE 1307
+#define ER_SP_LABEL_MISMATCH 1308
+#define ER_SP_UNINIT_VAR 1309
+#define ER_SP_BADSELECT 1310
+#define ER_SP_BADRETURN 1311
+#define ER_SP_BADSTATEMENT 1312
+#define ER_UPDATE_LOG_DEPRECATED_IGNORED 1313
+#define ER_UPDATE_LOG_DEPRECATED_TRANSLATED 1314
+#define ER_QUERY_INTERRUPTED 1315
+#define ER_SP_WRONG_NO_OF_ARGS 1316
+#define ER_SP_COND_MISMATCH 1317
+#define ER_SP_NORETURN 1318
+#define ER_SP_NORETURNEND 1319
+#define ER_SP_BAD_CURSOR_QUERY 1320
+#define ER_SP_BAD_CURSOR_SELECT 1321
+#define ER_SP_CURSOR_MISMATCH 1322
+#define ER_SP_CURSOR_ALREADY_OPEN 1323
+#define ER_SP_CURSOR_NOT_OPEN 1324
+#define ER_SP_UNDECLARED_VAR 1325
+#define ER_SP_WRONG_NO_OF_FETCH_ARGS 1326
+#define ER_SP_FETCH_NO_DATA 1327
+#define ER_SP_DUP_PARAM 1328
+#define ER_SP_DUP_VAR 1329
+#define ER_SP_DUP_COND 1330
+#define ER_SP_DUP_CURS 1331
+#define ER_SP_CANT_ALTER 1332
+#define ER_SP_SUBSELECT_NYI 1333
+#define ER_SP_NO_USE 1334
+#define ER_SP_VARCOND_AFTER_CURSHNDLR 1335
+#define ER_SP_CURSOR_AFTER_HANDLER 1336
+#define ER_SP_CASE_NOT_FOUND 1337
+#define ER_FPARSER_TOO_BIG_FILE 1338
+#define ER_FPARSER_BAD_HEADER 1339
+#define ER_FPARSER_EOF_IN_COMMENT 1340
+#define ER_FPARSER_ERROR_IN_PARAMETER 1341
+#define ER_FPARSER_EOF_IN_UNKNOWN_PARAMETER 1342
+#define ER_ERROR_MESSAGES 343