diff options
| author | Igor Babaev <igor@askmonty.org> | 2019-02-06 18:01:29 -0800 |
|---|---|---|
| committer | Igor Babaev <igor@askmonty.org> | 2019-02-06 18:01:29 -0800 |
| commit | 3f9040085a0de4976f55bc7e4a2fa5fa8d923100 (patch) | |
| tree | cefa82212b688d12a7ca180f7a0a8f32715e2a79 /sql/share/errmsg-utf8.txt | |
| parent | 16327fc2e76e9215059894b461e8aca7f989da00 (diff) | |
| parent | e80bcd7f64fc8ff6f46c1fc0d01e9c0b0fd03064 (diff) | |
| download | mariadb-git-3f9040085a0de4976f55bc7e4a2fa5fa8d923100.tar.gz | |
Merge branch '10.4' into bb-10.4-mdev17096
Diffstat (limited to 'sql/share/errmsg-utf8.txt')
| -rw-r--r-- | sql/share/errmsg-utf8.txt | 20 |
1 files changed, 17 insertions, 3 deletions
diff --git a/sql/share/errmsg-utf8.txt b/sql/share/errmsg-utf8.txt index 77347472521..e09afebe074 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" @@ -6570,7 +6570,7 @@ ER_ACCESS_DENIED_NO_PASSWORD_ERROR 28000 ukr "Доступ заборонено для користувача: '%s'@'%s'" ER_SET_PASSWORD_AUTH_PLUGIN - eng "SET PASSWORD has no significance for users authenticating via plugins" + eng "SET PASSWORD is ignored for users authenticating via %s plugin" ER_GRANT_PLUGIN_USER_EXISTS eng "GRANT with IDENTIFIED WITH is illegal because the user %-.*s already exists" @@ -7919,3 +7919,17 @@ ER_VERS_QUERY_IN_PARTITION eng "SYSTEM_TIME partitions in table %`s does not support historical query" ER_KEY_DOESNT_SUPPORT eng "%s index %`s does not support this operation" +ER_ALTER_OPERATION_TABLE_OPTIONS_NEED_REBUILD + eng "Changing table options requires the table to be rebuilt" +ER_BACKUP_LOCK_IS_ACTIVE + eng "Can't execute the command as you have a BACKUP STAGE active" +ER_BACKUP_NOT_RUNNING + eng "You must start backup with \"BACKUP STAGE START\"" +ER_BACKUP_WRONG_STAGE + eng "Backup stage '%s' is same or before current backup stage '%s'" +ER_BACKUP_STAGE_FAILED + eng "Backup stage '%s' failed" +ER_BACKUP_UNKNOWN_STAGE + eng "Unknown backup stage: '%s'. Stage should be one of START, FLUSH, BLOCK_DDL, BLOCK_COMMIT or END" +ER_USER_IS_BLOCKED + eng "User is blocked because of too many credential errors; unblock with 'FLUSH PRIVILEGES'" |