ha_innodb.cc:

  Fix bug: mysqld-debug-max failed standard test because a safe mutex size was seen as 24 bytes in the body of ha_innodb.cc, but 64 bytes in read0read.c

sql/ha_innodb.cc

@@ -40,17 +40,12 @@ InnoDB */
 
 #include "ha_innodb.h"
 
-/* We must declare this here because we undef SAFE_MUTEX below */
 pthread_mutex_t innobase_mutex;
 
 /* Store MySQL definition of 'byte': in Linux it is char while InnoDB
 uses unsigned char */
 typedef byte	mysql_byte;
 
-#ifdef SAFE_MUTEX
-#undef pthread_mutex_t
-#endif
-
 #define INSIDE_HA_INNOBASE_CC
 
 /* Include necessary InnoDB headers */