diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2022-06-09 12:22:55 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2022-06-09 12:22:55 +0300 |
| commit | a9d0bb12e68a11c119a3534f354c7a7ef13dd5b5 (patch) | |
| tree | d8fe35019461ba33ca4469131d92a2307cbade7e /sql/share | |
| parent | 4145618103253f634027d15dab3618abfd4ff227 (diff) | |
| parent | c89e3b70a740f486db2c60270892ba2893bb5610 (diff) | |
| download | mariadb-git-a9d0bb12e68a11c119a3534f354c7a7ef13dd5b5.tar.gz | |
Merge 10.4 into 10.5
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 11b9775a4f9..07f00a9fa81 100644 --- a/sql/share/errmsg-utf8.txt +++ b/sql/share/errmsg-utf8.txt @@ -8680,7 +8680,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'" |