diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2022-09-07 08:26:21 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2022-09-07 08:26:21 +0300 |
| commit | 38d36b59f925dc19f5b8346b3e54bec782771967 (patch) | |
| tree | 2a7aa642243541497db4f11a4ba5f893353c1701 /sql/share | |
| parent | 38dda1f026fa9ff449950b4497b6bde04dc28734 (diff) | |
| parent | c7ba2377936be2a3c84080359d87f7486ce682a0 (diff) | |
| download | mariadb-git-38d36b59f925dc19f5b8346b3e54bec782771967.tar.gz | |
Merge 10.4 into 10.5
Diffstat (limited to 'sql/share')
| -rw-r--r-- | sql/share/errmsg-utf8.txt | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/sql/share/errmsg-utf8.txt b/sql/share/errmsg-utf8.txt index 718a69e2cc2..6155551854b 100644 --- a/sql/share/errmsg-utf8.txt +++ b/sql/share/errmsg-utf8.txt @@ -7144,8 +7144,9 @@ ER_BINLOG_UNSAFE_NONTRANS_AFTER_TRANS chi "语句不安全，因为它在访问同一事务中访问事务表后访问非事务性表" eng "Statement is unsafe because it accesses a non-transactional table after accessing a transactional table within the same transaction" ER_MESSAGE_AND_STATEMENT - chi "%s语句：%s" - eng "%s Statement: %s" + chi "%s．语句：%s" + eng "%s. Statement: %s" + ER_SLAVE_CONVERSION_FAILED chi "列%d表'%-.192s.%-.192s'无法从'%-.50s'类型为'%-.50s'" eng "Column %d of table '%-.192s.%-.192s' cannot be converted from type '%-.50s' to type '%-.50s'" |