database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-08 11:22:35 +03:00
Code Activity

Merge with 10.0-base

Browse Source 
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
This commit is contained in:
Michael Widenius
2014-03-13 16:43:11 +02:00
parent 70c08df4dc 1727849659
commit e63c03db8d
17 changed files with 2511 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
include/mysql/psi/mysql_thread.h
View File

@@ -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