diff options
| author | unknown <monty@mishka.local> | 2004-10-05 01:10:23 +0300 |
|---|---|---|
| committer | unknown <monty@mishka.local> | 2004-10-05 01:10:23 +0300 |
| commit | 45a7c6581fa89f638d09e4063341d138679ce1f4 (patch) | |
| tree | 61d4fef7b2a5c71ac7fff85c77ebd1a8d090e8d1 /include | |
| parent | faea84119ba2779ed76e91e44af0928919868442 (diff) | |
| parent | c7cf529f32b64447b389131eb61a6f8879eb4d82 (diff) | |
| download | mariadb-git-45a7c6581fa89f638d09e4063341d138679ce1f4.tar.gz | |
merge
mysql-test/r/sp.result:
Auto merged
sql/sql_insert.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_update.cc:
Auto merged
sql/sql_yacc.yy:
Auto merged
sql/table.cc:
Auto merged
Diffstat (limited to 'include')
| -rw-r--r-- | include/mysqld_error.h | 7 | ||||
| -rw-r--r-- | include/sql_state.h | 3 |
2 files changed, 6 insertions, 4 deletions
diff --git a/include/mysqld_error.h b/include/mysqld_error.h index f2ee738b34f..6faf876f2f1 100644 --- a/include/mysqld_error.h +++ b/include/mysqld_error.h @@ -383,6 +383,7 @@ #define ER_NO_DEFAULT_FOR_FIELD 1364 #define ER_DIVISION_BY_ZERO 1365 #define ER_TRUNCATED_WRONG_VALUE_FOR_FIELD 1366 -#define ER_VIEW_NONUPD_CHECK 1367 -#define ER_VIEW_CHECK_FAILED 1368 -#define ER_ERROR_MESSAGES 369 +#define ER_ILLEGAL_VALUE_FOR_TYPE 1367 +#define ER_VIEW_NONUPD_CHECK 1368 +#define ER_VIEW_CHECK_FAILED 1369 +#define ER_ERROR_MESSAGES 370 diff --git a/include/sql_state.h b/include/sql_state.h index 0b31fc07933..bd3e8b9b3ef 100644 --- a/include/sql_state.h +++ b/include/sql_state.h @@ -156,7 +156,7 @@ ER_SPATIAL_CANT_HAVE_NULL, "42000", "", ER_COLLATION_CHARSET_MISMATCH, "42000", "", ER_WARN_TOO_FEW_RECORDS, "01000", "", ER_WARN_TOO_MANY_RECORDS, "01000", "", -ER_WARN_NULL_TO_NOTNULL, "01000", "", +ER_WARN_NULL_TO_NOTNULL, "22004", "", ER_WARN_DATA_OUT_OF_RANGE, "22003", "", ER_WARN_DATA_TRUNCATED, "01000", "", ER_WRONG_NAME_FOR_INDEX, "42000", "", @@ -202,3 +202,4 @@ ER_SP_VARCOND_AFTER_CURSHNDLR, "42000", "", ER_SP_CURSOR_AFTER_HANDLER, "42000", "", ER_SP_CASE_NOT_FOUND, "20000", "", ER_DIVISION_BY_ZERO, "22012", "", +ER_ILLEGAL_VALUE_FOR_TYPE, "22007", "", |