diff options
| author | unknown <bell@sanja.is.com.ua> | 2004-11-21 20:08:12 +0200 |
|---|---|---|
| committer | unknown <bell@sanja.is.com.ua> | 2004-11-21 20:08:12 +0200 |
| commit | 5a00a868b74ffb6b220eb72c87ec38696ce9406c (patch) | |
| tree | 76a673d7a9b20f184988993cc14ce455b1d73f70 /include/mysqld_error.h | |
| parent | 436c7714dd6df991f2e968b313906d4b1e70db97 (diff) | |
| parent | c9497e2365461fb2547a8cfceb33b68a99d7fe0b (diff) | |
| download | mariadb-git-5a00a868b74ffb6b220eb72c87ec38696ce9406c.tar.gz | |
merge
sql/item.cc:
Auto merged
sql/item.h:
Auto merged
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_acl.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_load.cc:
Auto merged
sql/sql_parse.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 a581453f576..478b46dd246 100644 --- a/include/mysqld_error.h +++ b/include/mysqld_error.h @@ -409,4 +409,7 @@ #define ER_PS_MANY_PARAM 1390 #define ER_KEY_PART_0 1391 #define ER_VIEW_CHECKSUM 1392 -#define ER_ERROR_MESSAGES 393 +#define ER_VIEW_MULTIUPDATE 1393 +#define ER_VIEW_NO_INSERT_FIELD_LIST 1394 +#define ER_VIEW_DELETE_MERGE_VIEW 1395 +#define ER_ERROR_MESSAGES 396 |