diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2022-05-09 22:04:06 +0200 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2022-05-09 22:04:06 +0200 |
| commit | ef781162ff2eb97f405b19dc150ab674e91dbc05 (patch) | |
| tree | 63b897dece50ab65652174af4cd0aabd8f3a8505 /sql/share | |
| parent | e9af6b2a4d8750c32d4953f08f8bc5f2e33cb9e3 (diff) | |
| parent | 16cebed54065ad9e18953aa86d48f6007d53c2d3 (diff) | |
| download | mariadb-git-ef781162ff2eb97f405b19dc150ab674e91dbc05.tar.gz | |
Merge branch '10.4' into 10.5
Diffstat (limited to 'sql/share')
| -rw-r--r-- | sql/share/CMakeLists.txt | 30 | ||||
| -rw-r--r-- | sql/share/errmsg-utf8.txt | 8 |
2 files changed, 20 insertions, 18 deletions
diff --git a/sql/share/CMakeLists.txt b/sql/share/CMakeLists.txt index 55f39e5e22b..ddb813057ab 100644 --- a/sql/share/CMakeLists.txt +++ b/sql/share/CMakeLists.txt @@ -15,30 +15,32 @@ # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA SET (dirs +bulgarian +chinese +czech danish -german -slovak dutch -greek -norwegian -spanish english +estonian +french +german +greek +hindi hungarian -norwegian-ny -swedish italian -polish -ukrainian japanese +korean +norwegian-ny +norwegian +polish portuguese romanian -estonian -korean russian -czech -french serbian -hindi +slovak +spanish +swedish +ukrainian ) SET(files diff --git a/sql/share/errmsg-utf8.txt b/sql/share/errmsg-utf8.txt index 3456c635642..9b16247784f 100644 --- a/sql/share/errmsg-utf8.txt +++ b/sql/share/errmsg-utf8.txt @@ -1,4 +1,4 @@ -languages chinese=chi gbk, czech=cze latin2, danish=dan latin1, dutch=nla latin1, english=eng latin1, estonian=est latin7, french=fre latin1, german=ger latin1, greek=greek greek, hungarian=hun latin2, italian=ita latin1, japanese=jpn ujis, korean=kor euckr, norwegian-ny=norwegian-ny latin1, norwegian=nor latin1, polish=pol latin2, portuguese=por latin1, romanian=rum latin2, russian=rus koi8r, serbian=serbian cp1250, slovak=slo latin2, spanish=spa latin1, swedish=swe latin1, ukrainian=ukr koi8u, bulgarian=bgn cp1251, hindi=hindi utf8; +languages bulgarian=bgn cp1251, chinese=chi gbk, czech=cze latin2, danish=dan latin1, dutch=nla latin1, english=eng latin1, estonian=est latin7, french=fre latin1, german=ger latin1, greek=greek greek, hindi=hindi utf8, hungarian=hun latin2, italian=ita latin1, japanese=jpn ujis, korean=kor euckr, norwegian-ny=norwegian-ny latin1, norwegian=nor latin1, polish=pol latin2, portuguese=por latin1, romanian=rum latin2, russian=rus koi8r, serbian=serbian cp1250, slovak=slo latin2, spanish=spa latin1, swedish=swe latin1, ukrainian=ukr koi8u; default-language eng @@ -7678,11 +7678,11 @@ ER_TABLE_IN_SYSTEM_TABLESPACE eng "Table %-.192s in system tablespace" ER_IO_READ_ERROR - chi "IO读取错误:(%lu，%s）%s" + chi "IO读取错误:(%lu，%s)%s" eng "IO Read error: (%lu, %s) %s" ER_IO_WRITE_ERROR - chi "IO写错错误:(%lu，%s）%s" + chi "IO写错错误:(%lu，%s)%s" eng "IO Write error: (%lu, %s) %s" ER_TABLESPACE_MISSING @@ -8567,7 +8567,7 @@ ER_REF_TO_RECURSIVE_WITH_TABLE_IN_DERIVED eng "Reference to recursive WITH table '%s' in materialized derived" ER_NOT_STANDARD_COMPLIANT_RECURSIVE chi "表'%s'R_WRONG_WINDOW_SPEC_NAME违反了递归定义的限制" - eng "Restrictions imposed on recursive definitions are violated for table '%s'"R_WRONG_WINDOW_SPEC_NAME + eng "Restrictions imposed on recursive definitions are violated for table '%s'" ER_WRONG_WINDOW_SPEC_NAME chi "没有定义名称'%s'的窗口规范" eng "Window specification with name '%s' is not defined" |