summaryrefslogtreecommitdiff
path: root/vio
diff options
context:
space:
mode:
authorunknown <gluh@mysql.com/eagle.(none)>2007-02-01 18:00:24 +0400
committerunknown <gluh@mysql.com/eagle.(none)>2007-02-01 18:00:24 +0400
commit2df292258636d678c1202140cffb75917af9a766 (patch)
tree377c350f251e9ea221dc51f671e25b865691db6d /vio
parentfddf3c397913f3254bd2adf0d1d7ad4cde586355 (diff)
downloadmariadb-git-2df292258636d678c1202140cffb75917af9a766.tar.gz
Valgrind error fixes
Notes: This patch doesn't fix all issues in the tree and we need jani's fix for that This patch shoud not be merged into 5.0 mysql-test/r/ps.result: result fix mysql-test/r/symlink.result: result fix mysql-test/t/ps.test: test is moved to 'symlink' test mysql-test/t/symlink.test: test from 'ps' test sql/field_conv.cc: valgrind error fix: backport from 5.0 sql/mysqld.cc: release of ssl_context vio/viosslfactories.c: release of ssl_context mysql-test/valgrind.supp: New BitKeeper file ``mysql-test/valgrind.supp'' This file is backported from 5.0, added suppressing of OpenSSL errors
Diffstat (limited to 'vio')
-rw-r--r--vio/viosslfactories.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/vio/viosslfactories.c b/vio/viosslfactories.c
index 46306cf48bb..1ac5d96d158 100644
--- a/vio/viosslfactories.c
+++ b/vio/viosslfactories.c
@@ -289,6 +289,8 @@ new_VioSSLConnectorFd(const char* key_file,
DBUG_RETURN(ptr);
ctor_failure:
DBUG_PRINT("exit", ("there was an error"));
+ if (ptr->ssl_context)
+ SSL_CTX_free(ptr->ssl_context);
my_free((gptr)ptr,MYF(0));
DBUG_RETURN(0);
}
@@ -390,6 +392,8 @@ new_VioSSLAcceptorFd(const char *key_file,
ctor_failure:
DBUG_PRINT("exit", ("there was an error"));
+ if (ptr->ssl_context)
+ SSL_CTX_free(ptr->ssl_context);
my_free((gptr) ptr,MYF(0));
DBUG_RETURN(0);
}