Commit bc324937 authored by unknown's avatar unknown
Browse files

Remove valgrind and compiler warnings 

Add function 'vio_end' that will cleanup resources allocated by vio and the components it uses.


include/violite.h:
  Import patch warnings.patch
libmysql/libmysql.c:
  Import patch warnings.patch
sql/mysqld.cc:
  Import patch warnings.patch
vio/test-ssl.c:
  Import patch warnings.patch
vio/test-sslclient.c:
  Import patch warnings.patch
vio/test-sslserver.c:
  Import patch warnings.patch
vio/vio.c:
  Import patch warnings.patch
vio/viosslfactories.c:
  Import patch warnings.patch
parent c593d1f1

include/violite.h

+4 −0
Original line number Diff line number Diff line
@@ -129,6 +129,8 @@ int vio_write_shared_memory(Vio *vio, const gptr buf, int size); 
int vio_close_shared_memory(Vio * vio);

#endif



void vio_end(void);



#ifdef	__cplusplus

}

#endif
@@ -193,7 +195,9 @@ struct st_vio 
  my_bool (*was_interrupted)(Vio*);

  int     (*vioclose)(Vio*);

  void	  (*timeout)(Vio*, unsigned int which, unsigned int timeout);

#ifdef HAVE_OPENSSL

  void	  *ssl_arg;

#endif

#ifdef HAVE_SMEM

  HANDLE  handle_file_map;

  char    *handle_map;

libmysql/libmysql.c

+1 −0
Original line number Diff line number Diff line
@@ -188,6 +188,7 @@ void STDCALL mysql_server_end() 
    mysql_thread_end();

  finish_client_errs();

  free_charsets();

  vio_end();

  mysql_client_init= org_my_init_done= 0;

#ifdef EMBEDDED_SERVER

  if (stderror_file)

sql/mysqld.cc

+2 −0
Original line number Diff line number Diff line
@@ -1136,6 +1136,8 @@ void clean_up(bool print_message) 
    my_free((gptr) ssl_acceptor_fd, MYF(0));

  }

#endif /* HAVE_OPENSSL */

  vio_end();



#ifdef USE_REGEX

  my_regex_end();

#endif

vio/test-ssl.c

+2 −2
Original line number Diff line number Diff line
@@ -57,8 +57,8 @@ main(int argc, char** argv) 
  char*	cipher=0;

  int	child_pid,sv[2];

  my_bool unused;

  struct st_VioSSLAcceptorFd* ssl_acceptor=0;

  struct st_VioSSLConnectorFd* ssl_connector=0; 

  struct st_VioSSLFd* ssl_acceptor= 0;

  struct st_VioSSLFd* ssl_connector= 0;

  Vio* client_vio=0, *server_vio=0;

  MY_INIT(argv[0]);

  DBUG_PROCESS(argv[0]);

vio/test-sslclient.c

+1 −1
Original line number Diff line number Diff line
@@ -46,7 +46,7 @@ main( int argc __attribute__((unused)), 
{

	char	client_key[] = "../SSL/client-key.pem",	client_cert[] = "../SSL/client-cert.pem";

	char	ca_file[] = "../SSL/cacert.pem",	*ca_path = 0, *cipher=0;

	struct st_VioSSLConnectorFd* ssl_connector=0; 

	struct st_VioSSLFd* ssl_connector= 0;

	struct sockaddr_in sa;

	Vio* client_vio=0;

	int err;