diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2020-08-04 07:55:16 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2020-08-04 07:55:16 +0300 |
| commit | 9a7948e3f6d3fd7528e49f43eb4d41f8f55c8a35 (patch) | |
| tree | 68f8e54f6c2484dc7791bee8c594d3d07c611d29 /sql/share | |
| parent | 56990b18d914b8150c9f777d134724d2b3390360 (diff) | |
| parent | bbd70fcc43cc889e4593594ee5ca436fe1433aac (diff) | |
| download | mariadb-git-9a7948e3f6d3fd7528e49f43eb4d41f8f55c8a35.tar.gz | |
Merge 10.5 into 10.6
Diffstat (limited to 'sql/share')
| -rw-r--r-- | sql/share/errmsg-utf8.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/share/errmsg-utf8.txt b/sql/share/errmsg-utf8.txt index 8b180b466f8..42b3796d03c 100644 --- a/sql/share/errmsg-utf8.txt +++ b/sql/share/errmsg-utf8.txt @@ -7961,4 +7961,4 @@ ER_KEY_CANT_HAVE_WITHOUT_OVERLAPS ER_NOT_ALLOWED_IN_THIS_CONTEXT eng "'%-.128s' is not allowed in this context" ER_DATA_WAS_COMMITED_UNDER_ROLLBACK - eng "Engine %s does not support rollback. Changes where commited during rollback call" + eng "Engine %s does not support rollback. Changes where committed during rollback call" |