Yet another manual merge with main tree for patch for WL#1218 "Triggers"

sql/item.cc:
  Auto merged
sql/item.h:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/item_func.h:
  Auto merged
sql/lex.h:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_delete.cc:
  Auto merged
sql/sql_insert.cc:
  Auto merged
sql/sql_lex.h:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
sql/share/czech/errmsg.txt:
  Auto merged
sql/share/danish/errmsg.txt:
  Auto merged
sql/share/dutch/errmsg.txt:
  Auto merged
sql/share/english/errmsg.txt:
  Auto merged
sql/share/estonian/errmsg.txt:
  Auto merged
sql/share/french/errmsg.txt:
  Auto merged
sql/share/german/errmsg.txt:
  Auto merged
sql/share/greek/errmsg.txt:
  Auto merged
sql/share/hungarian/errmsg.txt:
  Auto merged
sql/share/italian/errmsg.txt:
  Auto merged
sql/share/japanese/errmsg.txt:
  Auto merged
sql/share/korean/errmsg.txt:
  Auto merged
sql/share/norwegian-ny/errmsg.txt:
  Auto merged
sql/share/norwegian/errmsg.txt:
  Auto merged
sql/share/polish/errmsg.txt:
  Auto merged
sql/share/portuguese/errmsg.txt:
  Auto merged
sql/share/romanian/errmsg.txt:
  Auto merged
sql/share/russian/errmsg.txt:
  Auto merged
sql/share/serbian/errmsg.txt:
  Auto merged
sql/share/slovak/errmsg.txt:
  Auto merged
sql/share/spanish/errmsg.txt:
  Auto merged
sql/share/swedish/errmsg.txt:
  Auto merged
sql/share/ukrainian/errmsg.txt:
  Auto merged
include/mysqld_error.h:
  Manual merge.
sql/Makefile.am:
  Manual merge.
sql/mysql_priv.h:
  Manual merge.
sql/sp_head.cc:
  Manual merge.
sql/sql_lex.cc:
  Manual merge.
sql/sql_yacc.yy:
  Manual merge.

1 files changed, 63 insertions, 62 deletions

diff --git a/include/mysqld_error.h b/include/mysqld_error.h
index 1787d98900d..cf032380e2f 100644
--- a/include/mysqld_error.h
+++ b/include/mysqld_error.h
@@ -318,65 +318,66 @@
 #define ER_WARN_INVALID_TIMESTAMP 1299
 #define ER_INVALID_CHARACTER_STRING 1300
 #define ER_WARN_ALLOWED_PACKET_OVERFLOWED 1301
