Merge with 4.0.18

BitKeeper/etc/ignore:
  auto-union
BitKeeper/etc/logging_ok:
  auto-union
mysql-test/r/ctype_tis620.result-old:
  Merge rename: mysql-test/r/ctype_tis620.result -> mysql-test/r/ctype_tis620.result-old
BUILD/compile-pentium-max:
  Auto merged
BitKeeper/etc/config:
  Auto merged
Build-tools/Bootstrap:
  Auto merged
Build-tools/Do-compile:
  Auto merged
configure.in:
  Auto merged
mysql-test/t/ctype_tis620.test-old:
  Merge rename: mysql-test/t/ctype_tis620.test -> mysql-test/t/ctype_tis620.test-old
Docs/Makefile.am:
  Auto merged
client/mysqldump.c:
  Auto merged
client/mysqltest.c:
  Auto merged
include/my_global.h:
  Auto merged
include/my_pthread.h:
  Auto merged
include/my_sys.h:
  Auto merged
include/myisam.h:
  Auto merged
innobase/btr/btr0cur.c:
  Auto merged
innobase/ibuf/ibuf0ibuf.c:
  Auto merged
innobase/include/dict0dict.h:
  Auto merged
innobase/include/srv0srv.h:
  Auto merged
innobase/include/ut0mem.h:
  Auto merged
innobase/log/log0log.c:
  Auto merged
innobase/row/row0ins.c:
  Auto merged
innobase/row/row0sel.c:
  Auto merged
innobase/srv/srv0start.c:
  Auto merged
innobase/ut/ut0mem.c:
  Auto merged
myisam/mi_check.c:
  Auto merged
myisam/mi_dynrec.c:
  Auto merged
myisam/mi_key.c:
  Auto merged
myisam/myisam_ftdump.c:
  Auto merged
myisam/myisamdef.h:
  Auto merged
mysql-test/mysql-test-run.sh:
  Auto merged
mysql-test/r/alter_table.result:
  Auto merged
mysql-test/r/bdb.result:
  Auto merged
mysql-test/r/bigint.result:
  Auto merged
mysql-test/r/fulltext.result:
  Auto merged

1 files changed, 54 insertions, 53 deletions

diff --git a/include/mysqld_error.h b/include/mysqld_error.h
index fbf89bdb3e1..494f19aa7bd 100644
--- a/include/mysqld_error.h
+++ b/include/mysqld_error.h
@@ -254,56 +254,57 @@
 #define ER_NOT_SUPPORTED_YET	1235
 #define ER_MASTER_FATAL_ERROR_READING_BINLOG 1236
 #define ER_SLAVE_IGNORED_TABLE 1237
