diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2019-09-11 10:32:24 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2019-09-11 10:32:24 +0300 |
| commit | c6a6830916b08a66d0d94318e2821a608128b66d (patch) | |
| tree | 430d172b30b83b168246719e6cc6739a0e22d60b /sql/share | |
| parent | f1616bacb7dab7bd62f509647d4e3fd2f7a4234e (diff) | |
| parent | f7fe51f126043899d024a60f3f983d7b9be400ae (diff) | |
| download | mariadb-git-c6a6830916b08a66d0d94318e2821a608128b66d.tar.gz | |
Merge 10.2 into 10.3
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 b6cd8e6487d..07b6df38c86 100644 --- a/sql/share/errmsg-utf8.txt +++ b/sql/share/errmsg-utf8.txt @@ -7338,6 +7338,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 |