Merge 4.1 to 5.0.

mysql-test/r/distinct.result:
  Auto merged
mysql-test/r/func_time.result:
  Auto merged
mysql-test/r/join_outer.result:
  Auto merged
mysql-test/r/multi_update.result:
  Auto merged
mysql-test/r/mysqldump.result:
  Auto merged
mysql-test/r/null.result:
  Auto merged
mysql-test/r/query_cache.result:
  Auto merged
mysql-test/r/show_check.result:
  Auto merged
mysql-test/r/status.result:
  Auto merged
mysql-test/r/subselect.result:
  Auto merged
mysql-test/r/symlink.result:
  Auto merged
mysql-test/t/distinct.test:
  Auto merged
mysql-test/t/func_time.test:
  Auto merged
mysql-test/t/multi_update.test:
  Auto merged
mysql-test/t/null.test:
  Auto merged
mysql-test/t/query_cache.test:
  Auto merged
mysql-test/t/subselect.test:
  Auto merged
sql/item.cc:
  Auto merged
sql/item_cmpfunc.cc:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/sql_show.cc:
  Auto merged

1 files changed, 35 insertions, 34 deletions

diff --git a/include/mysqld_error.h b/include/mysqld_error.h
index 441f3539773..4f2c387dbc3 100644
--- a/include/mysqld_error.h
+++ b/include/mysqld_error.h
@@ -302,37 +302,38 @@
 #define ER_UNKNOWN_KEY_CACHE 1283
 #define ER_WARN_HOSTNAME_WONT_WORK 1284
 #define ER_UNKNOWN_TABLE_ENGINE 1285
-#define ER_SP_NO_RECURSIVE_CREATE 1286
-#define ER_SP_ALREADY_EXISTS 1287
-#define ER_SP_DOES_NOT_EXIST 1288
-#define ER_SP_DROP_FAILED 1289
-#define ER_SP_STORE_FAILED 1290
-#define ER_SP_LILABEL_MISMATCH 1291
-#define ER_SP_LABEL_REDEFINE 1292
-#define ER_SP_LABEL_MISMATCH 1293
-#define ER_SP_UNINIT_VAR 1294
-#define ER_SP_BADSELECT 1295
-#define ER_SP_BADRETURN 1296
-#define ER_SP_BADSTATEMENT 1297
-#define ER_UPDATE_LOG_DEPRECATED_IGNORED 1298
-#define ER_UPDATE_LOG_DEPRECATED_TRANSLATED 1299
-#define ER_QUERY_INTERRUPTED 1300
-#define ER_SP_WRONG_NO_OF_ARGS 1301
-#define ER_SP_COND_MISMATCH 1302
-#define ER_SP_NORETURN 1303
-#define ER_SP_NORETURNEND 1304
-#define ER_SP_BAD_CURSOR_QUERY 1305
-#define ER_SP_BAD_CURSOR_SELECT 1306
-#define ER_SP_CURSOR_MISMATCH 1307
-#define ER_SP_CURSOR_ALREADY_OPEN 1308
-#define ER_SP_CURSOR_NOT_OPEN 1309
-#define ER_SP_UNDECLARED_VAR 1310
-#define ER_SP_WRONG_NO_OF_FETCH_ARGS 1311
-#define ER_SP_FETCH_NO_DATA 1312
-#define ER_SP_DUP_PARAM 1313
-#define ER_SP_DUP_VAR 1314
-#define ER_SP_DUP_COND 1315
-#define ER_SP_DUP_CURS 1316
-#define ER_SP_CANT_ALTER 1317
-#define ER_SP_SUBSELECT_NYI 1318
-#define ER_ERROR_MESSAGES 319
+#define ER_WARN_DEPRECATED_SYNTAX 1286
+#define ER_SP_NO_RECURSIVE_CREATE 1287
+#define ER_SP_ALREADY_EXISTS 1288
+#define ER_SP_DOES_NOT_EXIST 1289
+#define ER_SP_DROP_FAILED 1290
+#define ER_SP_STORE_FAILED 1291
+#define ER_SP_LILABEL_MISMATCH 1292
+#define ER_SP_LABEL_REDEFINE 1293
+#define ER_SP_LABEL_MISMATCH 1294
+#define ER_SP_UNINIT_VAR 1295
+#define ER_SP_BADSELECT 1296
+#define ER_SP_BADRETURN 1297
+#define ER_SP_BADSTATEMENT 1298
+#define ER_UPDATE_LOG_DEPRECATED_IGNORED 1299
+#define ER_UPDATE_LOG_DEPRECATED_TRANSLATED 1300
+#define ER_QUERY_INTERRUPTED 1301
+#define ER_SP_WRONG_NO_OF_ARGS 1302
+#define ER_SP_COND_MISMATCH 1303
+#define ER_SP_NORETURN 1304
+#define ER_SP_NORETURNEND 1305
+#define ER_SP_BAD_CURSOR_QUERY 1306
+#define ER_SP_BAD_CURSOR_SELECT 1307
+#define ER_SP_CURSOR_MISMATCH 1308
+#define ER_SP_CURSOR_ALREADY_OPEN 1309
+#define ER_SP_CURSOR_NOT_OPEN 1310
+#define ER_SP_UNDECLARED_VAR 1311
+#define ER_SP_WRONG_NO_OF_FETCH_ARGS 1312
+#define ER_SP_FETCH_NO_DATA 1313
+#define ER_SP_DUP_PARAM 1314
+#define ER_SP_DUP_VAR 1315
+#define ER_SP_DUP_COND 1316
+#define ER_SP_DUP_CURS 1317
+#define ER_SP_CANT_ALTER 1318
+#define ER_SP_SUBSELECT_NYI 1319
+#define ER_ERROR_MESSAGES 320