diff options
| author | bar@mysql.com <> | 2004-08-27 20:48:19 +0500 |
|---|---|---|
| committer | bar@mysql.com <> | 2004-08-27 20:48:19 +0500 |
| commit | b6041645991f23df7054f9925b150fd1fa4e8f8e (patch) | |
| tree | 67e81853323170190c43b1f4547ab5c8853c78e5 /include/mysqld_error.h | |
| parent | e8fcc297e162148d7ad6ff42258d077ace1c3304 (diff) | |
| download | mariadb-git-b6041645991f23df7054f9925b150fd1fa4e8f8e.tar.gz | |
Bug#2451 ALTER doesn't result in an error on CHARACTER SET and COLLATION conflict
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 4d65515d6ce..776869ff045 100644 --- a/include/mysqld_error.h +++ b/include/mysqld_error.h @@ -318,4 +318,5 @@ #define ER_WARN_INVALID_TIMESTAMP 1299 #define ER_INVALID_CHARACTER_STRING 1300 #define ER_WARN_ALLOWED_PACKET_OVERFLOWED 1301 -#define ER_ERROR_MESSAGES 302 +#define ER_CONFLICTING_DECLARATIONS 1302 +#define ER_ERROR_MESSAGES 303 |