summaryrefslogtreecommitdiff
path: root/sql/share
diff options
context:
space:
mode:
authorAlexander Barkov <bar@mariadb.org>2015-03-18 17:10:48 +0400
committerAlexander Barkov <bar@mariadb.org>2015-03-18 17:10:48 +0400
commite28a241907aa7a511b65b196703efaeea71e1dc4 (patch)
tree9456d75e69127d0416592f8036441b17cbe43724 /sql/share
parenta471b7098f50e21565ce4c86efcb05d8310e1d62 (diff)
downloadmariadb-git-e28a241907aa7a511b65b196703efaeea71e1dc4.tar.gz
MDEV-7661 Unexpected result for: CAST(0xHHHH AS CHAR CHARACTER SET xxx)
for incorrect byte sequences
Diffstat (limited to 'sql/share')
-rw-r--r--sql/share/errmsg-utf8.txt2
1 files changed, 2 insertions, 0 deletions
diff --git a/sql/share/errmsg-utf8.txt b/sql/share/errmsg-utf8.txt
index 6b09b4cf769..9dff16b2be1 100644
--- a/sql/share/errmsg-utf8.txt
+++ b/sql/share/errmsg-utf8.txt
@@ -7125,3 +7125,5 @@ ER_ROLE_CREATE_EXISTS
eng "Can't create role '%-.64s'; it already exists"
ER_ROLE_DROP_EXISTS
eng "Can't drop role '%-.64s'; it doesn't exist"
+ER_CANNOT_CONVERT_CHARACTER
+ eng "Cannot convert '%s' character 0x%-.64s to '%s'"