Commit 144c7622 authored by unknown's avatar unknown
Browse files

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
parent 16d46c9c

client/mysqlimport.c

+1 −1
Original line number Diff line number Diff line
@@ -406,7 +406,7 @@ static MYSQL *db_connect(char *host, char *database, 
  if (opt_use_ssl)

    mysql_ssl_set(mysql, opt_ssl_key, opt_ssl_cert, opt_ssl_ca,

		  opt_ssl_capath, opt_ssl_cipher);

  mysql_options(&mysql_connection,MYSQL_OPT_SSL_VERIFY_SERVER_CERT,

  mysql_options(mysql,MYSQL_OPT_SSL_VERIFY_SERVER_CERT,

                (char*)&opt_ssl_verify_server_cert);

#endif

  if (opt_protocol)

include/violite.h

+1 −1
Original line number Diff line number Diff line
@@ -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

vio/viosslfactories.c

+1 −1
Original line number Diff line number Diff line
@@ -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));