diff options
| author | unknown <hf@deer.(none)> | 2004-01-23 20:00:10 +0400 |
|---|---|---|
| committer | unknown <hf@deer.(none)> | 2004-01-23 20:00:10 +0400 |
| commit | a6132c6f0a742d04f0c0252f83be8b356507c9a6 (patch) | |
| tree | 49de7fcd3c746734425c8deed43728660a8047dc /include/mysqld_error.h | |
| parent | 2320323a344759567d702b257fb965646e6d8e7a (diff) | |
| parent | 87b3ca5fe0f66b0d7546b6175d8b1d50d6d3a838 (diff) | |
| download | mariadb-git-a6132c6f0a742d04f0c0252f83be8b356507c9a6.tar.gz | |
Conflicts resolved
sql/field.cc:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/sql_table.cc:
Auto merged
sql/sql_yacc.yy:
Auto merged
sql/table.cc:
Auto merged
include/mysqld_error.h:
merging
sql/share/english/errmsg.txt:
merging
Diffstat (limited to 'include/mysqld_error.h')
| -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 179a2f823d7..80cfed9e338 100644 --- a/include/mysqld_error.h +++ b/include/mysqld_error.h @@ -304,4 +304,5 @@ #define ER_UNKNOWN_STORAGE_ENGINE 1285 #define ER_WARN_DEPRECATED_SYNTAX 1286 #define ER_NON_UPDATABLE_TABLE 1287 -#define ER_ERROR_MESSAGES 288 +#define ER_FEATURE_DISABLED 1288 +#define ER_ERROR_MESSAGES 289 |