From f71662695d424aad8f0de3af3044cabc7da72c88 Mon Sep 17 00:00:00 2001 From: unknown Date: Fri, 27 Aug 2004 20:48:19 +0500 Subject: Bug#2451 ALTER doesn't result in an error on CHARACTER SET and COLLATION conflict --- include/mysqld_error.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'include/mysqld_error.h') 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 -- cgit v1.2.1