diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2017-11-19 14:05:07 +0100 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2017-11-19 14:43:17 +0100 |
| commit | b54aeeb080aba2385204cdd09cba3eedbbf1b891 (patch) | |
| tree | cb3e19f46ca2b25165119073aa495e39eff604f0 /sql/share | |
| parent | 685db2c112b9d5d59a78835d444e23cf754cda7f (diff) | |
| download | mariadb-git-b54aeeb080aba2385204cdd09cba3eedbbf1b891.tar.gz | |
never add new error messages to old GA releases!
this fixes aae4932775d
Diffstat (limited to 'sql/share')
| -rw-r--r-- | sql/share/errmsg-utf8.txt | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/sql/share/errmsg-utf8.txt b/sql/share/errmsg-utf8.txt index 15ec98045ea..0a2d704a94d 100644 --- a/sql/share/errmsg-utf8.txt +++ b/sql/share/errmsg-utf8.txt @@ -1732,8 +1732,8 @@ ER_WRONG_AUTO_KEY 42000 S1009 spa "Puede ser solamente un campo automatico y este debe ser definido como una clave" swe "Det får finnas endast ett AUTO_INCREMENT-fält och detta måste vara en nyckel" ukr "Невірне визначення таблиці; Може бути лише один автоматичний стовбець, що повинен бути визначений як ключ" -ER_UNUSED_9 - eng "You should never see it" +ER_BINLOG_CANT_DELETE_GTID_DOMAIN + eng "Could not delete gtid domain. Reason: %s." ER_NORMAL_SHUTDOWN cze "%s: normální ukončení\n" dan "%s: Normal nedlukning\n" @@ -7118,7 +7118,7 @@ ER_SUBQUERIES_NOT_SUPPORTED 42000 eng "%s does not support subqueries or stored functions." ER_SET_STATEMENT_NOT_SUPPORTED 42000 eng "The system variable %.200s cannot be set in SET STATEMENT." -ER_UNUSED_17 +ER_UNUSED_9 eng "You should never see it" ER_USER_CREATE_EXISTS eng "Can't create user '%-.64s'@'%-.64s'; it already exists" @@ -7142,5 +7142,3 @@ ER_NO_EIS_FOR_FIELD ER_WARN_AGGFUNC_DEPENDENCE eng "Aggregate function '%-.192s)' of SELECT #%d belongs to SELECT #%d" ukr "Агрегатна функція '%-.192s)' з SELECTу #%d належить до SELECTу #%d" -ER_BINLOG_CANT_DELETE_GTID_DOMAIN - eng "Could not delete gtid domain. Reason: %s." |