diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2022-06-09 11:53:46 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2022-06-09 11:53:46 +0300 |
| commit | c89e3b70a740f486db2c60270892ba2893bb5610 (patch) | |
| tree | 946650c0e5e1f84ebb6aa19234c665393a963abd /sql/share | |
| parent | 5efadf8d8c6076bbee73e45afe050ab62c517f3c (diff) | |
| parent | 98293130c34cfd39bf2e8c904923abe3942d23be (diff) | |
| download | mariadb-git-c89e3b70a740f486db2c60270892ba2893bb5610.tar.gz | |
Merge 10.3 into 10.4
Diffstat (limited to 'sql/share')
| -rw-r--r-- | sql/share/errmsg-utf8.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/share/errmsg-utf8.txt b/sql/share/errmsg-utf8.txt index ebebb4824cd..d8154255851 100644 --- a/sql/share/errmsg-utf8.txt +++ b/sql/share/errmsg-utf8.txt @@ -8671,7 +8671,7 @@ ER_JSON_ESCAPING eng "Incorrect escaping in JSON text in argument %d to function '%s' at position %d" ER_JSON_DEPTH chi "超过JSON嵌套深度的%d限制 参数%d 函数'%s' 位置%d的" - eng "Limit of %d on JSON nested strucures depth is reached in argument %d to function '%s' at position %d" + eng "Limit of %d on JSON nested structures depth is reached in argument %d to function '%s' at position %d" ER_JSON_PATH_EOS chi "JSON文本路径错误 参数%d 函数'%s'" eng "Unexpected end of JSON path in argument %d to function '%s'" |