diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2023-01-03 16:10:02 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2023-01-03 16:10:02 +0200 |
| commit | fb0808c450849e00993fa38839f33969a9daf7e8 (patch) | |
| tree | 55aca4c3c7dff7e09a13efa6dcfb58d5e91def35 /include/json_lib.h | |
| parent | fb41117c907a99d051ac09c229762978373d7eb0 (diff) | |
| parent | 8760f6907c51e0e20242a53188be5b62029d6f1a (diff) | |
| download | mariadb-git-fb0808c450849e00993fa38839f33969a9daf7e8.tar.gz | |
Merge 10.3 into 10.4
Diffstat (limited to 'include/json_lib.h')
| -rw-r--r-- | include/json_lib.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/json_lib.h b/include/json_lib.h index bb649928eaa..2ec3e9de8f8 100644 --- a/include/json_lib.h +++ b/include/json_lib.h @@ -372,7 +372,7 @@ int json_find_paths_next(json_engine_t *je, json_find_paths_t *state); /* - Converst JSON string constant into ordinary string constant + Convert JSON string constant into ordinary string constant which can involve unpacking json escapes and changing character set. Returns negative integer in the case of an error, the length of the result otherwise. @@ -383,7 +383,7 @@ int json_unescape(CHARSET_INFO *json_cs, uchar *res, uchar *res_end); /* - Converst ordinary string constant into JSON string constant. + Convert ordinary string constant into JSON string constant. which can involve appropriate escaping and changing character set. Returns negative integer in the case of an error, the length of the result otherwise. |