Below is the list of changes that have just been committed into a local
5.0 repository of msvensson. When msvensson does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html
ChangeSet
1.2123 06/05/08 17:14:06 msvensson@neptunus.(none) +8 -0
Remove valgrind and compiler warnings
Add function 'vio_end' that will cleanup resources allocated by vio and the components it uses.
vio/viosslfactories.c
1.26 06/05/08 17:09:02 msvensson@neptunus.(none)[msvensson] +1 -1
Import patch warnings.patch
vio/vio.c
1.28 06/05/08 17:09:02 msvensson@neptunus.(none)[msvensson] +13 -0
Import patch warnings.patch
vio/test-sslserver.c
1.11 06/05/08 17:09:02 msvensson@neptunus.(none)[msvensson] +2 -2
Import patch warnings.patch
vio/test-sslclient.c
1.9 06/05/08 17:09:02 msvensson@neptunus.(none)[msvensson] +1 -1
Import patch warnings.patch
vio/test-ssl.c
1.10 06/05/08 17:09:02 msvensson@neptunus.(none)[msvensson] +2 -2
Import patch warnings.patch
sql/mysqld.cc
1.546 06/05/08 17:09:02 msvensson@neptunus.(none)[msvensson] +2 -0
Import patch warnings.patch
libmysql/libmysql.c
1.242 06/05/08 17:09:02 msvensson@neptunus.(none)[msvensson] +1 -0
Import patch warnings.patch
include/violite.h
1.46 06/05/08 17:09:02 msvensson@neptunus.(none)[msvensson] +4 -0
Import patch warnings.patch
# This is a BitKeeper patch. What follows are the unified diffs for the
# set of deltas contained in the patch. The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User: msvensson
# Host: neptunus.(none)
# Root: /home/msvensson/mysql/mysql-5.0-maint
--- 1.45/include/violite.h 2006-03-10 16:41:09 +01:00
+++ 1.46/include/violite.h 2006-05-08 17:09:02 +02:00
@@ -129,6 +129,8 @@
int vio_close_shared_memory(Vio * vio);
#endif
+void vio_end(void);
+
#ifdef __cplusplus
}
#endif
@@ -193,7 +195,9 @@
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.241/libmysql/libmysql.c 2006-04-06 10:03:09 +02:00
+++ 1.242/libmysql/libmysql.c 2006-05-08 17:09:02 +02:00
@@ -188,6 +188,7 @@
mysql_thread_end();
finish_client_errs();
free_charsets();
+ vio_end();
mysql_client_init= org_my_init_done= 0;
#ifdef EMBEDDED_SERVER
if (stderror_file)
--- 1.545/sql/mysqld.cc 2006-04-26 22:22:58 +02:00
+++ 1.546/sql/mysqld.cc 2006-05-08 17:09:02 +02:00
@@ -1136,6 +1136,8 @@
my_free((gptr) ssl_acceptor_fd, MYF(0));
}
#endif /* HAVE_OPENSSL */
+ vio_end();
+
#ifdef USE_REGEX
my_regex_end();
#endif
--- 1.9/vio/test-ssl.c 2005-03-29 23:31:49 +02:00
+++ 1.10/vio/test-ssl.c 2006-05-08 17:09:02 +02:00
@@ -57,8 +57,8 @@
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]);
--- 1.8/vio/test-sslclient.c 2005-03-29 23:31:49 +02:00
+++ 1.9/vio/test-sslclient.c 2006-05-08 17:09:02 +02:00
@@ -46,7 +46,7 @@
{
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;
--- 1.10/vio/test-sslserver.c 2004-12-30 23:41:17 +01:00
+++ 1.11/vio/test-sslserver.c 2006-05-08 17:09:02 +02:00
@@ -44,7 +44,7 @@
typedef struct {
int sd;
- struct st_VioSSLAcceptorFd* ssl_acceptor;
+ struct st_VioSSLFd* ssl_acceptor;
} TH_ARGS;
static void
@@ -82,7 +82,7 @@
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;
--- 1.27/vio/vio.c 2006-03-10 16:41:10 +01:00
+++ 1.28/vio/vio.c 2006-05-08 17:09:02 +02:00
@@ -233,3 +233,16 @@
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
+}
--- 1.25/vio/viosslfactories.c 2006-05-04 10:30:04 +02:00
+++ 1.26/vio/viosslfactories.c 2006-05-08 17:09:02 +02:00
@@ -220,7 +220,7 @@
}
/************************ 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)
| Thread |
|---|
| • bk commit into 5.0 tree (msvensson:1.2123) | msvensson | 8 May |
