summaryrefslogtreecommitdiff
path: root/mysql-test/main/func_json.test
diff options
context:
space:
mode:
authorAlexander Barkov <bar@mariadb.com>2019-10-01 10:45:52 +0400
committerAlexander Barkov <bar@mariadb.com>2019-10-01 10:45:52 +0400
commitdc588e3d3fc0d3610ffb6f4e9c804dc539394669 (patch)
treeab8dc4c2ca60ca0a795377471fbfea842b21dbe2 /mysql-test/main/func_json.test
parentf1dcbc2d9a36b00fad4acee447b5c5066725fa7b (diff)
parent7e44c455f4de82081af5089e1f77378676aa45ff (diff)
downloadmariadb-git-dc588e3d3fc0d3610ffb6f4e9c804dc539394669.tar.gz
Merge remote-tracking branch 'origin/10.3' into 10.4
Diffstat (limited to 'mysql-test/main/func_json.test')
-rw-r--r--mysql-test/main/func_json.test10
1 files changed, 10 insertions, 0 deletions
diff --git a/mysql-test/main/func_json.test b/mysql-test/main/func_json.test
index 3e695934ef2..1ac47d4f329 100644
--- a/mysql-test/main/func_json.test
+++ b/mysql-test/main/func_json.test
@@ -569,6 +569,16 @@ SELECT json_valid('{"value":"\\ud83d\\ude0a"}');
SELECT json_valid('{"test": "\\ud83d\\ude0b"}');
--echo #
+--echo # MDEV-19670 json escaped unicode parse error
+--echo #
+
+SELECT JSON_VALID('{"admin\\"": null}'), '{"admin\\"": null}'
+ UNION
+ SELECT JSON_VALID('{"\\"admin": null}'), '{"\\"admin": null}'
+ UNION
+ SELECT JSON_VALID('{"\\"": null}'), '{"\\"": null}';
+
+--echo #
--echo # End of 10.3 tests
--echo #