summaryrefslogtreecommitdiff
path: root/sql/share
diff options
context:
space:
mode:
authorMarko Mäkelä <marko.makela@mariadb.com>2022-06-09 13:34:52 +0300
committerMarko Mäkelä <marko.makela@mariadb.com>2022-06-09 13:34:52 +0300
commite11b82f8f5c7006f7bf271f0db8e8c514cc9baad (patch)
treed44b413b5cd14a296a0069eea9e82c1f26f3b61e /sql/share
parent77b3959b5c1528f33ada7aa4445cccf5b5e197b0 (diff)
parenta9d0bb12e68a11c119a3534f354c7a7ef13dd5b5 (diff)
downloadmariadb-git-e11b82f8f5c7006f7bf271f0db8e8c514cc9baad.tar.gz
Merge 10.5 into 10.6
Diffstat (limited to 'sql/share')
-rw-r--r--sql/share/errmsg-utf8.txt2
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/share/errmsg-utf8.txt b/sql/share/errmsg-utf8.txt
index 8ca33df033a..b5ac5258237 100644
--- a/sql/share/errmsg-utf8.txt
+++ b/sql/share/errmsg-utf8.txt
@@ -9444,7 +9444,7 @@ ER_JSON_ESCAPING
spa "Incorrecta escapatoria en texto JSON en argumento %d a función '%s' en la posicón %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"
spa "El límite de %d en profundidad de estructuras JSON anidadas se ha alcanzado en argumento %d a función '%s' en la posición %d"
ER_JSON_PATH_EOS
chi "JSON文本路径错误 参数%d 函数'%s'"