diff options
| author | unknown <bell@sanja.is.com.ua> | 2004-10-28 11:02:48 +0300 |
|---|---|---|
| committer | unknown <bell@sanja.is.com.ua> | 2004-10-28 11:02:48 +0300 |
| commit | 46ce3d00921491398d2e9a00c2b03e67540dee23 (patch) | |
| tree | 70b19d638c9beac263179291143f76c5af8757f4 /include/mysqld_error.h | |
| parent | 93678f6bd9be1d320a63ae3fcf24493dae065ae7 (diff) | |
| parent | f41bba8c6156a7adf4c67dfa75e16112767a5d3c (diff) | |
| download | mariadb-git-46ce3d00921491398d2e9a00c2b03e67540dee23.tar.gz | |
merge
mysql-test/r/sp-security.result:
Auto merged
mysql-test/r/sp.result:
Auto merged
mysql-test/t/sp-security.test:
Auto merged
mysql-test/t/sp.test:
Auto merged
sql/log_event.cc:
Auto merged
sql/set_var.cc:
Auto merged
sql/sp.cc:
Auto merged
sql/sp_rcontext.cc:
Auto merged
sql/sql_base.cc:
Auto merged
sql/sql_insert.cc:
Auto merged
sql/sql_load.cc:
Auto merged
sql/sql_yacc.yy:
Auto merged
Diffstat (limited to 'include/mysqld_error.h')
| -rw-r--r-- | include/mysqld_error.h | 41 |
1 files changed, 21 insertions, 20 deletions
diff --git a/include/mysqld_error.h b/include/mysqld_error.h index 93438f98255..f98bb4cb75c 100644 --- a/include/mysqld_error.h +++ b/include/mysqld_error.h @@ -386,23 +386,24 @@ #define ER_ILLEGAL_VALUE_FOR_TYPE 1367 #define ER_VIEW_NONUPD_CHECK 1368 #define ER_VIEW_CHECK_FAILED 1369 -#define ER_RELAY_LOG_FAIL 1370 -#define ER_PASSWD_LENGTH 1371 -#define ER_UNKNOWN_TARGET_BINLOG 1372 -#define ER_IO_ERR_LOG_INDEX_READ 1373 -#define ER_BINLOG_PURGE_PROHIBITED 1374 -#define ER_FSEEK_FAIL 1375 -#define ER_BINLOG_PURGE_FATAL_ERR 1376 -#define ER_LOG_IN_USE 1377 -#define ER_LOG_PURGE_UNKNOWN_ERR 1378 -#define ER_RELAY_LOG_INIT 1379 -#define ER_NO_BINARY_LOGGING 1380 -#define ER_RESERVED_SYNTAX 1381 -#define ER_WSAS_FAILED 1382 -#define ER_DIFF_GROUPS_PROC 1383 -#define ER_NO_GROUP_FOR_PROC 1384 -#define ER_ORDER_WITH_PROC 1385 -#define ER_LOGING_PROHIBIT_CHANGING_OF 1386 -#define ER_NO_FILE_MAPPING 1387 -#define ER_WRONG_MAGIC 1388 -#define ER_ERROR_MESSAGES 389 +#define ER_SP_ACCESS_DENIED_ERROR 1370 +#define ER_RELAY_LOG_FAIL 1371 +#define ER_PASSWD_LENGTH 1372 +#define ER_UNKNOWN_TARGET_BINLOG 1373 +#define ER_IO_ERR_LOG_INDEX_READ 1374 +#define ER_BINLOG_PURGE_PROHIBITED 1375 +#define ER_FSEEK_FAIL 1376 +#define ER_BINLOG_PURGE_FATAL_ERR 1377 +#define ER_LOG_IN_USE 1378 +#define ER_LOG_PURGE_UNKNOWN_ERR 1379 +#define ER_RELAY_LOG_INIT 1380 +#define ER_NO_BINARY_LOGGING 1381 +#define ER_RESERVED_SYNTAX 1382 +#define ER_WSAS_FAILED 1383 +#define ER_DIFF_GROUPS_PROC 1384 +#define ER_NO_GROUP_FOR_PROC 1385 +#define ER_ORDER_WITH_PROC 1386 +#define ER_LOGING_PROHIBIT_CHANGING_OF 1387 +#define ER_NO_FILE_MAPPING 1388 +#define ER_WRONG_MAGIC 1389 +#define ER_ERROR_MESSAGES 390 |