summaryrefslogtreecommitdiff
path: root/sql/share/errmsg-utf8.txt
diff options
context:
space:
mode:
authorMarko Mäkelä <marko.makela@mariadb.com>2022-11-17 21:35:12 +0200
committerMarko Mäkelä <marko.makela@mariadb.com>2022-11-17 21:35:12 +0200
commitf46efb4476d4cb7401ea73e4c452d9460bdd0f33 (patch)
tree7322dc983c668ea995631a4697d489a33db429e0 /sql/share/errmsg-utf8.txt
parent038cd5195612084542704f181695358e3b8959a8 (diff)
parentd5332086d7aa1eaef9da5850d38dd1489fad7032 (diff)
downloadmariadb-git-f46efb4476d4cb7401ea73e4c452d9460bdd0f33.tar.gz
Merge 10.7 into 10.8
Diffstat (limited to 'sql/share/errmsg-utf8.txt')
-rw-r--r--sql/share/errmsg-utf8.txt6
1 files changed, 3 insertions, 3 deletions
diff --git a/sql/share/errmsg-utf8.txt b/sql/share/errmsg-utf8.txt
index 4c7f71f4718..de5117e0246 100644
--- a/sql/share/errmsg-utf8.txt
+++ b/sql/share/errmsg-utf8.txt
@@ -9773,9 +9773,9 @@ ER_UNUSED_23
spa "Nunca debería vd de ver esto"
ER_PARTITION_WRONG_TYPE
- chi "错误的分区类型,预期类型:%`s"
- eng "Wrong partitioning type, expected type: %`s"
- spa "Tipo de partición equivocada, tipo esperado: %`s"
+ chi "错误的分区类型,预期类型:%`s for partitioning by %`s"
+ eng "Wrong partition type %`s for partitioning by %`s"
+ spa "Tipo de partición equivocada, tipo esperado: %`s for partitioning by %`s"
WARN_VERS_PART_FULL
chi "版本化表%`s.%`s:partition%`s已满,添加更多历史分区(out of %s)"