summaryrefslogtreecommitdiff
path: root/sql/derror.cc
diff options
context:
space:
mode:
authorDaniel Black <daniel@mariadb.org>2023-03-08 12:27:31 +1100
committerDaniel Black <daniel@mariadb.org>2023-03-10 08:53:58 +1100
commitb600671f758cac2ed595b5342033c8f92921eade (patch)
treed82efb71d4c7bdd8b8c5cbea54429dce413a28da /sql/derror.cc
parentb4c7f5e670f5fa5e59295039937e516f0ab543da (diff)
downloadmariadb-git-b600671f758cac2ed595b5342033c8f92921eade.tar.gz
MDEV-30810 errmsg-utf8.txt no longer uses charsets
Charset names in the 'languages' line are not used any more. Removing to avoid confusion. All messages in errmsg-utf8.txt are in utf8 now. Charset names should have been removed in MySQL-5.5 during: https://dev.mysql.com/worklog/task/?id=751 Bump version number.
Diffstat (limited to 'sql/derror.cc')
-rw-r--r--sql/derror.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/derror.cc b/sql/derror.cc
index 187d5bc20d2..455e57fd2d7 100644
--- a/sql/derror.cc
+++ b/sql/derror.cc
@@ -258,7 +258,7 @@ static File open_error_msg_file(const char *file_name, const char *language,
goto err;
error_pos=2;
if (head[0] != (uchar) 254 || head[1] != (uchar) 254 ||
- head[2] != 2 || head[3] != 4)
+ head[2] != 2 || head[3] != 5)
goto err; /* purecov: inspected */
ret->text_length= uint4korr(head+6);