-#define ER_SP_NO_RECURSIVE_CREATE 1302
-#define ER_SP_ALREADY_EXISTS 1303
-#define ER_SP_DOES_NOT_EXIST 1304
-#define ER_SP_DROP_FAILED 1305
-#define ER_SP_STORE_FAILED 1306
-#define ER_SP_LILABEL_MISMATCH 1307
-#define ER_SP_LABEL_REDEFINE 1308
-#define ER_SP_LABEL_MISMATCH 1309
-#define ER_SP_UNINIT_VAR 1310
-#define ER_SP_BADSELECT 1311
-#define ER_SP_BADRETURN 1312
-#define ER_SP_BADSTATEMENT 1313
-#define ER_UPDATE_LOG_DEPRECATED_IGNORED 1314
-#define ER_UPDATE_LOG_DEPRECATED_TRANSLATED 1315
-#define ER_QUERY_INTERRUPTED 1316
-#define ER_SP_WRONG_NO_OF_ARGS 1317
-#define ER_SP_COND_MISMATCH 1318
-#define ER_SP_NORETURN 1319
-#define ER_SP_NORETURNEND 1320
-#define ER_SP_BAD_CURSOR_QUERY 1321
-#define ER_SP_BAD_CURSOR_SELECT 1322
-#define ER_SP_CURSOR_MISMATCH 1323
-#define ER_SP_CURSOR_ALREADY_OPEN 1324
-#define ER_SP_CURSOR_NOT_OPEN 1325
-#define ER_SP_UNDECLARED_VAR 1326
-#define ER_SP_WRONG_NO_OF_FETCH_ARGS 1327
-#define ER_SP_FETCH_NO_DATA 1328
-#define ER_SP_DUP_PARAM 1329
-#define ER_SP_DUP_VAR 1330
-#define ER_SP_DUP_COND 1331
-#define ER_SP_DUP_CURS 1332
-#define ER_SP_CANT_ALTER 1333
-#define ER_SP_SUBSELECT_NYI 1334
-#define ER_SP_NO_USE 1335
-#define ER_SP_VARCOND_AFTER_CURSHNDLR 1336
-#define ER_SP_CURSOR_AFTER_HANDLER 1337
-#define ER_SP_CASE_NOT_FOUND 1338
-#define ER_FPARSER_TOO_BIG_FILE 1339
-#define ER_FPARSER_BAD_HEADER 1340
-#define ER_FPARSER_EOF_IN_COMMENT 1341
-#define ER_FPARSER_ERROR_IN_PARAMETER 1342
-#define ER_FPARSER_EOF_IN_UNKNOWN_PARAMETER 1343
-#define ER_VIEW_NO_EXPLAIN 1344
-#define ER_FRM_UNKNOWN_TYPE 1345
-#define ER_WRONG_OBJECT 1346
-#define ER_NONUPDATEABLE_COLUMN 1347
-#define ER_VIEW_SELECT_DERIVED 1348
-#define ER_VIEW_SELECT_CLAUSE 1349
-#define ER_VIEW_SELECT_VARIABLE 1350
-#define ER_VIEW_SELECT_TMPTABLE 1351
-#define ER_VIEW_WRONG_LIST 1352
-#define ER_WARN_VIEW_MERGE 1353
-#define ER_WARN_VIEW_WITHOUT_KEY 1354
-#define ER_VIEW_INVALID 1355
-#define ER_SP_NO_DROP_SP 1356
-#define ER_SP_GOTO_IN_HNDLR 1357
-#define ER_TRG_ALREADY_EXISTS 1358
-#define ER_TRG_DOES_NOT_EXIST 1359
-#define ER_TRG_ON_VIEW_OR_TEMP_TABLE 1360
-#define ER_TRG_CANT_CHANGE_ROW 1361
-#define ER_TRG_NO_SUCH_ROW_IN_TRG 1362
-#define ER_ERROR_MESSAGES 363
+#define ER_CONFLICTING_DECLARATIONS 1302
+#define ER_SP_NO_RECURSIVE_CREATE 1303
+#define ER_SP_ALREADY_EXISTS 1304
+#define ER_SP_DOES_NOT_EXIST 1305
+#define ER_SP_DROP_FAILED 1306
+#define ER_SP_STORE_FAILED 1307
+#define ER_SP_LILABEL_MISMATCH 1308
+#define ER_SP_LABEL_REDEFINE 1309
+#define ER_SP_LABEL_MISMATCH 1310
+#define ER_SP_UNINIT_VAR 1311
+#define ER_SP_BADSELECT 1312
+#define ER_SP_BADRETURN 1313
+#define ER_SP_BADSTATEMENT 1314
+#define ER_UPDATE_LOG_DEPRECATED_IGNORED 1315
+#define ER_UPDATE_LOG_DEPRECATED_TRANSLATED 1316
+#define ER_QUERY_INTERRUPTED 1317
+#define ER_SP_WRONG_NO_OF_ARGS 1318
+#define ER_SP_COND_MISMATCH 1319
+#define ER_SP_NORETURN 1320
+#define ER_SP_NORETURNEND 1321
+#define ER_SP_BAD_CURSOR_QUERY 1322
+#define ER_SP_BAD_CURSOR_SELECT 1323
+#define ER_SP_CURSOR_MISMATCH 1324
+#define ER_SP_CURSOR_ALREADY_OPEN 1325
+#define ER_SP_CURSOR_NOT_OPEN 1326
+#define ER_SP_UNDECLARED_VAR 1327
+#define ER_SP_WRONG_NO_OF_FETCH_ARGS 1328
+#define ER_SP_FETCH_NO_DATA 1329
+#define ER_SP_DUP_PARAM 1330
+#define ER_SP_DUP_VAR 1331
+#define ER_SP_DUP_COND 1332
+#define ER_SP_DUP_CURS 1333
+#define ER_SP_CANT_ALTER 1334
+#define ER_SP_SUBSELECT_NYI 1335
+#define ER_SP_NO_USE 1336
+#define ER_SP_VARCOND_AFTER_CURSHNDLR 1337
+#define ER_SP_CURSOR_AFTER_HANDLER 1338
+#define ER_SP_CASE_NOT_FOUND 1339
+#define ER_FPARSER_TOO_BIG_FILE 1340
+#define ER_FPARSER_BAD_HEADER 1341
+#define ER_FPARSER_EOF_IN_COMMENT 1342
+#define ER_FPARSER_ERROR_IN_PARAMETER 1343
+#define ER_FPARSER_EOF_IN_UNKNOWN_PARAMETER 1344
+#define ER_VIEW_NO_EXPLAIN 1345
+#define ER_FRM_UNKNOWN_TYPE 1346
+#define ER_WRONG_OBJECT 1347
+#define ER_NONUPDATEABLE_COLUMN 1348
+#define ER_VIEW_SELECT_DERIVED 1349
+#define ER_VIEW_SELECT_CLAUSE 1350
+#define ER_VIEW_SELECT_VARIABLE 1351
+#define ER_VIEW_SELECT_TMPTABLE 1352
+#define ER_VIEW_WRONG_LIST 1353
+#define ER_WARN_VIEW_MERGE 1354
+#define ER_WARN_VIEW_WITHOUT_KEY 1355
+#define ER_VIEW_INVALID 1356
+#define ER_SP_NO_DROP_SP 1357
+#define ER_SP_GOTO_IN_HNDLR 1358
+#define ER_TRG_ALREADY_EXISTS 1359
+#define ER_TRG_DOES_NOT_EXIST 1360
+#define ER_TRG_ON_VIEW_OR_TEMP_TABLE 1361
+#define ER_TRG_CANT_CHANGE_ROW 1362
+#define ER_TRG_NO_SUCH_ROW_IN_TRG 1363
+#define ER_ERROR_MESSAGES 364