mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-17 04:22:27 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

move all new 10.2 error codes to start from 4000

Browse source
This commit is contained in:
Sergei Golubchik 2016-06-29 10:02:02 +02:00
parent 5f22379fc8
commit 047d762d51
2 changed files with 16 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
mysql-test/r/check_constraint.result
View file

@ -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

30
sql/share/errmsg-utf8.txt
View file

@ -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