Merge branch '10.1' into 10.2

5 files changed, 42 insertions, 0 deletions

diff --git a/include/mysql/plugin_audit.h b/include/mysql/plugin_audit.h
index 7fb6e816181..10039c4c1fa 100644
--- a/include/mysql/plugin_audit.h
+++ b/include/mysql/plugin_audit.h
@@ -23,6 +23,10 @@
 
 #include "plugin.h"
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 #define MYSQL_AUDIT_CLASS_MASK_SIZE 1
 
 #define MYSQL_AUDIT_INTERFACE_VERSION 0x0302
@@ -175,4 +179,8 @@ struct st_mysql_audit
 };
 
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif
diff --git a/include/mysql/plugin_auth.h b/include/mysql/plugin_auth.h
index 156fb386aae..d776ed79a61 100644
--- a/include/mysql/plugin_auth.h
+++ b/include/mysql/plugin_auth.h
@@ -31,6 +31,10 @@
 
 #include <mysql/plugin_auth_common.h>
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 /* defines for MYSQL_SERVER_AUTH_INFO.password_used */
 
 #define PASSWORD_USED_NO         0
@@ -122,5 +126,10 @@ struct st_mysql_auth
   */
   int (*authenticate_user)(MYSQL_PLUGIN_VIO *vio, MYSQL_SERVER_AUTH_INFO *info);
 };
+
+#ifdef __cplusplus
+}
+#endif
+
 #endif
 
diff --git a/include/mysql/plugin_encryption.h b/include/mysql/plugin_encryption.h
index 3f35c2bcf80..5d08f6d3067 100644
--- a/include/mysql/plugin_encryption.h
+++ b/include/mysql/plugin_encryption.h
@@ -27,6 +27,10 @@
 
 #include <mysql/plugin.h>
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 #define MariaDB_ENCRYPTION_INTERFACE_VERSION 0x0300
 
 /**
@@ -114,5 +118,9 @@ struct st_mariadb_encryption
   */
   unsigned int (*encrypted_length)(unsigned int slen, unsigned int key_id, unsigned int key_version);
 };
+
+#ifdef __cplusplus
+}
+#endif
 #endif
 
diff --git a/include/mysql/plugin_ftparser.h b/include/mysql/plugin_ftparser.h
index 324fce7ae86..4dace4ef3a6 100644
--- a/include/mysql/plugin_ftparser.h
+++ b/include/mysql/plugin_ftparser.h
@@ -18,6 +18,10 @@
 #define _my_plugin_ftparser_h
 #include "plugin.h"
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 /*************************************************************************
   API for Full-text parser plugin. (MYSQL_FTPARSER_PLUGIN)
 */
@@ -208,5 +212,9 @@ struct st_mysql_ftparser
 };
 
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif
 
diff --git a/include/mysql/plugin_password_validation.h b/include/mysql/plugin_password_validation.h
index f3ca5c7e0cf..18c643e877b 100644
--- a/include/mysql/plugin_password_validation.h
+++ b/include/mysql/plugin_password_validation.h
@@ -26,6 +26,10 @@
 
 #include <mysql/plugin.h>
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 #define MariaDB_PASSWORD_VALIDATION_INTERFACE_VERSION 0x0100
 
 /**
@@ -41,5 +45,10 @@ struct st_mariadb_password_validation
   int (*validate_password)(MYSQL_LEX_STRING *username,
                            MYSQL_LEX_STRING *password);
 };
+
+#ifdef __cplusplus
+}
+#endif
+
 #endif