summaryrefslogtreecommitdiff
path: root/sql/share
diff options
context:
space:
mode:
authorSergei Golubchik <serg@mariadb.org>2017-02-14 11:11:47 +0100
committerSergei Golubchik <serg@mariadb.org>2017-02-14 20:43:41 +0100
commit6f6d0531dca711f13842cfca761afd073c595f57 (patch)
treeb46a9f617e86bcca3a19d24bb2f8c5f9c31ff182 /sql/share
parente0fa2ce40f03add01bb3d934480e74e3ee64dd6c (diff)
downloadmariadb-git-6f6d0531dca711f13842cfca761afd073c595f57.tar.gz
MDEV-11439 No data type JSON, but CAST(something AS JSON) pretends to work
Use JSON_COMPACT(X) instead of CAST(X AS JSON). Bonus - X is validated to be a valid JSON. Fix a typo in the error message.
Diffstat (limited to 'sql/share')
-rw-r--r--sql/share/errmsg-utf8.txt2
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/share/errmsg-utf8.txt b/sql/share/errmsg-utf8.txt
index ebf86d6066c..8939910fc29 100644
--- a/sql/share/errmsg-utf8.txt
+++ b/sql/share/errmsg-utf8.txt
@@ -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