diff options
| author | unknown <bell@sanja.is.com.ua> | 2004-11-11 21:18:10 +0200 |
|---|---|---|
| committer | unknown <bell@sanja.is.com.ua> | 2004-11-11 21:18:10 +0200 |
| commit | 3bc1fcd409eb08474884a556fef193d707117212 (patch) | |
| tree | b838d2bae358ea54b828bff0e3dfb8a0faf1bc8e /include/mysqld_error.h | |
| parent | e5fd013fdf6c8664daa0bbdcaf0d22bf44e90d62 (diff) | |
| parent | 5b82bc6644fb766c7a04b49d60e70c474450ce28 (diff) | |
| download | mariadb-git-3bc1fcd409eb08474884a556fef193d707117212.tar.gz | |
merge
sql/item_cmpfunc.h:
Auto merged
sql/item_subselect.cc:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/opt_sum.cc:
Auto merged
sql/sp.cc:
Auto merged
sql/sql_class.h:
Auto merged
sql/sql_delete.cc:
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_view.h:
Auto merged
sql/sql_yacc.yy:
Auto merged
Diffstat (limited to 'include/mysqld_error.h')
| -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 1e190496fde..8270dd6ee73 100644 --- a/include/mysqld_error.h +++ b/include/mysqld_error.h @@ -387,4 +387,7 @@ #define ER_VIEW_NONUPD_CHECK 1368 #define ER_VIEW_CHECK_FAILED 1369 #define ER_SP_ACCESS_DENIED_ERROR 1370 -#define ER_ERROR_MESSAGES 371 +#define ER_VIEW_MULTIUPDATE 1371 +#define ER_VIEW_NO_INSERT_FIELD_LIST 1372 +#define ER_VIEW_DELETE_MERGE_VIEW 1373 +#define ER_ERROR_MESSAGES 374 |