diff options
| author | Ian Gilfillan <github@greenman.co.za> | 2020-08-11 14:30:34 +0200 |
|---|---|---|
| committer | Vicențiu-Marian Ciorbaru <vicentiu@mariadb.org> | 2020-08-21 23:00:56 +0300 |
| commit | ee61c8c0b762840ab5badaa9d6b3a24b1c2ee8c7 (patch) | |
| tree | 7ad1a7adab2fdc418c74c1cbf894a3fc8e00dec1 | |
| parent | 151fc0ed887db7e51ab90a2bf822f7cc3a725f62 (diff) | |
| download | mariadb-git-ee61c8c0b762840ab5badaa9d6b3a24b1c2ee8c7.tar.gz | |
Fix spelling mistake in error message
| -rw-r--r-- | mysql-test/suite/maria/maria-connect.result | 2 | ||||
| -rw-r--r-- | sql/share/errmsg-utf8.txt | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/mysql-test/suite/maria/maria-connect.result b/mysql-test/suite/maria/maria-connect.result index 5c8b5524d69..84195780cf8 100644 --- a/mysql-test/suite/maria/maria-connect.result +++ b/mysql-test/suite/maria/maria-connect.result @@ -11,7 +11,7 @@ ERROR 23000: Duplicate entry '2' for key 'PRIMARY' show warnings; Level Code Message Error 1062 Duplicate entry '2' for key 'PRIMARY' -Note 4173 Engine Aria does not support rollback. Changes where committed during rollback call +Note 4173 Engine Aria does not support rollback. Changes were committed during rollback call Warning 1196 Some non-transactional changed tables couldn't be rolled back select * from t1; a diff --git a/sql/share/errmsg-utf8.txt b/sql/share/errmsg-utf8.txt index 79c27a37e6d..95dcbf157d3 100644 --- a/sql/share/errmsg-utf8.txt +++ b/sql/share/errmsg-utf8.txt @@ -7964,4 +7964,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 committed during rollback call" + eng "Engine %s does not support rollback. Changes were committed during rollback call" |