diff options
| author | Monty <monty@mariadb.org> | 2014-12-22 16:53:17 +0200 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2015-02-10 10:21:17 +0100 |
| commit | d7d589dc01f6d70d1518b74d46fd3b75e76267f5 (patch) | |
| tree | f9df59951453660f0038ed78cf5ceadc852bf74c /mysys | |
| parent | 3a3ec744b5a31318a00821dc0ed6da8af49fda25 (diff) | |
| download | mariadb-git-d7d589dc01f6d70d1518b74d46fd3b75e76267f5.tar.gz | |
Push for testing of encryption
Diffstat (limited to 'mysys')
| -rw-r--r-- | mysys/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | mysys/my_default.c | 5 | ||||
| -rw-r--r-- | mysys/my_thr_init.c | 8 |
3 files changed, 11 insertions, 4 deletions
diff --git a/mysys/CMakeLists.txt b/mysys/CMakeLists.txt index d432c22b966..0fd3eb12657 100644 --- a/mysys/CMakeLists.txt +++ b/mysys/CMakeLists.txt @@ -70,7 +70,7 @@ IF(HAVE_MLOCK) ENDIF() ADD_CONVENIENCE_LIBRARY(mysys ${MYSYS_SOURCES}) -TARGET_LINK_LIBRARIES(mysys dbug strings ${ZLIB_LIBRARY} +TARGET_LINK_LIBRARIES(mysys dbug strings mysys_ssl ${ZLIB_LIBRARY} ${LIBNSL} ${LIBM} ${LIBRT} ${LIBSOCKET} ${LIBEXECINFO}) DTRACE_INSTRUMENT(mysys) diff --git a/mysys/my_default.c b/mysys/my_default.c index 87258a3b27e..e40e24fd5bc 100644 --- a/mysys/my_default.c +++ b/mysys/my_default.c @@ -102,8 +102,7 @@ static const char *f_extensions[]= { ".cnf", 0 }; #define NEWLINE "\n" #endif -static int handle_default_option(void *in_ctx, const char *group_name, - const char *option); +static int handle_default_option(void *, const char *, const char *); /* This structure defines the context that we pass to callback @@ -917,7 +916,7 @@ static int search_default_file_with_ext(Process_option_func opt_handler, end= remove_end_comment(ptr); if ((value= strchr(ptr, '='))) - end= value; /* Option without argument */ + end= value; for ( ; my_isspace(&my_charset_latin1,end[-1]) ; end--) ; if (!value) { diff --git a/mysys/my_thr_init.c b/mysys/my_thr_init.c index d9dbacc8524..d49a2eff970 100644 --- a/mysys/my_thr_init.c +++ b/mysys/my_thr_init.c @@ -22,6 +22,7 @@ #include "mysys_priv.h" #include <m_string.h> #include <signal.h> +#include <my_crypt_key_management.h> pthread_key(struct st_my_thread_var*, THR_KEY_mysys); mysql_mutex_t THR_LOCK_malloc, THR_LOCK_open, @@ -65,6 +66,10 @@ static void my_thread_init_common_mutex(void) #if !defined(HAVE_LOCALTIME_R) || !defined(HAVE_GMTIME_R) mysql_mutex_init(key_LOCK_localtime_r, &LOCK_localtime_r, MY_MUTEX_INIT_SLOW); #endif +#ifndef DBUG_OFF + mysql_rwlock_init(key_LOCK_dbug_encryption_key_version, + &LOCK_dbug_encryption_key_version); +#endif } void my_thread_destroy_common_mutex(void) @@ -79,6 +84,9 @@ void my_thread_destroy_common_mutex(void) #if !defined(HAVE_LOCALTIME_R) || !defined(HAVE_GMTIME_R) mysql_mutex_destroy(&LOCK_localtime_r); #endif +#ifndef DBUG_OFF + mysql_rwlock_destroy(&LOCK_dbug_encryption_key_version); +#endif } |