diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2019-09-12 16:36:46 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2019-09-12 16:36:46 +0300 |
| commit | d28686ada6f72035f23b83960e63599f50fbc38d (patch) | |
| tree | c7295d08ffa9f27d7f8b19b5741b286acaa40b9b /sql/share | |
| parent | 9d26f3dabb8299149af99faafa52398cce44e610 (diff) | |
| parent | 60c04be6599597548ad07ce11e1d7d4004a7cc9c (diff) | |
| download | mariadb-git-d28686ada6f72035f23b83960e63599f50fbc38d.tar.gz | |
Merge 10.4 into 10.5
Diffstat (limited to 'sql/share')
| -rw-r--r-- | sql/share/errmsg-utf8.txt | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/sql/share/errmsg-utf8.txt b/sql/share/errmsg-utf8.txt index 4cb8750ccf8..dfbacccc169 100644 --- a/sql/share/errmsg-utf8.txt +++ b/sql/share/errmsg-utf8.txt @@ -7340,6 +7340,8 @@ ER_NO_EIS_FOR_FIELD ER_WARN_AGGFUNC_DEPENDENCE eng "Aggregate function '%-.192s)' of SELECT #%d belongs to SELECT #%d" ukr "Агрегатна функція '%-.192s)' з SELECTу #%d належить до SELECTу #%d" +WARN_INNODB_PARTITION_OPTION_IGNORED + eng "<%-.64s> option ignored for InnoDB partition" # # Internal errors, not used |