summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorunknown <bar@bar.mysql.r18.ru>2003-03-02 14:05:03 +0400
committerunknown <bar@bar.mysql.r18.ru>2003-03-02 14:05:03 +0400
commit10190533925b35f7a9c22548751ca9c917aed93d (patch)
treedcde912eca28f9bc0b31e164c7918c8674948a04 /include
parent0d19df2f5d019657b46d11f9e725b2eea704e209 (diff)
downloadmariadb-git-10190533925b35f7a9c22548751ca9c917aed93d.tar.gz
New error message for situation like:
SELECT latin1_expr COLLATE anpther_charset_collation
Diffstat (limited to 'include')
-rw-r--r--include/mysqld_error.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/include/mysqld_error.h b/include/mysqld_error.h
index d2d2ded41af..ca3fe07e889 100644
--- a/include/mysqld_error.h
+++ b/include/mysqld_error.h
@@ -267,4 +267,5 @@
#define ER_TABLENAME_NOT_ALLOWED_HERE 1248
#define ER_NOT_SUPPORTED_AUTH_MODE 1249
#define ER_SPATIAL_CANT_HAVE_NULL 1250
-#define ER_ERROR_MESSAGES 251
+#define ER_COLLATION_CHARSET_MISMATCH 1251
+#define ER_ERROR_MESSAGES 252