bk commit into 5.0 tree (msvensson:1.2120)

[msvensson]

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.2120 06/05/05 09:42:15 msvensson@neptunus.(none) +4 -0
  Use correct types in vio/test-*
  Make new_VioSSLFD static
  Only define ssl_arg oini st_vio if compiling with SSL

  vio/viosslfactories.c
    1.26 06/05/05 09:42:10 msvensson@neptunus.(none) +1 -1
    Make new_VioSSLFd static

  vio/test-sslserver.c
    1.11 06/05/05 09:42:10 msvensson@neptunus.(none) +2 -2
    Use type st_VioSSLFD

  vio/test-ssl.c
    1.10 06/05/05 09:42:10 msvensson@neptunus.(none) +2 -2
    Use type st_VioSSLFD

  include/violite.h
    1.46 06/05/05 09:42:10 msvensson@neptunus.(none) +2 -0
    Only inlclude ssl_arg if compiling with SSL

# 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-05 09:42:10 +02:00
@@ -193,7 +193,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.9/vio/test-ssl.c	2005-03-29 23:31:49 +02:00
+++ 1.10/vio/test-ssl.c	2006-05-05 09:42:10 +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.10/vio/test-sslserver.c	2004-12-30 23:41:17 +01:00
+++ 1.11/vio/test-sslserver.c	2006-05-05 09:42:10 +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.25/vio/viosslfactories.c	2006-05-04 10:30:04 +02:00
+++ 1.26/vio/viosslfactories.c	2006-05-05 09:42:10 +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)