diff options
| author | unknown <pem@mysql.com> | 2003-12-05 13:11:50 +0100 |
|---|---|---|
| committer | unknown <pem@mysql.com> | 2003-12-05 13:11:50 +0100 |
| commit | 4cc04190304fed0f9e7378dfd92d645690631836 (patch) | |
| tree | a07a30ca097bfae53819a79e123ec4c4dd7d751b /include/mysqld_error.h | |
| parent | 7c3be1ba3900042ba97f966858b54589edfc9800 (diff) | |
| parent | 07de836b44434cbab033d02cc47879275080f65c (diff) | |
| download | mariadb-git-4cc04190304fed0f9e7378dfd92d645690631836.tar.gz | |
Merged 4.1 -> 5.0
BitKeeper/etc/ignore:
auto-union
BitKeeper/etc/logging_ok:
auto-union
myisam/mi_check.c:
Auto merged
myisam/myisamchk.c:
Auto merged
myisam/sort.c:
Auto merged
mysql-test/r/variables.result:
Auto merged
mysql-test/t/variables.test:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/mysqld.cc:
Auto merged
sql/set_var.cc:
Auto merged
sql/sql_class.h:
Auto merged
sql/sql_show.cc:
Auto merged
sql/sql_table.cc:
Auto merged
Diffstat (limited to 'include/mysqld_error.h')
| -rw-r--r-- | include/mysqld_error.h | 69 |
1 files changed, 35 insertions, 34 deletions
diff --git a/include/mysqld_error.h b/include/mysqld_error.h index e203c13178e..441f3539773 100644 --- a/include/mysqld_error.h +++ b/include/mysqld_error.h @@ -301,37 +301,38 @@ #define ER_BAD_FT_COLUMN 1282 #define ER_UNKNOWN_KEY_CACHE 1283 #define ER_WARN_HOSTNAME_WONT_WORK 1284 -#define ER_SP_NO_RECURSIVE_CREATE 1285 -#define ER_SP_ALREADY_EXISTS 1286 -#define ER_SP_DOES_NOT_EXIST 1287 -#define ER_SP_DROP_FAILED 1288 -#define ER_SP_STORE_FAILED 1289 -#define ER_SP_LILABEL_MISMATCH 1290 -#define ER_SP_LABEL_REDEFINE 1291 -#define ER_SP_LABEL_MISMATCH 1292 -#define ER_SP_UNINIT_VAR 1293 -#define ER_SP_BADSELECT 1294 -#define ER_SP_BADRETURN 1295 -#define ER_SP_BADSTATEMENT 1296 -#define ER_UPDATE_LOG_DEPRECATED_IGNORED 1297 -#define ER_UPDATE_LOG_DEPRECATED_TRANSLATED 1298 -#define ER_QUERY_INTERRUPTED 1299 -#define ER_SP_WRONG_NO_OF_ARGS 1300 -#define ER_SP_COND_MISMATCH 1301 -#define ER_SP_NORETURN 1302 -#define ER_SP_NORETURNEND 1303 -#define ER_SP_BAD_CURSOR_QUERY 1304 -#define ER_SP_BAD_CURSOR_SELECT 1305 -#define ER_SP_CURSOR_MISMATCH 1306 -#define ER_SP_CURSOR_ALREADY_OPEN 1307 -#define ER_SP_CURSOR_NOT_OPEN 1308 -#define ER_SP_UNDECLARED_VAR 1309 -#define ER_SP_WRONG_NO_OF_FETCH_ARGS 1310 -#define ER_SP_FETCH_NO_DATA 1311 -#define ER_SP_DUP_PARAM 1312 -#define ER_SP_DUP_VAR 1313 -#define ER_SP_DUP_COND 1314 -#define ER_SP_DUP_CURS 1315 -#define ER_SP_CANT_ALTER 1316 -#define ER_SP_SUBSELECT_NYI 1317 -#define ER_ERROR_MESSAGES 318 +#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 |