diff --git a/mysql-test/r/check_constraint.result b/mysql-test/r/check_constraint.result
index 5a1afd64e5b..005415f7124 100644
--- a/mysql-test/r/check_constraint.result
+++ b/mysql-test/r/check_constraint.result
@@ -27,7 +27,7 @@ a	b
 truncate table t1;
 insert ignore into t1 values (101,101),(102,102),(600,600),(103,103);
 Warnings:
-Warning	4016	CONSTRAINT `max` failed for `test`.`t1`
+Warning	4022	CONSTRAINT `max` failed for `test`.`t1`
 select * from t1;
 a	b
 101	101
diff --git a/sql/share/errmsg-utf8.txt b/sql/share/errmsg-utf8.txt
index 980055a7933..fad639a5ec5 100644
--- a/sql/share/errmsg-utf8.txt
+++ b/sql/share/errmsg-utf8.txt
@@ -7141,21 +7141,6 @@ ER_KILL_QUERY_DENIED_ERROR
 ER_NO_EIS_FOR_FIELD
         eng "Engine-independent statistics are not collected for column '%s'"
         ukr "Незалежна від типу таблиці статистика не збирається для стовбця '%s'"
-ER_COMMULTI_BADCONTEXT 0A000
-        eng "COM_MULTI can't return a result set in the given context"
-        ger "COM_MULTI kann im gegebenen Kontext keine Ergebnismenge zurückgeben"
-        ukr "COM_MULTI не може повернути результати у цьому контексті"
-ER_BAD_COMMAND_IN_MULTI
-        eng "Command '%s' is not allowed for COM_MULTI"
-        ukr "Команда '%s' не дозволена для COM_MULTI"
-ER_WITH_COL_WRONG_LIST
-        eng "WITH column list and SELECT field list have different column counts"
-ER_DUP_QUERY_NAME
-        eng "Duplicate query name in WITH clause"
-ER_WRONG_ORDER_IN_WITH_CLAUSE
-        eng "The definition of the table '%s' refers to the table '%s' defined later in a non-recursive WITH clause"
-ER_RECURSIVE_QUERY_IN_WITH_CLAUSE
-        eng "Recursive queries in WITH clause are not supported yet"
 
 #
 # Internal errors, not used
@@ -7171,6 +7156,21 @@ ER_MYSQL_57_TEST
 # MariaDB extra error numbers starts from 4000
 skip-to-error-number 4000
 
+ER_COMMULTI_BADCONTEXT 0A000
+        eng "COM_MULTI can't return a result set in the given context"
+        ger "COM_MULTI kann im gegebenen Kontext keine Ergebnismenge zurückgeben"
+        ukr "COM_MULTI не може повернути результати у цьому контексті"
+ER_BAD_COMMAND_IN_MULTI
+        eng "Command '%s' is not allowed for COM_MULTI"
+        ukr "Команда '%s' не дозволена для COM_MULTI"
+ER_WITH_COL_WRONG_LIST
+        eng "WITH column list and SELECT field list have different column counts"
+ER_DUP_QUERY_NAME
+        eng "Duplicate query name in WITH clause"
+ER_WRONG_ORDER_IN_WITH_CLAUSE
+        eng "The definition of the table '%s' refers to the table '%s' defined later in a non-recursive WITH clause"
+ER_RECURSIVE_QUERY_IN_WITH_CLAUSE
+        eng "Recursive queries in WITH clause are not supported yet"
 ER_WRONG_WINDOW_SPEC_NAME
         eng "Window specification with name '%s' is not defined"
 ER_DUP_WINDOW_NAME