diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2018-11-28 18:16:46 +0100 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2018-12-12 00:31:43 +0100 |
| commit | d68d7e50f928f7966f21524b4247a0a54d09a6d1 (patch) | |
| tree | 01bedbae211cde39ee3ec9f040b8aa472ab02270 /sql/item_jsonfunc.cc | |
| parent | a76aadf7bc54e750e2474a080777e346ddbffc0d (diff) | |
| download | mariadb-git-d68d7e50f928f7966f21524b4247a0a54d09a6d1.tar.gz | |
json helpers
Diffstat (limited to 'sql/item_jsonfunc.cc')
| -rw-r--r-- | sql/item_jsonfunc.cc | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/sql/item_jsonfunc.cc b/sql/item_jsonfunc.cc index 31d5dd50b35..54bdadc3a32 100644 --- a/sql/item_jsonfunc.cc +++ b/sql/item_jsonfunc.cc @@ -374,17 +374,11 @@ static int path_setup_nwc(json_path_t *p, CHARSET_INFO *i_cs, longlong Item_func_json_valid::val_int() { String *js= args[0]->val_json(&tmp_value); - json_engine_t je; if ((null_value= args[0]->null_value)) return 0; - json_scan_start(&je, js->charset(), (const uchar *) js->ptr(), - (const uchar *) js->ptr()+js->length()); - - while (json_scan_next(&je) == 0) {} - - return je.s.error == 0; + return json_valid(js->ptr(), js->length(), js->charset()); } |