Merge 10.7 into 10.8

6 files changed, 12 insertions, 10 deletions

diff --git a/include/my_alloc.h b/include/my_alloc.h
index 659cc16ea14..944dcb6e1bd 100644
--- a/include/my_alloc.h
+++ b/include/my_alloc.h
@@ -20,7 +20,7 @@
 #ifndef _my_alloc_h
 #define _my_alloc_h
 
-typedef unsigned int PSI_memory_key;
+#include "mysql/psi/psi_base.h"
 
 #define ALLOC_MAX_BLOCK_TO_DROP			4096
 #define ALLOC_MAX_BLOCK_USAGE_BEFORE_DROP	10
diff --git a/include/mysql.h.pp b/include/mysql.h.pp
index 7ae47ac836e..81b6206ae3e 100644
--- a/include/mysql.h.pp
+++ b/include/mysql.h.pp
@@ -238,7 +238,9 @@ typedef struct st_mysql_field {
 typedef char **MYSQL_ROW;
 typedef unsigned int MYSQL_FIELD_OFFSET;
 typedef unsigned long long my_ulonglong;
+extern "C" {
 typedef unsigned int PSI_memory_key;
+}
 extern "C" {
 typedef struct st_used_mem
 {
diff --git a/include/mysql/psi/psi_abi_v1.h.pp b/include/mysql/psi/psi_abi_v1.h.pp
index a1845ac62f6..ad2bf1d21dc 100644
--- a/include/mysql/psi/psi_abi_v1.h.pp
+++ b/include/mysql/psi/psi_abi_v1.h.pp
@@ -1,8 +1,8 @@
 extern "C" {
+typedef unsigned int PSI_memory_key;
 }
 extern "C" {
 struct PSI_thread;
-typedef unsigned int PSI_memory_key;
 struct PSI_memory_info_v1
 {
   PSI_memory_key *m_key;
diff --git a/include/mysql/psi/psi_abi_v2.h.pp b/include/mysql/psi/psi_abi_v2.h.pp
index a670e53a8b7..9188954885f 100644
--- a/include/mysql/psi/psi_abi_v2.h.pp
+++ b/include/mysql/psi/psi_abi_v2.h.pp
@@ -1,8 +1,8 @@
 extern "C" {
+typedef unsigned int PSI_memory_key;
 }
 extern "C" {
 struct PSI_thread;
-typedef unsigned int PSI_memory_key;
 struct PSI_memory_info_v2
 {
   int placeholder;
diff --git a/include/mysql/psi/psi_base.h b/include/mysql/psi/psi_base.h
index 7b4eaf80892..2bb1d8fc354 100644
--- a/include/mysql/psi/psi_base.h
+++ b/include/mysql/psi/psi_base.h
@@ -164,6 +164,13 @@ extern "C" {
 
 /** @} */
 
+/**
+  Instrumented memory key.
+  To instrument memory, a memory key must be obtained using @c register_memory.
+  Using a zero key always disable the instrumentation.
+*/
+typedef unsigned int PSI_memory_key;
+
 #ifdef __cplusplus
 }
 #endif
diff --git a/include/mysql/psi/psi_memory.h b/include/mysql/psi/psi_memory.h
index 9b968667d53..60d68f1a6dd 100644
--- a/include/mysql/psi/psi_memory.h
+++ b/include/mysql/psi/psi_memory.h
@@ -53,13 +53,6 @@ extern "C" {
 
 struct PSI_thread;
 
-/**
-  Instrumented memory key.
-  To instrument memory, a memory key must be obtained using @c register_memory.
-  Using a zero key always disable the instrumentation.
-*/
-typedef unsigned int PSI_memory_key;
-
 #ifdef HAVE_PSI_1
 
 /**