diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2018-12-18 09:15:41 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2018-12-18 09:15:41 +0200 |
| commit | 45531949ae115f2ba7b9450cc2386653483211ba (patch) | |
| tree | 22809f3919c711d5030d2d0e55be969a7bc67e84 /sql/share/errmsg-utf8.txt | |
| parent | 36b7f8f4b0e46e06cfcc29c221430a5b998e3b3f (diff) | |
| parent | ed13a0d221256028299df4167280e97860ba2edc (diff) | |
| download | mariadb-git-45531949ae115f2ba7b9450cc2386653483211ba.tar.gz | |
Merge 10.2 into 10.3
Diffstat (limited to 'sql/share/errmsg-utf8.txt')
| -rw-r--r-- | sql/share/errmsg-utf8.txt | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/share/errmsg-utf8.txt b/sql/share/errmsg-utf8.txt index a60ddeb3017..9112795b754 100644 --- a/sql/share/errmsg-utf8.txt +++ b/sql/share/errmsg-utf8.txt @@ -5449,8 +5449,8 @@ ER_DIVISION_BY_ZERO 22012 ger "Division durch 0" hindi "0 से विभाजन" ER_TRUNCATED_WRONG_VALUE_FOR_FIELD 22007 - eng "Incorrect %-.32s value: '%-.128s' for column '%.192s' at row %lu" - ger "Falscher %-.32s-Wert: '%-.128s' für Feld '%.192s' in Zeile %lu" + eng "Incorrect %-.32s value: '%-.128s' for column `%.192s`.`%.192s`.`%.192s` at row %lu" + ger "Falscher %-.32s-Wert: '%-.128s' für Feld '`%.192s`.`%.192s`.`%.192s` in Zeile %lu" ER_ILLEGAL_VALUE_FOR_TYPE 22007 eng "Illegal %s '%-.192s' value found during parsing" ger "Nicht zulässiger %s-Wert '%-.192s' beim Parsen gefunden" |