diff options
| author | Monty <monty@mariadb.org> | 2016-04-25 15:37:24 +0300 |
|---|---|---|
| committer | Monty <monty@mariadb.org> | 2016-04-25 15:37:24 +0300 |
| commit | f6cc7f1bdc56e57cf441f99f2c88ca92aeeebc11 (patch) | |
| tree | 56663353897e6146894fa064bd00c318f803f7cf /plugin/server_audit | |
| parent | ce38adddfa91949b30956abd0e4cab201effcdef (diff) | |
| download | mariadb-git-f6cc7f1bdc56e57cf441f99f2c88ca92aeeebc11.tar.gz | |
Fixed failing test cases and compiler warnings
- Fixed wait condition in kill_processlist-6619
- Updated Ssl_chiper for openssl tests
- Added supression for valgrinds when using libcrypto
- Fixed wrong argument to pthread_mutex in server_audit.c when compiling with debug
- Adding missing debug_sync_update() to debug_sync.h
- Added initializers to some variables and fixed error handling in jsonudf.cpp
- Fixed cluster_filter_unpack_varchar which doesn't have a stable index type.
- Updated compiler_warnings.supp
Diffstat (limited to 'plugin/server_audit')
| -rw-r--r-- | plugin/server_audit/server_audit.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/plugin/server_audit/server_audit.c b/plugin/server_audit/server_audit.c index 30b7cdb5dcb..b84f2b94806 100644 --- a/plugin/server_audit/server_audit.c +++ b/plugin/server_audit/server_audit.c @@ -97,13 +97,11 @@ static void closelog() {} #define FLOGGER_NO_PSI /* 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 +#if defined(SAFE_MUTEX) || 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 +#endif #define flogger_mutex_init(A,B,C) do{}while(0) #define flogger_mutex_destroy(A) do{}while(0) |