database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

null-merge from perfschema-5.6 merge tree

Browse Source 
(only new files and small style changes are accepted)
This commit is contained in:
Sergei Golubchik
2014-05-07 10:21:41 +02:00
parent 3427fd0378 7226287c06
commit 374f0751a2
50 changed files with 3556 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

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

1
include/mysql/psi/psi.h
View File

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