Merge with 10.0-base

Automatic merge, except for server_audit.cc that had to be modified slightly
Changes to xtradb and innobase where ignored was these made no sence for 10.0

1 files changed, 10 insertions, 0 deletions

diff --git a/include/mysql/psi/mysql_thread.h b/include/mysql/psi/mysql_thread.h
index 08dfeac37f1..7a70503e162 100644
--- a/include/mysql/psi/mysql_thread.h
+++ b/include/mysql/psi/mysql_thread.h
@@ -66,6 +66,7 @@
   An instrumented mutex structure.
   @sa mysql_mutex_t
 */
+
 struct st_mysql_mutex
 {
   /** The real mutex. */
@@ -96,6 +97,15 @@ struct st_mysql_mutex
 */
 typedef struct st_mysql_mutex mysql_mutex_t;
 
+/* How to access the pthread_mutex in mysql_mutex_t */
+#ifdef SAFE_MUTEX
+#define mysql_mutex_real_mutex(A) &(A)->m_mutex.mutex
+#elif defined(MY_PTHREAD_FASTMUTEX)
+#define mysql_mutex_real_mutex(A) &(A)->m_mutex.mutex
+#else
+#define mysql_mutex_real_mutex(A) &(A)->m_mutex
+#endif
+
 /**
   An instrumented rwlock structure.
   @sa mysql_rwlock_t