diff options
| author | unknown <bell@sanja.is.com.ua> | 2004-01-20 19:23:28 +0200 |
|---|---|---|
| committer | unknown <bell@sanja.is.com.ua> | 2004-01-20 19:23:28 +0200 |
| commit | c3cf3d28209702a521a736daa6f797c2407db715 (patch) | |
| tree | 58e31138eff605c80015c3b969fe8ff835561ec8 /include | |
| parent | fe21bfb60aaf56796350d3622f906b87e20d5ce8 (diff) | |
| parent | 7a1a5cd2d828d67120d10eb623c6c5bd83733260 (diff) | |
| download | mariadb-git-c3cf3d28209702a521a736daa6f797c2407db715.tar.gz | |
Merge
sql/sql_parse.cc:
Auto merged
sql/sql_update.cc:
Auto merged
sql/sql_yacc.yy:
Auto merged
mysql-test/r/derived.result:
SCCS merged
mysql-test/t/derived.test:
e
merge
Diffstat (limited to 'include')
| -rw-r--r-- | include/mysqld_error.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/include/mysqld_error.h b/include/mysqld_error.h index 6a484d0419c..179a2f823d7 100644 --- a/include/mysqld_error.h +++ b/include/mysqld_error.h @@ -303,4 +303,5 @@ #define ER_WARN_HOSTNAME_WONT_WORK 1284 #define ER_UNKNOWN_STORAGE_ENGINE 1285 #define ER_WARN_DEPRECATED_SYNTAX 1286 -#define ER_ERROR_MESSAGES 287 +#define ER_NON_UPDATABLE_TABLE 1287 +#define ER_ERROR_MESSAGES 288 |