diff options
author | Oleksandr Byelkin <sanja@mariadb.com> | 2022-02-03 17:01:31 +0100 |
---|---|---|
committer | Oleksandr Byelkin <sanja@mariadb.com> | 2022-02-03 17:01:31 +0100 |
commit | f5c5f8e41ecd4d407022d3772ac43075c16824a5 (patch) | |
tree | 8a46fbd9dfd51352800ea606ae52a53ceb239501 /sql/share | |
parent | 8d742fe4acb91652fcbeb36506d20ead4ff19e83 (diff) | |
parent | cf63eecef44f189ce2d221612dee9dfc1885ba4e (diff) | |
download | mariadb-git-f5c5f8e41ecd4d407022d3772ac43075c16824a5.tar.gz |
Merge branch '10.5' into 10.6
Diffstat (limited to 'sql/share')
-rw-r--r-- | sql/share/errmsg-utf8.txt | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/sql/share/errmsg-utf8.txt b/sql/share/errmsg-utf8.txt index 31070d04303..db3917607e2 100644 --- a/sql/share/errmsg-utf8.txt +++ b/sql/share/errmsg-utf8.txt @@ -7080,9 +7080,8 @@ ER_UNUSED_28 eng "You should never see it" spa "Nunca debería vd de ver esto" -ER_UNUSED_1 - eng "You should never see it" - spa "Nunca debería vd de ver esto" +ER_VERS_NOT_ALLOWED + eng "Not allowed for system-versioned table %`s.%`s" ER_BINLOG_UNSAFE_AUTOINC_NOT_FIRST eng "INSERT into autoincrement field which is not the first part in the composed primary key is unsafe" |