diff options
| -rw-r--r-- | client/mysqldump.c | 6 | ||||
| -rw-r--r-- | include/my_context.h | 6 | ||||
| -rw-r--r-- | mysys/my_context.c | 14 | ||||
| -rw-r--r-- | sql-common/client.c | 2 | ||||
| -rw-r--r-- | sql/mysqld.cc | 10 |
5 files changed, 17 insertions, 21 deletions
diff --git a/client/mysqldump.c b/client/mysqldump.c index b8d74858925..7dc74f7ac0b 100644 --- a/client/mysqldump.c +++ b/client/mysqldump.c @@ -1531,9 +1531,9 @@ static int connect_to_db(char *host, char *user,char *passwd) if (opt_default_auth && *opt_default_auth) mysql_options(&mysql_connection, MYSQL_DEFAULT_AUTH, opt_default_auth); - if (!(mysql= mysql_real_connect(&mysql_connection,host,user,passwd, - NULL,opt_mysql_port,opt_mysql_unix_port, - 0))) + mysql= &mysql_connection; /* So we can mysql_close() it properly */ + if (!mysql_real_connect(&mysql_connection,host,user,passwd, + NULL,opt_mysql_port,opt_mysql_unix_port, 0)) { DB_error(&mysql_connection, "when trying to connect"); DBUG_RETURN(1); diff --git a/include/my_context.h b/include/my_context.h index 14974412075..1e1b7e6a749 100644 --- a/include/my_context.h +++ b/include/my_context.h @@ -60,7 +60,7 @@ struct my_context { ucontext_t base_context; ucontext_t spawned_context; int active; -#ifdef HAVE_VALGRIND_VALGRIND_H +#ifdef HAVE_VALGRIND unsigned int valgrind_stack_id; #endif #ifndef DBUG_OFF @@ -77,7 +77,7 @@ struct my_context { uint64_t save[9]; void *stack_top; void *stack_bot; -#ifdef HAVE_VALGRIND_VALGRIND_H +#ifdef HAVE_VALGRIND unsigned int valgrind_stack_id; #endif #ifndef DBUG_OFF @@ -94,7 +94,7 @@ struct my_context { uint64_t save[7]; void *stack_top; void *stack_bot; -#ifdef HAVE_VALGRIND_VALGRIND_H +#ifdef HAVE_VALGRIND unsigned int valgrind_stack_id; #endif #ifndef DBUG_OFF diff --git a/mysys/my_context.c b/mysys/my_context.c index 0ab486605e0..d2374391a39 100644 --- a/mysys/my_context.c +++ b/mysys/my_context.c @@ -24,7 +24,7 @@ #include "m_string.h" #include "my_context.h" -#ifdef HAVE_VALGRIND_VALGRIND_H +#ifdef HAVE_VALGRIND #include <valgrind/valgrind.h> #endif @@ -134,7 +134,7 @@ my_context_init(struct my_context *c, size_t stack_size) if (!(c->stack= malloc(stack_size))) return -1; /* Out of memory */ c->stack_size= stack_size; -#ifdef HAVE_VALGRIND_VALGRIND_H +#ifdef HAVE_VALGRIND c->valgrind_stack_id= VALGRIND_STACK_REGISTER(c->stack, ((unsigned char *)(c->stack))+stack_size); #endif @@ -146,7 +146,7 @@ my_context_destroy(struct my_context *c) { if (c->stack) { -#ifdef HAVE_VALGRIND_VALGRIND_H +#ifdef HAVE_VALGRIND VALGRIND_STACK_DEREGISTER(c->valgrind_stack_id); #endif free(c->stack); @@ -384,7 +384,7 @@ my_context_init(struct my_context *c, size_t stack_size) (( ((intptr)c->stack_bot + stack_size) & ~(intptr)0xf) - 16); bzero(c->stack_top, 16); -#ifdef HAVE_VALGRIND_VALGRIND_H +#ifdef HAVE_VALGRIND c->valgrind_stack_id= VALGRIND_STACK_REGISTER(c->stack_bot, c->stack_top); #endif @@ -397,7 +397,7 @@ my_context_destroy(struct my_context *c) if (c->stack_bot) { free(c->stack_bot); -#ifdef HAVE_VALGRIND_VALGRIND_H +#ifdef HAVE_VALGRIND VALGRIND_STACK_DEREGISTER(c->valgrind_stack_id); #endif } @@ -611,7 +611,7 @@ my_context_init(struct my_context *c, size_t stack_size) (( ((intptr)c->stack_bot + stack_size) & ~(intptr)0xf) - 16); bzero(c->stack_top, 16); -#ifdef HAVE_VALGRIND_VALGRIND_H +#ifdef HAVE_VALGRIND c->valgrind_stack_id= VALGRIND_STACK_REGISTER(c->stack_bot, c->stack_top); #endif @@ -624,7 +624,7 @@ my_context_destroy(struct my_context *c) if (c->stack_bot) { free(c->stack_bot); -#ifdef HAVE_VALGRIND_VALGRIND_H +#ifdef HAVE_VALGRIND VALGRIND_STACK_DEREGISTER(c->valgrind_stack_id); #endif } diff --git a/sql-common/client.c b/sql-common/client.c index f79d7de0c73..f6084d061b8 100644 --- a/sql-common/client.c +++ b/sql-common/client.c @@ -1776,7 +1776,7 @@ mysql_ssl_set(MYSQL *mysql __attribute__((unused)) , const char *cipher __attribute__((unused))) { DBUG_ENTER("mysql_ssl_set"); -#ifdef HAVE_OPENSSL +#if defined(HAVE_OPENSSL) && !defined(EMBEDDED_LIBRARY) my_free(mysql->options.ssl_key); my_free(mysql->options.ssl_cert); my_free(mysql->options.ssl_ca); diff --git a/sql/mysqld.cc b/sql/mysqld.cc index e5b9a6e6312..4031fdbf911 100644 --- a/sql/mysqld.cc +++ b/sql/mysqld.cc @@ -3920,8 +3920,7 @@ static void openssl_lock(int mode, openssl_lock_t *lock, const char *file, static void init_ssl() { -#ifdef HAVE_OPENSSL -#ifndef EMBEDDED_LIBRARY +#if defined(HAVE_OPENSSL) && !defined(EMBEDDED_LIBRARY) if (opt_use_ssl) { enum enum_ssl_init_error error= SSL_INITERR_NOERROR; @@ -3943,12 +3942,9 @@ static void init_ssl() { have_ssl= SHOW_OPTION_DISABLED; } -#else - have_ssl= SHOW_OPTION_DISABLED; -#endif /* ! EMBEDDED_LIBRARY */ if (des_key_file) load_des_key_file(des_key_file); -#endif /* HAVE_OPENSSL */ +#endif /* HAVE_OPENSSL && ! EMBEDDED_LIBRARY */ } @@ -7236,7 +7232,7 @@ static int mysql_init_variables(void) have_profiling = SHOW_OPTION_NO; #endif -#ifdef HAVE_OPENSSL +#if defined(HAVE_OPENSSL) && !defined(EMBEDDED_LIBRARY) have_ssl=SHOW_OPTION_YES; #else have_ssl=SHOW_OPTION_NO; |