Merge branch '10.1' into 10.2

9 files changed, 53 insertions, 3 deletions

diff --git a/include/CMakeLists.txt b/include/CMakeLists.txt
index d7853a46ecb..d0c4768e882 100644
--- a/include/CMakeLists.txt
+++ b/include/CMakeLists.txt
@@ -76,3 +76,9 @@ INSTALL(DIRECTORY . DESTINATION ${INSTALL_INCLUDEDIR}/private COMPONENT Developm
   PATTERN CMakeFiles EXCLUDE
   PATTERN mysql EXCLUDE
   REGEX "\\./(${EXCL_RE}$)" EXCLUDE)
+
+INSTALL(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/. DESTINATION ${INSTALL_INCLUDEDIR}/private COMPONENT Development
+  FILES_MATCHING PATTERN "*.h"
+  PATTERN CMakeFiles EXCLUDE
+  PATTERN mysql EXCLUDE
+  REGEX "\\./(${EXCL_RE}$)" EXCLUDE)
diff --git a/include/m_ctype.h b/include/m_ctype.h
index 536d7fb4629..7a688f76acb 100644
--- a/include/m_ctype.h
+++ b/include/m_ctype.h
@@ -101,7 +101,7 @@ extern MY_UNICASE_INFO my_unicase_unicode520;
 */
 #define MY_UCA_MAX_WEIGHT_SIZE (8+1)               /* Including 0 terminator */
 #define MY_UCA_CONTRACTION_MAX_WEIGHT_SIZE (2*8+1) /* Including 0 terminator */
-#define MY_UCA_WEIGHT_LEVELS   1
+#define MY_UCA_WEIGHT_LEVELS   2
 
 typedef struct my_contraction_t
 {
@@ -131,6 +131,7 @@ typedef struct my_uca_level_info_st
   uchar   *lengths;
   uint16  **weights;
   MY_CONTRACTIONS contractions;
+  uint    levelno;
 } MY_UCA_WEIGHT_LEVEL;
 
 
diff --git a/include/my_tree.h b/include/my_tree.h
index f8be55f84b2..02cab02b52e 100644
--- a/include/my_tree.h
+++ b/include/my_tree.h
@@ -1,4 +1,4 @@
-/* Copyright (c) 2000, 2010, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2000, 2016, Oracle and/or its affiliates. All rights reserved.
 
    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
diff --git a/include/myisam.h b/include/myisam.h
index 88ce401fabc..f7a3ae8cc8a 100644
--- a/include/myisam.h
+++ b/include/myisam.h
@@ -331,7 +331,8 @@ typedef struct st_sort_info
   my_off_t filelength, dupp, buff_length;
   ha_rows max_records;
   uint current_key, total_keys;
-  uint got_error, threads_running;
+  volatile uint got_error;
+  uint threads_running;
   myf myf_rw;
   enum data_file_type new_data_file_type;
 } MI_SORT_INFO;
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