diff options
| author | Oleksandr Byelkin <sanja@mariadb.com> | 2018-04-24 10:06:31 +0200 |
|---|---|---|
| committer | Oleksandr Byelkin <sanja@mariadb.com> | 2018-04-24 10:06:31 +0200 |
| commit | f79c5a658cc33a10d7744a748a4328254e2cbaf7 (patch) | |
| tree | 44a28accf68a623dcad14e96ca18aca71eecfb68 /sql | |
| parent | 47ac7252ff2be9a07b669ce3365953cd9a207654 (diff) | |
| parent | 4f9977d8d3292caf509227154dafc416a178d17d (diff) | |
| download | mariadb-git-f79c5a658cc33a10d7744a748a4328254e2cbaf7.tar.gz | |
Merge branch '10.3' into bb-10.3-MDEV-10814
Diffstat (limited to 'sql')
| -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 17192663381..20e42214e93 100644 --- a/sql/share/errmsg-utf8.txt +++ b/sql/share/errmsg-utf8.txt @@ -7089,7 +7089,7 @@ ER_IDENT_CAUSES_TOO_LONG_PATH eng "Long database name and identifier for object resulted in path length exceeding %d characters. Path: '%s'" ER_ALTER_OPERATION_NOT_SUPPORTED_REASON_NOT_NULL - eng "cannot silently convert NULL values, as required in this SQL_MODE" + eng "cannot convert NULL to non-constant DEFAULT" ER_MUST_CHANGE_PASSWORD_LOGIN eng "Your password has expired. To log in you must change it using a client that supports expired passwords" |