diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2019-08-28 10:18:41 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2019-08-28 10:18:41 +0300 |
| commit | e41eb044f19e3ee9b881344565924dd6b9d20e1a (patch) | |
| tree | 72db01fe401eca2e794b9f02edec0200e78416b6 /sql/share | |
| parent | 947b0b5722117350c83656ee0b23502be59b7d2b (diff) | |
| parent | 7aac83580a5c5a6042b5d03d1031750cb0d5d6ea (diff) | |
| download | mariadb-git-e41eb044f19e3ee9b881344565924dd6b9d20e1a.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, 1 insertions, 1 deletions
diff --git a/sql/share/errmsg-utf8.txt b/sql/share/errmsg-utf8.txt index 99af1c60287..b6cd8e6487d 100644 --- a/sql/share/errmsg-utf8.txt +++ b/sql/share/errmsg-utf8.txt @@ -6461,7 +6461,7 @@ ER_MESSAGE_AND_STATEMENT eng "%s Statement: %s" ER_SLAVE_CONVERSION_FAILED - eng "Column %d of table '%-.192s.%-.192s' cannot be converted from type '%-.32s' to type '%-.32s'" + eng "Column %d of table '%-.192s.%-.192s' cannot be converted from type '%-.50s' to type '%-.50s'" ER_SLAVE_CANT_CREATE_CONVERSION eng "Can't create conversion table for table '%-.192s.%-.192s'" ER_INSIDE_TRANSACTION_PREVENTS_SWITCH_BINLOG_FORMAT |