diff options
| author | unknown <knielsen@knielsen-hq.org> | 2012-02-23 15:42:21 +0100 |
|---|---|---|
| committer | unknown <knielsen@knielsen-hq.org> | 2012-02-23 15:42:21 +0100 |
| commit | b8aa31c03d5f69a35109ffae11af0b43d7b9341f (patch) | |
| tree | 7108814f2f3bcc3cd3cb22528661b1b5bbc7da81 /sql-common | |
| parent | 9305f2b52f8a219737653fa88ba022c901f2831b (diff) | |
| download | mariadb-git-b8aa31c03d5f69a35109ffae11af0b43d7b9341f.tar.gz | |
MWL#192 after-merge fixes.
Fix memory leak in one error case in mysqldump.
Fix that HAVE_VALGRIND_VALGRIND_H is now HAVE_VALGRIND in 5.5.
Fix that @have_ssl should not be set in embedded (introduced when
removing #undef HAVE_OPENSSL from my_global.h).
Diffstat (limited to 'sql-common')
| -rw-r--r-- | sql-common/client.c | 2 |
1 files changed, 1 insertions, 1 deletions
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); |