summaryrefslogtreecommitdiff
path: root/mysql-test/r/func_json.result
diff options
context:
space:
mode:
authorAlexey Botchkov <holyfoot@askmonty.org>2016-12-04 14:49:06 +0400
committerAlexey Botchkov <holyfoot@askmonty.org>2016-12-05 01:03:30 +0400
commit12897a5bba8a7980a7ca20115bebfc8e5f704a31 (patch)
tree99664c8e0d134454f430c8f9599c8297f4fd9fba /mysql-test/r/func_json.result
parentb4cbaf0b7c8bc32b8528b2e22f2d2a89971b8dde (diff)
downloadmariadb-git-12897a5bba8a7980a7ca20115bebfc8e5f704a31.tar.gz
MDEV-11437 JSON_QUOTE function does not quote and uses wrong character set.
json_quote fixed.
Diffstat (limited to 'mysql-test/r/func_json.result')
-rw-r--r--mysql-test/r/func_json.result12
1 files changed, 11 insertions, 1 deletions
diff --git a/mysql-test/r/func_json.result b/mysql-test/r/func_json.result
index 2f57231b755..fd31a39934f 100644
--- a/mysql-test/r/func_json.result
+++ b/mysql-test/r/func_json.result
@@ -186,7 +186,17 @@ json_exists('{"key1":"xxxx", "key2":[1, 2, 3]}', "$.key2[10]")
0
select json_quote('"string"');
json_quote('"string"')
-\"string\"
+"\"string\""
+create table t1 as select json_quote('foo');
+select * from t1;
+json_quote('foo')
+"foo"
+show create table t1;
+Table Create Table
+t1 CREATE TABLE `t1` (
+ `json_quote('foo')` varchar(10) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NOT NULL
+) ENGINE=MyISAM DEFAULT CHARSET=latin1
+drop table t1;
select json_merge('string', 123);
json_merge('string', 123)
["string", 123]