diff options
| author | antony@ltantony.rdg.cyberkinetica.homeunix.net <> | 2003-12-02 20:57:34 +0000 |
|---|---|---|
| committer | antony@ltantony.rdg.cyberkinetica.homeunix.net <> | 2003-12-02 20:57:34 +0000 |
| commit | 55d4248daed338af0a37709b3930431f1fa7d3fa (patch) | |
| tree | 28430fb68ab7df9013fbdd16332a80afc913c5aa /include | |
| parent | 1be4a37fa2762cf4ffd484d0c7e48b20a2fa2c8e (diff) | |
| parent | afc619f0a2e4351bd39acac53ec2fbc6be266a28 (diff) | |
| download | mariadb-git-55d4248daed338af0a37709b3930431f1fa7d3fa.tar.gz | |
Merge for update
Diffstat (limited to 'include')
| -rw-r--r-- | include/mysqld_error.h | 3 | ||||
| -rw-r--r-- | include/sql_state.h | 1 |
2 files changed, 3 insertions, 1 deletions
diff --git a/include/mysqld_error.h b/include/mysqld_error.h index 6b37b95cc45..bb138f2c7eb 100644 --- a/include/mysqld_error.h +++ b/include/mysqld_error.h @@ -301,4 +301,5 @@ #define ER_BAD_FT_COLUMN 1282 #define ER_UNKNOWN_KEY_CACHE 1283 #define ER_WARN_HOSTNAME_WONT_WORK 1284 -#define ER_ERROR_MESSAGES 285 +#define ER_UNKNOWN_TABLE_ENGINE 1285 +#define ER_ERROR_MESSAGES 286 diff --git a/include/sql_state.h b/include/sql_state.h index a514b1e59fc..ad62ddeb670 100644 --- a/include/sql_state.h +++ b/include/sql_state.h @@ -161,3 +161,4 @@ ER_WARN_DATA_OUT_OF_RANGE, "01000", "", ER_WARN_DATA_TRUNCATED, "01000", "", ER_WRONG_NAME_FOR_INDEX, "42000", "", ER_WRONG_NAME_FOR_CATALOG, "42000", "", +ER_UNKNOWN_TABLE_ENGINE, "42000", "", |