diff options
| author | Rucha Deodhar <rucha.deodhar@mariadb.com> | 2023-01-12 20:11:19 +0530 |
|---|---|---|
| committer | Rucha Deodhar <rucha.deodhar@mariadb.com> | 2023-01-12 20:11:19 +0530 |
| commit | 17920291a661d3d2b02a9261293caebc7158d38a (patch) | |
| tree | de6c5efe6efc2ed1b8654e066670f215bdd21e08 | |
| parent | c08dba7b2864913bbf6fc36307837498f7def44a (diff) | |
| download | mariadb-git-17920291a661d3d2b02a9261293caebc7158d38a.tar.gz | |
fixup for MDEV-19160
| -rw-r--r-- | mysql-test/main/func_json.result | 6 | ||||
| -rw-r--r-- | mysql-test/main/func_json.test | 9 |
2 files changed, 7 insertions, 8 deletions
diff --git a/mysql-test/main/func_json.result b/mysql-test/main/func_json.result index a8f97d087e8..400ecdbfc36 100644 --- a/mysql-test/main/func_json.result +++ b/mysql-test/main/func_json.result @@ -1131,9 +1131,6 @@ SELECT * FROM t1 WHERE CASE WHEN JSON_OBJECT('x', (SELECT MAX(a=2) FROM t1))='{" a DROP TABLE t1; # -# End of 10.4 tests -# -# # MDEV-19160 JSON_DETAILED output unnecessarily verbose # create table t200 (a text); @@ -1260,3 +1257,6 @@ select JSON_LOOSE(JSON_EXTRACT(a, '$**.analyzing_range_alternatives')) from t200 JSON_LOOSE(JSON_EXTRACT(a, '$**.analyzing_range_alternatives')) [{"range_scan_alternatives": [{"index": "a_b", "ranges": ["2 <= a <= 2 AND 4 <= b <= 4", "123"], "rowid_ordered": true, "using_mrr": false, "index_only": true, "rows": 1, "cost": 1.1752, "chosen": true}], "analyzing_roworder_intersect": {"cause": "too few roworder scans"}, "analyzing_index_merge_union": [], "test_one_line_array": ["123"]}] drop table t200; +# +# End of 10.4 tests +# diff --git a/mysql-test/main/func_json.test b/mysql-test/main/func_json.test index ffe7575310f..743f97fedc1 100644 --- a/mysql-test/main/func_json.test +++ b/mysql-test/main/func_json.test @@ -716,11 +716,6 @@ SELECT * FROM t1 WHERE CASE WHEN JSON_OBJECT('x', (SELECT MAX(a=2) FROM t1))='{" DROP TABLE t1; --echo # ---echo # End of 10.4 tests ---echo # - - ---echo # --echo # MDEV-19160 JSON_DETAILED output unnecessarily verbose --echo # @@ -819,3 +814,7 @@ insert into t200 values select JSON_DETAILED(JSON_EXTRACT(a, '$**.analyzing_range_alternatives')) from t200; select JSON_LOOSE(JSON_EXTRACT(a, '$**.analyzing_range_alternatives')) from t200; drop table t200; + +--echo # +--echo # End of 10.4 tests +--echo # |