summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorunknown <msvensson@neptunus.(none)>2006-05-08 17:14:06 +0200
committerunknown <msvensson@neptunus.(none)>2006-05-08 17:14:06 +0200
commitbc324937327f480e0dff314480884aea8397869d (patch)
tree6f4ee6d9633aea38f1767615f02b4dbdfe74c49f /include
parentc593d1f1cac06e9e8a549febaa13d72f90eec4f4 (diff)
downloadmariadb-git-bc324937327f480e0dff314480884aea8397869d.tar.gz
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
Diffstat (limited to 'include')
-rw-r--r--include/violite.h4
1 files changed, 4 insertions, 0 deletions
diff --git a/include/violite.h b/include/violite.h
index b2a5f1640a5..fd870177c68 100644
--- a/include/violite.h
+++ b/include/violite.h
@@ -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;