diff options
author | unknown <bell@sanja.is.com.ua> | 2004-10-04 13:56:48 +0300 |
---|---|---|
committer | unknown <bell@sanja.is.com.ua> | 2004-10-04 13:56:48 +0300 |
commit | faea84119ba2779ed76e91e44af0928919868442 (patch) | |
tree | 2339a9b67770ece89b7e96ac64db90238c5d64f9 /include | |
parent | 99bf885bf5044d99d0597f5e177162c851e32359 (diff) | |
parent | 50cc3e4ab0765fb987b739fdf163e4e1a609fd76 (diff) | |
download | mariadb-git-faea84119ba2779ed76e91e44af0928919868442.tar.gz |
merge
sql/sql_class.h:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_update.cc:
Auto merged
sql/table.cc:
Auto merged
Diffstat (limited to 'include')
-rw-r--r-- | include/mysqld_error.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/include/mysqld_error.h b/include/mysqld_error.h index 36dd4d00ef2..f2ee738b34f 100644 --- a/include/mysqld_error.h +++ b/include/mysqld_error.h @@ -383,4 +383,6 @@ #define ER_NO_DEFAULT_FOR_FIELD 1364 #define ER_DIVISION_BY_ZERO 1365 #define ER_TRUNCATED_WRONG_VALUE_FOR_FIELD 1366 -#define ER_ERROR_MESSAGES 367 +#define ER_VIEW_NONUPD_CHECK 1367 +#define ER_VIEW_CHECK_FAILED 1368 +#define ER_ERROR_MESSAGES 369 |