diff options
| author | unknown <konstantin@mysql.com> | 2005-11-25 13:57:13 +0300 |
|---|---|---|
| committer | unknown <konstantin@mysql.com> | 2005-11-25 13:57:13 +0300 |
| commit | 9f58318cf49bcc8f5a1947a0293b1a2f18cb73c4 (patch) | |
| tree | cee4e8f13e8c0b9e324e58db5a2e995b60fe5ea0 /sql-common/client.c | |
| parent | d5ca55726c667849c5f6e309c8d9e355cb79787a (diff) | |
| parent | fe1f7430c5af7a1f6ead7ca91871579802bb82a9 (diff) | |
| download | mariadb-git-9f58318cf49bcc8f5a1947a0293b1a2f18cb73c4.tar.gz | |
Merge mysql.com:/opt/local/work/mysql-4.1-root
into mysql.com:/opt/local/work/mysql-5.0-root
mysql-test/r/ndb_alter_table.result:
Auto merged
mysql-test/r/ndb_basic.result:
Auto merged
mysql-test/t/select.test:
Auto merged
sql/handler.cc:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/table.cc:
Auto merged
vio/vio.c:
Auto merged
vio/viossl.c:
Auto merged
include/my_base.h:
Manual merge.
mysql-test/r/ps.result:
Manual merge.
mysql-test/r/select.result:
Manual merge.
mysql-test/t/ndb_alter_table.test:
Manual merge.
mysql-test/t/ndb_basic.test:
Manual merge.
mysql-test/t/ps.test:
Manual merge.
sql-common/client.c:
k
sql/ha_ndbcluster.cc:
Manual merge.
sql/item.cc:
Manual merge.
sql/sql_table.cc:
Manual merge.
Diffstat (limited to 'sql-common/client.c')
| -rw-r--r-- | sql-common/client.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/sql-common/client.c b/sql-common/client.c index cc90b2a105a..976d59d83a4 100644 --- a/sql-common/client.c +++ b/sql-common/client.c @@ -1495,12 +1495,17 @@ mysql_ssl_set(MYSQL *mysql __attribute__((unused)) , static void mysql_ssl_free(MYSQL *mysql __attribute__((unused))) { + struct st_VioSSLConnectorFd *st= + (struct st_VioSSLConnectorFd*) mysql->connector_fd; DBUG_ENTER("mysql_ssl_free"); + my_free(mysql->options.ssl_key, MYF(MY_ALLOW_ZERO_PTR)); my_free(mysql->options.ssl_cert, MYF(MY_ALLOW_ZERO_PTR)); my_free(mysql->options.ssl_ca, MYF(MY_ALLOW_ZERO_PTR)); my_free(mysql->options.ssl_capath, MYF(MY_ALLOW_ZERO_PTR)); - my_free(mysql->options.ssl_cipher, MYF(MY_ALLOW_ZERO_PTR)); + my_free(mysql->options.ssl_cipher, MYF(MY_ALLOW_ZERO_PTR)); + if (st) + SSL_CTX_free(st->ssl_context); my_free(mysql->connector_fd,MYF(MY_ALLOW_ZERO_PTR)); mysql->options.ssl_key = 0; mysql->options.ssl_cert = 0; |