diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2019-04-12 12:45:06 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2019-04-12 12:45:06 +0300 |
| commit | 7896503686477cce55d058d071d2858a8abf4b04 (patch) | |
| tree | a926d002e4bf30ef245fea290c13f47bd25e5098 /sql/share | |
| parent | 1d48c4a025e0ffb9bbe4a03388c08602d87fa5fc (diff) | |
| parent | 4dc10ec68d354241768ce4779c024b4bb2ca897b (diff) | |
| download | mariadb-git-7896503686477cce55d058d071d2858a8abf4b04.tar.gz | |
Merge 10.3 into 10.4bb-10.4-supermergejan
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 db38b157406..feb47f9af94 100644 --- a/sql/share/errmsg-utf8.txt +++ b/sql/share/errmsg-utf8.txt @@ -7012,7 +7012,7 @@ ER_ALTER_OPERATION_NOT_SUPPORTED_REASON_FK_RENAME eng "Columns participating in a foreign key are renamed" ER_ALTER_OPERATION_NOT_SUPPORTED_REASON_COLUMN_TYPE - eng "Cannot change column type INPLACE" + eng "Cannot change column type" ER_ALTER_OPERATION_NOT_SUPPORTED_REASON_FK_CHECK eng "Adding foreign keys needs foreign_key_checks=OFF" |