database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-29 05:21:33 +03:00
Code Activity

Remove valgrind and compiler warnings

Browse Source 
Add function 'vio_end' that will cleanup resources allocated by vio and the components it uses.
This commit is contained in:
msvensson@neptunus.(none)
2006-05-08 17:14:06 +02:00
parent 405d08be71
commit b60540a862
8 changed files with 26 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
include/violite.h
View File

@ -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;

1
libmysql/libmysql.c
View File

@ -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)

2
sql/mysqld.cc
View File

@ -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

4
vio/test-ssl.c
View File

@ -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]);

2
vio/test-sslclient.c
View File

@ -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;

4
vio/test-sslserver.c
View File

@ -44,7 +44,7 @@ fatal_error( const char* r)
typedef struct {
int sd;
struct st_VioSSLAcceptorFd* ssl_acceptor;
struct st_VioSSLFd* ssl_acceptor;
} TH_ARGS;
static void
@ -82,7 +82,7 @@ main(int argc __attribute__((unused)), char** argv)
char ca_file[] = "../SSL/cacert.pem",
*ca_path = 0,
*cipher = 0;
struct st_VioSSLAcceptorFd* ssl_acceptor;
struct st_VioSSLFd* ssl_acceptor;
pthread_t th;
TH_ARGS th_args;

13
vio/vio.c
View File

@ -233,3 +233,16 @@ void vio_delete(Vio* vio)
my_free((gptr) vio,MYF(0));
}
}
/*
Cleanup memory allocated by vio or the
components below it when application finish
*/
void vio_end(void)
{
#ifdef HAVE_YASSL
yaSSL_CleanUp();
#endif
}

2
vio/viosslfactories.c
View File

@ -220,7 +220,7 @@ static void check_ssl_init()
}
/************************ VioSSLFd **********************************/
struct st_VioSSLFd *
static struct st_VioSSLFd *
new_VioSSLFd(const char *key_file, const char *cert_file,
const char *ca_file, const char *ca_path,
const char *cipher, SSL_METHOD *method)