diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2019-03-27 13:09:09 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2019-03-27 13:27:04 +0200 |
| commit | 349560d5d5e53966fe75eef2bfefd12e29278f6a (patch) | |
| tree | ca1f26f2a2db1c8e2c86b8cbaae00abcebe5f6cf /sql/share/errmsg-utf8.txt | |
| parent | 2d592f757cd624fe964ac39d05b6bdd985a827e2 (diff) | |
| parent | 1e9c2b2305c10ccaad235f3249a0f5084bf9b2c8 (diff) | |
| download | mariadb-git-349560d5d5e53966fe75eef2bfefd12e29278f6a.tar.gz | |
Merge 10.2 into 10.3
Diffstat (limited to 'sql/share/errmsg-utf8.txt')
| -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 aa7235e5d5a..71010ddc111 100644 --- a/sql/share/errmsg-utf8.txt +++ b/sql/share/errmsg-utf8.txt @@ -7175,7 +7175,7 @@ ER_KEY_BASED_ON_GENERATED_VIRTUAL_COLUMN ER_WRONG_FK_OPTION_FOR_GENERATED_COLUMN eng "Cannot define foreign key with %s clause on a generated column" ER_WARNING_NON_DEFAULT_VALUE_FOR_GENERATED_COLUMN - eng "The value specified for generated column '%s' in table '%s' ignored" + eng "The value specified for generated column '%s' in table '%s' has been ignored" ER_UNSUPPORTED_ACTION_ON_GENERATED_COLUMN eng "This is not yet supported for generated columns" ER_UNUSED_20 |