diff options
| author | Alexander Barkov <bar@mariadb.org> | 2017-02-27 10:07:59 +0400 |
|---|---|---|
| committer | Alexander Barkov <bar@mariadb.org> | 2017-02-27 10:07:59 +0400 |
| commit | 47b7ffb396bd283bd4196194311ba39ed9692421 (patch) | |
| tree | ee69ec3d890c77a123f66b5c27ac0697163491ad /sql/share | |
| parent | 3f83801d8266fa465d296dbe528a5ea132945a84 (diff) | |
| parent | 78153cf641aea41166d3e79ae99b57b154f6a027 (diff) | |
| download | mariadb-git-47b7ffb396bd283bd4196194311ba39ed9692421.tar.gz | |
Merge remote-tracking branch 'origin/10.2' into bb-10.2-ext
Diffstat (limited to 'sql/share')
| -rw-r--r-- | sql/share/errmsg-utf8.txt | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/share/errmsg-utf8.txt b/sql/share/errmsg-utf8.txt index c0796b2002b..e984a6d14d8 100644 --- a/sql/share/errmsg-utf8.txt +++ b/sql/share/errmsg-utf8.txt @@ -7355,7 +7355,7 @@ ER_UNACCEPTABLE_MUTUAL_RECURSION eng "Unacceptable mutual recursion with anchored table '%s'" ER_REF_TO_RECURSIVE_WITH_TABLE_IN_DERIVED eng "Reference to recursive WITH table '%s' in materialized derived" -ER_NOT_STANDARDS_COMPLIANT_RECURSIVE +ER_NOT_STANDARD_COMPLIANT_RECURSIVE eng "Restrictions imposed on recursive definitions are violated for table '%s'"R_WRONG_WINDOW_SPEC_NAME ER_WRONG_WINDOW_SPEC_NAME eng "Window specification with name '%s' is not defined" @@ -7417,7 +7417,7 @@ ER_BINLOG_UNCOMPRESS_ERROR ER_JSON_BAD_CHR eng "Broken JSON string in argument %d to function '%s' at position %d" ER_JSON_NOT_JSON_CHR - eng "Character disallowd in JSON in argument %d to function '%s' at position %d" + eng "Character disallowed in JSON in argument %d to function '%s' at position %d" ER_JSON_EOS eng "Unexpected end of JSON text in argument %d to function '%s'" ER_JSON_SYNTAX |