diff options
| -rw-r--r-- | mysql-test/r/func_json.result | 9 | ||||
| -rw-r--r-- | mysql-test/t/func_json.test | 6 | ||||
| -rw-r--r-- | sql/sql_yacc.yy | 1 |
3 files changed, 3 insertions, 13 deletions
diff --git a/mysql-test/r/func_json.result b/mysql-test/r/func_json.result index e8d11fce56f..80b257cdd31 100644 --- a/mysql-test/r/func_json.result +++ b/mysql-test/r/func_json.result @@ -402,15 +402,6 @@ json_object("a", json_object("b", "abcd")) select json_object("a", '{"b": "abcd"}'); json_object("a", '{"b": "abcd"}') {"a": "{\"b\": \"abcd\"}"} -select json_object("a", cast('{"b": "abcd"}' as json)); -json_object("a", cast('{"b": "abcd"}' as json)) -{"a": {"b": "abcd"}} -select cast(NULL AS JSON); -cast(NULL AS JSON) -NULL -select json_depth(cast(NULL as JSON)); -json_depth(cast(NULL as JSON)) -NULL select json_depth('[[], {}]'); json_depth('[[], {}]') 2 diff --git a/mysql-test/t/func_json.test b/mysql-test/t/func_json.test index aedc65159c5..ea616cbb19f 100644 --- a/mysql-test/t/func_json.test +++ b/mysql-test/t/func_json.test @@ -161,10 +161,10 @@ select json_unquote('abc'); select json_object("a", json_object("b", "abcd")); select json_object("a", '{"b": "abcd"}'); -select json_object("a", cast('{"b": "abcd"}' as json)); +#select json_object("a", cast('{"b": "abcd"}' as json)); -select cast(NULL AS JSON); -select json_depth(cast(NULL as JSON)); +#select cast(NULL AS JSON); +#select json_depth(cast(NULL as JSON)); select json_depth('[[], {}]'); select json_depth('[[[1,2,3],"s"], {}, []]'); select json_depth('[10, {"a": 20}]'); diff --git a/sql/sql_yacc.yy b/sql/sql_yacc.yy index 14963c815a7..fe387ed80f2 100644 --- a/sql/sql_yacc.yy +++ b/sql/sql_yacc.yy @@ -10714,7 +10714,6 @@ cast_type: } | cast_type_numeric { $$= $1; Lex->charset= NULL; } | cast_type_temporal { $$= $1; Lex->charset= NULL; } - | JSON_SYM { $$.set(ITEM_CAST_JSON); } ; cast_type_numeric: |