summaryrefslogtreecommitdiff
path: root/vio
diff options
context:
space:
mode:
authorunknown <msvensson@neptunus.(none)>2006-05-12 09:10:04 +0200
committerunknown <msvensson@neptunus.(none)>2006-05-12 09:10:04 +0200
commit144c7622c7906ac554b5bbaa60c4e89113dac1e5 (patch)
tree45592f901430d7d65f8084b9972f68657d8d08b0 /vio
parent16d46c9cba395c05b796f59020383a1721e25611 (diff)
downloadmariadb-git-144c7622c7906ac554b5bbaa60c4e89113dac1e5.tar.gz
Fix after merge 5.0->5.1
client/mysqlimport.c: Variable name changed mysql_connection -> mysql include/violite.h: Type changed st_VioSSLAcceptorFd-> sl_VioSSLFd vio/viosslfactories.c: Type changed st_VioSSLAcceptorFd-> sl_VioSSLFd
Diffstat (limited to 'vio')
-rw-r--r--vio/viosslfactories.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/vio/viosslfactories.c b/vio/viosslfactories.c
index 52130e6f92a..af2118417b2 100644
--- a/vio/viosslfactories.c
+++ b/vio/viosslfactories.c
@@ -346,7 +346,7 @@ new_VioSSLAcceptorFd(const char *key_file, const char *cert_file,
}
-void free_vio_ssl_acceptor_fd(struct st_VioSSLAcceptorFd *fd)
+void free_vio_ssl_acceptor_fd(struct st_VioSSLFd *fd)
{
SSL_CTX_free(fd->ssl_context);
my_free((gptr) fd, MYF(0));