diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2019-09-12 12:16:40 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2019-09-12 12:16:40 +0300 |
| commit | 60c04be6599597548ad07ce11e1d7d4004a7cc9c (patch) | |
| tree | 491f1b7b65b82ed270e5af34db4d4cebf760e501 /sql/share | |
| parent | ebddd8699c02519f99a313182b96ae1c04a67a63 (diff) | |
| parent | 9554ef067878c4650ef4b9ad44e0b222cdb313a5 (diff) | |
| download | mariadb-git-60c04be6599597548ad07ce11e1d7d4004a7cc9c.tar.gz | |
Merge 10.3 into 10.4
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 c91132c1eae..03bd72c41b0 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 |