diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2021-08-04 11:52:39 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2021-08-04 11:52:39 +0300 |
| commit | ddcb242b3cd2e95bcf4c950bffaafc0775db45ee (patch) | |
| tree | 1530aecf970c187d377fce3901c889ef6c8b2995 /include | |
| parent | c5ae2c4971127290335588c7498f24d10f32e204 (diff) | |
| parent | 2db692f5b4d6bb31a331dab44544171c455f6aca (diff) | |
| download | mariadb-git-ddcb242b3cd2e95bcf4c950bffaafc0775db45ee.tar.gz | |
Merge 10.6 into 10.7
Diffstat (limited to 'include')
| -rw-r--r-- | include/my_sys.h | 3 | ||||
| -rw-r--r-- | include/mysql/service_json.h | 20 |
2 files changed, 13 insertions, 10 deletions
diff --git a/include/my_sys.h b/include/my_sys.h index b1f7c322360..dae4777db11 100644 --- a/include/my_sys.h +++ b/include/my_sys.h @@ -279,7 +279,8 @@ LPSECURITY_ATTRIBUTES my_win_file_secattr(); extern my_bool my_use_symdir; extern ulong my_default_record_cache_size; -extern my_bool my_disable_locking, my_disable_async_io, +extern MYSQL_PLUGIN_IMPORT my_bool my_disable_locking; +extern my_bool my_disable_async_io, my_disable_flush_key_blocks, my_disable_symlinks; extern my_bool my_disable_sync, my_disable_copystat_in_redel; extern char wild_many,wild_one,wild_prefix; diff --git a/include/mysql/service_json.h b/include/mysql/service_json.h index 141b76279a5..cb748c0c83f 100644 --- a/include/mysql/service_json.h +++ b/include/mysql/service_json.h @@ -20,23 +20,25 @@ @file json service - Esports JSON parsing methods for plugins to use. + Exports JSON parsing methods for plugins to use. - Fuctions of the service: - js_type - returns the type of the JSON argument, + Functions of the service: + json_type - returns the type of the JSON argument, and the parsed value if it's scalar (not object or array) - js_get_array_item - expecs JSON array as an argument, - and returns the n_item's item's type and value + json_get_array_item - expects JSON array as an argument, + and returns the type of the element at index `n_item`. Returns JSV_NOTHING type if the array is shorter - than n_item and the actual length of the array in v_len. + than n_item and the actual length of the array in value_len. + If successful, then `value` up till `value[value_len]` contains the array + element at the desired index (n_item). - js_get_object_key - expects JSON object as an argument, - searches for a key in the object, return it's type and value. + json_get_object_key - expects JSON object as an argument, + searches for a key in the object, return it's type and stores its value in `value`. JSV_NOTHING if no such key found, the number of keys in v_len. - js_get_object_nkey - expects JSON object as an argument. + json_get_object_nkey - expects JSON object as an argument. finds n_key's key in the object, returns it's name, type and value. JSV_NOTHING if object has less keys than n_key. */ |