diff options
| author | unknown <bell@sanja.is.com.ua> | 2004-10-05 13:41:51 +0300 |
|---|---|---|
| committer | unknown <bell@sanja.is.com.ua> | 2004-10-05 13:41:51 +0300 |
| commit | 75730fb37e4a730df1dca83da9c8ff63c7122491 (patch) | |
| tree | eff9942a59480da2e462c761af70d6bde1a856fc /include | |
| parent | dc25de58e58bf64c82e290b5c625fb68caa82953 (diff) | |
| parent | 9aa459f0df7e000224e4ac54c5009eac42ef365a (diff) | |
| download | mariadb-git-75730fb37e4a730df1dca83da9c8ff63c7122491.tar.gz | |
merge
sql/item.cc:
Auto merged
sql/item.h:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/sp.cc:
Auto merged
sql/sql_base.cc:
Auto merged
sql/sql_class.h:
Auto merged
sql/sql_help.cc:
Auto merged
sql/sql_lex.cc:
Auto merged
sql/sql_lex.h:
Auto merged
sql/sql_load.cc:
Auto merged
sql/sql_prepare.cc:
Auto merged
sql/sql_select.cc:
Auto merged
sql/sql_yacc.yy:
Auto merged
sql/table.h:
Auto merged
Diffstat (limited to 'include')
| -rw-r--r-- | include/mysqld_error.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/include/mysqld_error.h b/include/mysqld_error.h index 6faf876f2f1..8e0885a556c 100644 --- a/include/mysqld_error.h +++ b/include/mysqld_error.h @@ -386,4 +386,7 @@ #define ER_ILLEGAL_VALUE_FOR_TYPE 1367 #define ER_VIEW_NONUPD_CHECK 1368 #define ER_VIEW_CHECK_FAILED 1369 -#define ER_ERROR_MESSAGES 370 +#define ER_VIEW_MULTIUPDATE 1370 +#define ER_VIEW_NO_INSERT_FIELD_LIST 1371 +#define ER_VIEW_DELETE_MERGE_VIEW 1372 +#define ER_ERROR_MESSAGES 373 |