-#define ER_WRONG_FK_DEF 1238
-#define ER_KEY_REF_DO_NOT_MATCH_TABLE_REF 1239
-#define ER_OPERAND_COLUMNS 1240
-#define ER_SUBQUERY_NO_1_ROW 1241
-#define ER_UNKNOWN_STMT_HANDLER 1242
-#define ER_CORRUPT_HELP_DB 1243
-#define ER_CYCLIC_REFERENCE 1244
-#define ER_AUTO_CONVERT 1245
-#define ER_ILLEGAL_REFERENCE 1246
-#define ER_DERIVED_MUST_HAVE_ALIAS 1247
-#define ER_SELECT_REDUCED 1248
-#define ER_TABLENAME_NOT_ALLOWED_HERE 1249
-#define ER_NOT_SUPPORTED_AUTH_MODE 1250
-#define ER_SPATIAL_CANT_HAVE_NULL 1251
-#define ER_COLLATION_CHARSET_MISMATCH 1252
-#define ER_SLAVE_WAS_RUNNING 1253
-#define ER_SLAVE_WAS_NOT_RUNNING 1254
-#define ER_TOO_BIG_FOR_UNCOMPRESS 1255
-#define ER_ZLIB_Z_MEM_ERROR 1256
-#define ER_ZLIB_Z_BUF_ERROR 1257
-#define ER_ZLIB_Z_DATA_ERROR 1258
-#define ER_CUT_VALUE_GROUP_CONCAT 1259
-#define ER_WARN_TOO_FEW_RECORDS 1260
-#define ER_WARN_TOO_MANY_RECORDS 1261
-#define ER_WARN_NULL_TO_NOTNULL 1262
-#define ER_WARN_DATA_OUT_OF_RANGE 1263
-#define ER_WARN_DATA_TRUNCATED 1264
-#define ER_WARN_USING_OTHER_HANDLER 1265
-#define ER_CANT_AGGREGATE_2COLLATIONS 1266
-#define ER_DROP_USER 1267
-#define ER_REVOKE_GRANTS 1268
-#define ER_CANT_AGGREGATE_3COLLATIONS 1269
-#define ER_CANT_AGGREGATE_NCOLLATIONS 1270
-#define ER_VARIABLE_IS_NOT_STRUCT 1271
-#define ER_UNKNOWN_COLLATION 1272
-#define ER_SLAVE_IGNORED_SSL_PARAMS 1273
-#define ER_SERVER_IS_IN_SECURE_AUTH_MODE 1274
-#define ER_WARN_FIELD_RESOLVED 1275
-#define ER_BAD_SLAVE_UNTIL_COND 1276
-#define ER_MISSING_SKIP_SLAVE 1277
-#define ER_UNTIL_COND_IGNORED 1278
-#define ER_WRONG_NAME_FOR_INDEX 1279
-#define ER_WRONG_NAME_FOR_CATALOG 1280
-#define ER_WARN_QC_RESIZE 1281
-#define ER_BAD_FT_COLUMN 1282
-#define ER_UNKNOWN_KEY_CACHE 1283
-#define ER_WARN_HOSTNAME_WONT_WORK 1284
-#define ER_UNKNOWN_STORAGE_ENGINE 1285
-#define ER_WARN_DEPRECATED_SYNTAX 1286
-#define ER_NON_UPDATABLE_TABLE 1287
-#define ER_FEATURE_DISABLED 1288
-#define ER_SKIP_GRANT_TABLES 1289
-#define ER_ERROR_MESSAGES 290
+#define ER_INCORRECT_GLOBAL_LOCAL_VAR 1238
+#define ER_WRONG_FK_DEF 1239
+#define ER_KEY_REF_DO_NOT_MATCH_TABLE_REF 1240
+#define ER_OPERAND_COLUMNS 1241
+#define ER_SUBQUERY_NO_1_ROW 1242
+#define ER_UNKNOWN_STMT_HANDLER 1243
+#define ER_CORRUPT_HELP_DB 1244
+#define ER_CYCLIC_REFERENCE 1245
+#define ER_AUTO_CONVERT 1246
+#define ER_ILLEGAL_REFERENCE 1247
+#define ER_DERIVED_MUST_HAVE_ALIAS 1248
+#define ER_SELECT_REDUCED 1249
+#define ER_TABLENAME_NOT_ALLOWED_HERE 1250
+#define ER_NOT_SUPPORTED_AUTH_MODE 1251
+#define ER_SPATIAL_CANT_HAVE_NULL 1252
+#define ER_COLLATION_CHARSET_MISMATCH 1253
+#define ER_SLAVE_WAS_RUNNING 1254
+#define ER_SLAVE_WAS_NOT_RUNNING 1255
+#define ER_TOO_BIG_FOR_UNCOMPRESS 1256
+#define ER_ZLIB_Z_MEM_ERROR 1257
+#define ER_ZLIB_Z_BUF_ERROR 1258
+#define ER_ZLIB_Z_DATA_ERROR 1259
+#define ER_CUT_VALUE_GROUP_CONCAT 1260
+#define ER_WARN_TOO_FEW_RECORDS 1261
+#define ER_WARN_TOO_MANY_RECORDS 1262
+#define ER_WARN_NULL_TO_NOTNULL 1263
+#define ER_WARN_DATA_OUT_OF_RANGE 1264
+#define ER_WARN_DATA_TRUNCATED 1265
+#define ER_WARN_USING_OTHER_HANDLER 1266
+#define ER_CANT_AGGREGATE_2COLLATIONS 1267
+#define ER_DROP_USER 1268
+#define ER_REVOKE_GRANTS 1269
+#define ER_CANT_AGGREGATE_3COLLATIONS 1270
+#define ER_CANT_AGGREGATE_NCOLLATIONS 1271
+#define ER_VARIABLE_IS_NOT_STRUCT 1272
+#define ER_UNKNOWN_COLLATION 1273
+#define ER_SLAVE_IGNORED_SSL_PARAMS 1274
+#define ER_SERVER_IS_IN_SECURE_AUTH_MODE 1275
+#define ER_WARN_FIELD_RESOLVED 1276
+#define ER_BAD_SLAVE_UNTIL_COND 1277
+#define ER_MISSING_SKIP_SLAVE 1278
+#define ER_UNTIL_COND_IGNORED 1279
+#define ER_WRONG_NAME_FOR_INDEX 1280
+#define ER_WRONG_NAME_FOR_CATALOG 1281
+#define ER_WARN_QC_RESIZE 1282
+#define ER_BAD_FT_COLUMN 1283
+#define ER_UNKNOWN_KEY_CACHE 1284
+#define ER_WARN_HOSTNAME_WONT_WORK 1285
+#define ER_UNKNOWN_STORAGE_ENGINE 1286
+#define ER_WARN_DEPRECATED_SYNTAX 1287
+#define ER_NON_UPDATABLE_TABLE 1288
+#define ER_FEATURE_DISABLED 1289
+#define ER_SKIP_GRANT_TABLES 1290
+#define ER_ERROR_MESSAGES 291