bk commit into 5.1 tree (msvensson:1.2424)

[msvensson]

Below is the list of changes that have just been committed into a local
5.1 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@stripped, 2007-02-06 22:01:21+01:00, msvensson@stripped +3 -0
  Merge pilot.mysql.com:/home/msvensson/mysql/mysql-5.0-maint
  into  pilot.mysql.com:/home/msvensson/mysql/mysql-5.1-new-maint
  MERGE: 1.1810.2372.82

  mysql-test/t/rpl_openssl.test@stripped, 2007-02-06 22:01:18+01:00, msvensson@stripped +0 -0
    Auto merged
    MERGE: 1.11.1.9

  vio/vio.c@stripped, 2007-02-06 22:01:18+01:00, msvensson@stripped +0 -0
    Auto merged
    MERGE: 1.28.2.3

  vio/viossl.c@stripped, 2007-02-06 22:01:18+01:00, msvensson@stripped +0 -0
    Auto merged
    MERGE: 1.34.2.8

# 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:	pilot.mysql.com
# Root:	/home/msvensson/mysql/mysql-5.1-new-maint/RESYNC

--- 1.22/mysql-test/t/rpl_openssl.test	2006-12-22 10:20:37 +01:00
+++ 1.23/mysql-test/t/rpl_openssl.test	2007-02-06 22:01:18 +01:00
@@ -1,7 +1,3 @@
-# TODO: THIS TEST DOES NOT WORK ON WINDOWS
-#       This should be fixed.
---source include/not_windows.inc
-
 source include/have_openssl.inc;
 source include/master-slave.inc;
 

--- 1.32/vio/vio.c	2007-01-29 14:35:07 +01:00
+++ 1.33/vio/vio.c	2007-02-06 22:01:18 +01:00
@@ -86,7 +86,7 @@
 #ifdef HAVE_OPENSSL 
   if (type == VIO_TYPE_SSL)
   {
-    vio->viodelete	=vio_delete;
+    vio->viodelete	=vio_ssl_delete;
     vio->vioerrno	=vio_errno;
     vio->read		=vio_ssl_read;
     vio->write		=vio_ssl_write;
@@ -220,17 +220,16 @@
 #endif
 #endif
 
+
 void vio_delete(Vio* vio)
 {
-  /* It must be safe to delete null pointers. */
-  /* This matches the semantics of C++'s delete operator. */
-  if (vio)
-  {
-    if (vio->type != VIO_CLOSED)
-      vio->vioclose(vio);
-    my_free((gptr) vio->read_buffer, MYF(MY_ALLOW_ZERO_PTR));
-    my_free((gptr) vio,MYF(0));
-  }
+  if (!vio)
+    return; /* It must be safe to delete null pointers. */
+
+  if (vio->type != VIO_CLOSED)
+    vio->vioclose(vio);
+  my_free((gptr) vio->read_buffer, MYF(MY_ALLOW_ZERO_PTR));
+  my_free((gptr) vio,MYF(0));
 }
 
 

--- 1.45/vio/viossl.c	2007-01-29 14:35:07 +01:00
+++ 1.46/vio/viossl.c	2007-02-06 22:01:18 +01:00
@@ -140,10 +140,26 @@
                                SSL_get_error(ssl, r)));
       break;
     }
-    SSL_free(ssl);
-    vio->ssl_arg= 0;
   }
   DBUG_RETURN(vio_close(vio));
+}
+
+
+void vio_ssl_delete(Vio *vio)
+{
+  if (!vio)
+    return; /* It must be safe to delete null pointer */
+
+  if (vio->type == VIO_TYPE_SSL)
+    vio_ssl_close(vio); /* Still open, close connection first */
+
+  if (vio->ssl_arg)
+  {
+    SSL_free((SSL*) vio->ssl_arg);
+    vio->ssl_arg= 0;
+  }
+
+  vio_delete(vio);
 }