null-merge from perfschema-5.6 merge tree

(only new files and small style changes are accepted)

2 files changed, 0 insertions, 11 deletions

diff --git a/include/mysql/psi/mysql_thread.h b/include/mysql/psi/mysql_thread.h
index 7a70503e162..08dfeac37f1 100644
--- a/include/mysql/psi/mysql_thread.h
+++ b/include/mysql/psi/mysql_thread.h
@@ -66,7 +66,6 @@
   An instrumented mutex structure.
   @sa mysql_mutex_t
 */
-
 struct st_mysql_mutex
 {
   /** The real mutex. */
@@ -97,15 +96,6 @@ 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
diff --git a/include/mysql/psi/psi.h b/include/mysql/psi/psi.h
index d6c25242707..cc2057c630d 100644
--- a/include/mysql/psi/psi.h
+++ b/include/mysql/psi/psi.h
@@ -1921,7 +1921,6 @@ typedef struct PSI_digest_locker* (*digest_add_token_v1_t)
 typedef int (*set_thread_connect_attrs_v1_t)(const char *buffer, uint length,
                                              const void *from_cs);
 
-
 /**
   Performance Schema Interface, version 1.
   @since PSI_VERSION_1