diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2023-02-14 15:23:23 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2023-02-14 15:23:23 +0200 |
| commit | 96a3b11d13c263b89a70cf6e01efa442b7ac079d (patch) | |
| tree | 94b3a31537749e190f643e903e0ec77cb6d8d81d /mysql-test/main/func_json.test | |
| parent | 6aec87544c675751141100d6efe3a2d943cb528f (diff) | |
| parent | 1a5c7552ea3a0233e7abff56a167c3a532c7da0a (diff) | |
| download | mariadb-git-96a3b11d13c263b89a70cf6e01efa442b7ac079d.tar.gz | |
Merge 10.5 into 10.6
Diffstat (limited to 'mysql-test/main/func_json.test')
| -rw-r--r-- | mysql-test/main/func_json.test | 16 |
1 files changed, 13 insertions, 3 deletions
diff --git a/mysql-test/main/func_json.test b/mysql-test/main/func_json.test index cbc6156a8c7..464e7d762d8 100644 --- a/mysql-test/main/func_json.test +++ b/mysql-test/main/func_json.test @@ -1068,6 +1068,18 @@ SELECT * FROM arrNestTest; DROP TABLE arrNestTest; --echo # +--echo # MDEV-30412 JSON_OBJECTAGG doesn't escape double quote in key +--echo # + +SELECT JSON_OBJECTAGG('"', 1); +SELECT JSON_OBJECTAGG('\"', 1); +SELECT JSON_OBJECTAGG('\\', 1); + +--echo # +--echo # End of 10.5 tests +--echo # + +--echo # --echo # MDEV-26054 Server crashes in Item_func_json_arrayagg::get_str_from_field --echo # @@ -1078,7 +1090,6 @@ SELECT JSON_ARRAYAGG(a) AS f FROM v; DROP VIEW v; DROP TABLE t; - --echo # --echo # MDEV-29264 JSON functions overflow error based ON LONGTEXT field --echo # @@ -1090,6 +1101,5 @@ SELECT JSON_INSERT(JSON_OBJECT(l1, l2, l3, l4), '$.k3', 'v3'),JSON_SET(JSON_OBJE DROP TABLE t; --echo # ---echo # End of 10.5 tests +--echo # End of 10.6 tests --echo # - |