diff options
author | unknown <msvensson@neptunus.(none)> | 2006-05-12 09:10:04 +0200 |
---|---|---|
committer | unknown <msvensson@neptunus.(none)> | 2006-05-12 09:10:04 +0200 |
commit | 144c7622c7906ac554b5bbaa60c4e89113dac1e5 (patch) | |
tree | 45592f901430d7d65f8084b9972f68657d8d08b0 /include | |
parent | 16d46c9cba395c05b796f59020383a1721e25611 (diff) | |
download | mariadb-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 'include')
-rw-r--r-- | include/violite.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/violite.h b/include/violite.h index f17fabaa909..4837ade64b4 100644 --- a/include/violite.h +++ b/include/violite.h @@ -121,7 +121,7 @@ struct st_VioSSLFd *new_VioSSLAcceptorFd(const char *key_file, const char *cert_file, const char *ca_file,const char *ca_path, const char *cipher); -void free_vio_ssl_acceptor_fd(struct st_VioSSLAcceptorFd *fd); +void free_vio_ssl_acceptor_fd(struct st_VioSSLFd *fd); #endif /* HAVE_OPENSSL */ #ifdef HAVE_SMEM |