diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2019-12-16 07:47:17 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2019-12-16 07:47:17 +0200 |
| commit | 28c89b7151bc3ebd7a3459e85f4c9b5e73529629 (patch) | |
| tree | ce50324e5d1054f59a7178bfdb426189998baf52 /sql/share | |
| parent | 745fd4b39f8aff6300682502ed2ddf61ee343866 (diff) | |
| parent | 8fa759a5762733d9f8a4050437fadcd255ecd1a2 (diff) | |
| download | mariadb-git-28c89b7151bc3ebd7a3459e85f4c9b5e73529629.tar.gz | |
Merge 10.4 into 10.5
Diffstat (limited to 'sql/share')
| -rw-r--r-- | sql/share/errmsg-utf8.txt | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/share/errmsg-utf8.txt b/sql/share/errmsg-utf8.txt index 36188e58624..68b0b6bd586 100644 --- a/sql/share/errmsg-utf8.txt +++ b/sql/share/errmsg-utf8.txt @@ -7457,7 +7457,7 @@ ER_GIS_UNSUPPORTED_ARGUMENT eng "Calling geometry function %s with unsupported types of arguments." ER_GIS_UNKNOWN_ERROR - eng "Unknown GIS error occured in function %s." + eng "Unknown GIS error occurred in function %s." ER_GIS_UNKNOWN_EXCEPTION eng "Unknown exception caught in GIS function %s." @@ -7871,7 +7871,7 @@ ER_DROP_VERSIONING_SYSTEM_TIME_PARTITION eng "Can not DROP SYSTEM VERSIONING for table %`s partitioned BY SYSTEM_TIME" ER_VERS_DB_NOT_SUPPORTED - eng "System-versioned tables in the %`s database are not suported" + eng "System-versioned tables in the %`s database are not supported" ER_VERS_TRT_IS_DISABLED eng "Transaction registry is disabled" |