rpms/mysql/devel mysql-ssl.patch, NONE, 1.1 .cvsignore, 1.31, 1.32 mysql.spec, 1.105, 1.106 sources, 1.31, 1.32 mysql-rename-bug.patch, 1.1, NONE mysql-view-bug.patch, 1.1, NONE

[Tom Lane (tgl)]

Author: tgl

Update of /cvs/pkgs/rpms/mysql/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15441

Modified Files:
	.cvsignore mysql.spec sources 
Added Files:
	mysql-ssl.patch 
Removed Files:
	mysql-rename-bug.patch mysql-view-bug.patch 
Log Message:
Update to mysql version 5.0.51a

mysql-ssl.patch:

--- NEW FILE mysql-ssl.patch ---
Repair 5.0.50 SSL breakage, per upstream bug
http://bugs.mysql.com/bug.php?id=33050


diff -Naur mysql-5.0.54a.orig/vio/viossl.c mysql-5.0.54a/vio/viossl.c
--- mysql-5.0.54a.orig/vio/viossl.c	2008-01-11 09:08:38.000000000 -0500
+++ mysql-5.0.54a/vio/viossl.c	2008-02-12 15:30:42.000000000 -0500
@@ -172,20 +172,15 @@
   vio_delete(vio);
 }
 
-int sslaccept(struct st_VioSSLFd *ptr, Vio *vio, long timeout)
-{
-  DBUG_ENTER("sslaccept");
-  DBUG_RETURN(sslconnect(ptr, vio, timeout));
-}
-
 
-int sslconnect(struct st_VioSSLFd *ptr, Vio *vio, long timeout)
+static int ssl_do(struct st_VioSSLFd *ptr, Vio *vio, long timeout,
+                  int (*connect_accept_func)(SSL*))
 {
   SSL *ssl;
   my_bool unused;
   my_bool was_blocking;
 
-  DBUG_ENTER("sslconnect");
+  DBUG_ENTER("ssl_do");
   DBUG_PRINT("enter", ("ptr: 0x%lx, sd: %d  ctx: 0x%lx",
                        (long) ptr, vio->sd, (long) ptr->ssl_context));
 
@@ -204,13 +199,9 @@
   SSL_SESSION_set_timeout(SSL_get_session(ssl), timeout);
   SSL_set_fd(ssl, vio->sd);
 
-  /*
-    SSL_do_handshake will select between SSL_connect
-    or SSL_accept depending on server or client side
-  */
-  if (SSL_do_handshake(ssl) < 1)
+  if (connect_accept_func(ssl) < 1)
   {
-    DBUG_PRINT("error", ("SSL_do_handshake failure"));
+    DBUG_PRINT("error", ("SSL_connect/accept failure"));
     report_errors(ssl);
     SSL_free(ssl);
     vio_blocking(vio, was_blocking, &unused);
@@ -259,6 +250,20 @@
 }
 
 
+int sslaccept(struct st_VioSSLFd *ptr, Vio *vio, long timeout)
+{
+  DBUG_ENTER("sslaccept");
+  DBUG_RETURN(ssl_do(ptr, vio, timeout, SSL_accept));
+}
+
+
+int sslconnect(struct st_VioSSLFd *ptr, Vio *vio, long timeout)
+{
+  DBUG_ENTER("sslconnect");
+  DBUG_RETURN(ssl_do(ptr, vio, timeout, SSL_connect));
+}
+
+
 int vio_ssl_blocking(Vio *vio __attribute__((unused)),
 		     my_bool set_blocking_mode,
 		     my_bool *old_mode)
@@ -269,4 +274,6 @@
   return (set_blocking_mode ? 0 : 1);
 }
 
+
+
 #endif /* HAVE_OPENSSL */


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/mysql/devel/.cvsignore,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- .cvsignore	22 Jul 2007 20:35:24 -0000	1.31
+++ .cvsignore	4 Mar 2008 02:46:54 -0000	1.32
@@ -1 +1 @@
-mysql-5.0.45.tar.gz
+mysql-5.0.51a.tar.gz


Index: mysql.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mysql/devel/mysql.spec,v
retrieving revision 1.105
retrieving revision 1.106
diff -u -r1.105 -r1.106
--- mysql.spec	3 Mar 2008 22:30:11 -0000	1.105
+++ mysql.spec	4 Mar 2008 02:46:54 -0000	1.106
@@ -1,6 +1,6 @@
 Name: mysql
-Version: 5.0.45
-Release: 11%{?dist}
+Version: 5.0.51a
+Release: 1%{?dist}
 Summary: MySQL client programs and shared libraries
 Group: Applications/Databases
 URL: http://www.mysql.com
@@ -29,8 +29,7 @@
 Patch9: mysql-bdb-link.patch
 Patch10: mysql-bdb-open.patch
 Patch11: mysql-innodb-crash.patch
-Patch12: mysql-rename-bug.patch
-Patch13: mysql-view-bug.patch
+Patch12: mysql-ssl.patch
 Patch14: mysql-ss-test.patch
 Patch15: mysql-stack-guard.patch
 
@@ -140,7 +139,6 @@
 %patch10 -p1
 %patch11 -p1
 %patch12 -p1
-%patch13 -p1
 %patch14 -p1
 %patch15 -p1
 
@@ -254,6 +252,7 @@
 rm -f ${RPM_BUILD_ROOT}%{_datadir}/mysql/mi_test_all*
 rm -f ${RPM_BUILD_ROOT}%{_datadir}/mysql/ndb-config-2-node.ini
 rm -f ${RPM_BUILD_ROOT}%{_datadir}/mysql/mysql.server
+rm -f ${RPM_BUILD_ROOT}%{_datadir}/mysql/mysqld_multi.server
 rm -f ${RPM_BUILD_ROOT}%{_datadir}/mysql/MySQL-shared-compat.spec
 rm -f ${RPM_BUILD_ROOT}%{_datadir}/mysql/*.plist
 rm -f ${RPM_BUILD_ROOT}%{_datadir}/mysql/preinstall
@@ -484,6 +483,9 @@
 %{_mandir}/man1/mysql_client_test.1*
 
 %changelog
+* Mon Mar  3 2008 Tom Lane <tgl at redhat.com> 5.0.51a-1
+- Update to mysql version 5.0.51a
+
 * Mon Mar  3 2008 Tom Lane <tgl at redhat.com> 5.0.45-11
 - Fix mysql-stack-guard patch to work correctly on IA64
 - Fix mysql.init to wait correctly when socket is not in default place


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mysql/devel/sources,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- sources	22 Jul 2007 20:35:24 -0000	1.31
+++ sources	4 Mar 2008 02:46:54 -0000	1.32
@@ -1 +1 @@
-a2a1c5a82bb22b45ab76a8ecab94e10d  mysql-5.0.45.tar.gz
+a83dbdbb91267daf73d2297a9c283dd1  mysql-5.0.51a.tar.gz


--- mysql-rename-bug.patch DELETED ---


--- mysql-view-bug.patch DELETED ---