summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorunknown <bar@bar.mysql.r18.ru>2003-06-26 15:45:04 +0500
committerunknown <bar@bar.mysql.r18.ru>2003-06-26 15:45:04 +0500
commit1d29092e2dded4d0081932759944de0e5ea3c2a6 (patch)
treeb12f7a29d20314fcc739b16e3cc5822b665a165d /include
parent11e9c572ad1d81536902dd01d48c68ef00ce9018 (diff)
downloadmariadb-git-1d29092e2dded4d0081932759944de0e5ea3c2a6.tar.gz
New messages for 3-adic and N-adic operations
REPLACE() now processed arguments collations according to standard
Diffstat (limited to 'include')
-rw-r--r--include/mysqld_error.h6
1 files changed, 4 insertions, 2 deletions
diff --git a/include/mysqld_error.h b/include/mysqld_error.h
index ccccb188037..565c2812c50 100644
--- a/include/mysqld_error.h
+++ b/include/mysqld_error.h
@@ -281,7 +281,9 @@
#define ER_WARN_DATA_OUT_OF_RANGE 1262
#define ER_WARN_DATA_TRUNCATED 1263
#define ER_WARN_USING_OTHER_HANDLER 1264
-#define ER_CANT_AGGREGATE_COLLATIONS 1265
+#define ER_CANT_AGGREGATE_2COLLATIONS 1265
#define ER_DROP_USER 1266
#define ER_REVOKE_GRANTS 1267
-#define ER_ERROR_MESSAGES 266
+#define ER_CANT_AGGREGATE_3COLLATIONS 1268
+#define ER_CANT_AGGREGATE_NCOLLATIONS 1269
+#define ER_ERROR_MESSAGES 270