diff --git a/man/WARNING b/man/WARNING
deleted file mode 100644
index 74d8817d..00000000
--- a/man/WARNING
+++ /dev/null
@@ -1,19 +0,0 @@
-Please don't edit man pages directly in this folder. Man pages are created from
-MariaDB Connector/C wiki.
-
-To update manpages, please follow the following steps:
-
-1) Add, change or remove content directly in MariaDB Connector/C Wiki
-2) Clone the repository to your local drive
-3) Run the python script scripts/create_man from the root directory of
-   your connector/c tree with the following parameters:
-
-   --docs = specifies the destination of your local Connector/C wiki repository
-   --funcs = specifies a file which contains all exported functions. This file will 
-             be build automatically when running Connector/C build. The filename is
-             "manpages.list" and it will be stored in root of your build directory
-   --version = actual version of Connector/C.
-
-
-   Example: python3 scripts/create_man.py --docs=/home/georg/cc_docs --version=3.2.1 \
-                                          --funcs=./bld/manpages.lst
diff --git a/plugins/auth/caching_sha2_pw.c b/plugins/auth/caching_sha2_pw.c
index e86df198..11afd3ea 100644
--- a/plugins/auth/caching_sha2_pw.c
+++ b/plugins/auth/caching_sha2_pw.c
@@ -340,7 +340,7 @@ static int auth_caching_sha2_client(MYSQL_PLUGIN_VIO *vio, MYSQL *mysql)
     if ((pubkey= PEM_read_bio_RSA_PUBKEY(bio, NULL, NULL, NULL)))
     {
       EVP_PKEY *pkey= EVP_PKEY_new();
-      EVP_PKEY_assign_RSA(pkey, pubkey);
+      EVP_PKEY_set1_RSA(pkey, pubkey);
       rsa_size= EVP_PKEY_size(pkey);
       EVP_PKEY_free(pkey);
     }
diff --git a/scripts/create_man b/scripts/create_man
index 3941c9b6..4ff118b0 100755
--- a/scripts/create_man
+++ b/scripts/create_man
@@ -39,6 +39,7 @@ funcs= func_list.split(";")
 for function in funcs:
 
     try:
+        print("%s/%s.md" % (args.docs, function))
         content= read_content("%s/%s.md" % (args.docs, function))
         
     except:
diff --git a/unittest/libmariadb/misc.c b/unittest/libmariadb/misc.c
index 04428e9d..1749bdb0 100644
--- a/unittest/libmariadb/misc.c
+++ b/unittest/libmariadb/misc.c
@@ -1520,7 +1520,44 @@ static int test_conc533(MYSQL *mysql)
   return OK;
 }
 
+int display_extended_field_attribute(MYSQL *mysql)
+{
+  MYSQL_RES *result;
+  MYSQL_FIELD *fields;
+
+  if (mysql_query(mysql, "CREATE TEMPORARY TABLE t1 (a POINT)"))
+    return 1;
+
+  if (mysql_query(mysql, "SELECT a FROM t1"))
+    return 1;
+
+  if (!(result= mysql_store_result(mysql)))
+    return 1;
+
+  if ((fields= mysql_fetch_fields(result)))
+  {
+    MARIADB_CONST_STRING field_attr;
+
+    if (!mariadb_field_attr(&field_attr, &fields[0],
+                            MARIADB_FIELD_ATTR_DATA_TYPE_NAME))
+    {
+      printf("Extended field attribute: %s\n", field_attr.str);
+    }
+  }
+  mysql_free_result(result);
+  return 0;
+}
+
+
+static int test_ext_field_attr(MYSQL *mysql)
+{
+  display_extended_field_attribute(mysql);
+  
+  return OK;
+}
+
 struct my_tests_st my_tests[] = {
+  {"test_ext_field_attr", test_ext_field_attr, TEST_CONNECTION_DEFAULT, 0, NULL, NULL},
   {"test_conc533", test_conc533, TEST_CONNECTION_NEW, 0, NULL, NULL},
   {"test_conc458", test_conc458, TEST_CONNECTION_NONE, 0, NULL, NULL},
   {"test_conc457", test_conc457, TEST_CONNECTION_DEFAULT, 0, NULL, NULL},