diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2019-09-11 08:48:00 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2019-09-11 08:48:00 +0300 |
| commit | f7fe51f126043899d024a60f3f983d7b9be400ae (patch) | |
| tree | 3f4d1bb1eb4fcb5ad8f0268446857cd95522044d /sql/share | |
| parent | 5ec4efb7b1b36006e629d258e396d8a95df127e1 (diff) | |
| parent | d6f0e60a67a5e81dc6fd90a117db2aa5fb658664 (diff) | |
| download | mariadb-git-f7fe51f126043899d024a60f3f983d7b9be400ae.tar.gz | |
Merge 10.1 into 10.2
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 325858ed05c..36e5fb9be1e 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 |