diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2019-03-27 11:56:08 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2019-03-27 11:56:08 +0200 |
| commit | a6585d5ce99c2efdd75884b989250e2de8203cca (patch) | |
| tree | 67c1e6f7bf8e078c7d63416f1a00c6b291e64080 /sql/share | |
| parent | 762419a5732fceb5c7ed5728cd7d22b4d82ff74c (diff) | |
| parent | 828cc2ba7cdbe47c55fd679437e6e7f0bc714dff (diff) | |
| download | mariadb-git-a6585d5ce99c2efdd75884b989250e2de8203cca.tar.gz | |
Merge 10.0 into 10.1
Diffstat (limited to 'sql/share')
| -rw-r--r-- | sql/share/errmsg-utf8.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/share/errmsg-utf8.txt b/sql/share/errmsg-utf8.txt index d73a22c80dc..14662c0eb38 100644 --- a/sql/share/errmsg-utf8.txt +++ b/sql/share/errmsg-utf8.txt @@ -6978,7 +6978,7 @@ ER_KEY_BASED_ON_GENERATED_VIRTUAL_COLUMN ER_WRONG_FK_OPTION_FOR_VIRTUAL_COLUMN eng "Cannot define foreign key with %s clause on a computed column" ER_WARNING_NON_DEFAULT_VALUE_FOR_VIRTUAL_COLUMN - eng "The value specified for computed column '%s' in table '%s' ignored" + eng "The value specified for computed column '%s' in table '%s' has been ignored" ER_UNSUPPORTED_ACTION_ON_VIRTUAL_COLUMN eng "This is not yet supported for computed columns" ER_CONST_EXPR_IN_VCOL |