Merge branch '10.4' into 10.5

2 files changed, 14 insertions, 11 deletions

diff --git a/include/my_sys.h b/include/my_sys.h
index f76d1f463a7..1304dee0146 100644
--- a/include/my_sys.h
+++ b/include/my_sys.h
@@ -1,5 +1,5 @@
 /* Copyright (c) 2000, 2013, Oracle and/or its affiliates.
-   Copyright (c) 2010, 2020, MariaDB Corporation.
+   Copyright (c) 2010, 2021, MariaDB Corporation.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -266,7 +266,8 @@ extern int my_umask_dir,
 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.
 */