bzr push into mysql-5.5 branch (joerg.bruehe:4042 to 4043)

[Joerg Bruehe]

 4043 Joerg Bruehe	2012-11-07
      Hack to support building - avoid SSL patch breakage

    removed:
      packaging/rpm-uln/mysql-chain-certs.patch
    modified:
      packaging/rpm-uln/mysql.spec.sh
 4042 Joerg Bruehe	2012-11-07
      Keep MTR to a minimum.

    modified:
      mysql-test/collections/default.push
=== removed file 'packaging/rpm-uln/mysql-chain-certs.patch'
--- a/packaging/rpm-uln/mysql-chain-certs.patch	2012-06-08 17:44:06 +0000
+++ b/packaging/rpm-uln/mysql-chain-certs.patch	1970-01-01 00:00:00 +0000
@@ -1,41 +0,0 @@
-Fix things so that chains of certificates work in the server and client
-certificate files.
-
-This only really works for OpenSSL-based builds, as yassl is unable to read
-multiple certificates from a file.  The patch below to yassl/src/ssl.cpp
-doesn't fix that, but just arranges that the viosslfactories.c patch won't
-have any ill effects in a yassl build.  Since we don't use yassl in Red Hat/
-Fedora builds, I'm not feeling motivated to try to fix yassl for this.
-
-See RH bug #598656.  Filed upstream at http://bugs.mysql.com/bug.php?id=54158
-
-
-diff -Naur mysql-5.1.47.orig/vio/viosslfactories.c mysql-5.1.47/vio/viosslfactories.c
---- mysql-5.1.47.orig/vio/viosslfactories.c	2010-05-06 11:28:07.000000000 -0400
-+++ mysql-5.1.47/vio/viosslfactories.c	2010-05-26 23:23:46.000000000 -0400
-@@ -100,7 +100,7 @@
- 		       (long) ctx, cert_file, key_file));
-   if (cert_file)
-   {
--    if (SSL_CTX_use_certificate_file(ctx, cert_file, SSL_FILETYPE_PEM) <= 0)
-+    if (SSL_CTX_use_certificate_chain_file(ctx, cert_file) <= 0)
-     {
-       *error= SSL_INITERR_CERT;
-       DBUG_PRINT("error",("%s from file '%s'", sslGetErrString(*error), cert_file));
-diff -Naur mysql-5.1.47.orig/extra/yassl/src/ssl.cpp mysql-5.1.47/extra/yassl/src/ssl.cpp
---- mysql-5.1.47.orig/extra/yassl/src/ssl.cpp	2010-05-06 11:24:26.000000000 -0400
-+++ mysql-5.1.47/extra/yassl/src/ssl.cpp	2010-05-26 23:29:13.000000000 -0400
-@@ -1606,10 +1606,10 @@
-     }
- 
- 
--    int SSL_CTX_use_certificate_chain_file(SSL_CTX*, const char*)
-+    int SSL_CTX_use_certificate_chain_file(SSL_CTX* ctx, const char* file)
-     {
--        // TDOD:
--        return SSL_SUCCESS;
-+        // For the moment, treat like use_certificate_file
-+        return read_file(ctx, file, SSL_FILETYPE_PEM, Cert);
-     }
- 
- 

=== modified file 'packaging/rpm-uln/mysql.spec.sh'
--- a/packaging/rpm-uln/mysql.spec.sh	2012-09-18 11:38:43 +0000
+++ b/packaging/rpm-uln/mysql.spec.sh	2012-11-07 17:54:47 +0000
@@ -244,7 +244,7 @@ Patch13: mysql-expired-certs.patch
        # Will not be used by MySQL
 # Patch14: mysql-missing-string-code.patch   Undecided, will not work in 5.5 (cmake)
 # Patch15: mysql-lowercase-bug.patch         Fixed in MySQL 5.1.54 and 5.5.9
-Patch16: mysql-chain-certs.patch
+# broken by Dev   Patch16: mysql-chain-certs.patch
 Patch17: mysql-5.5-libdir.patch
 Patch18: mysql-5.5-fix-tests.patch
 Patch19: mysql-5.5-mtr1.patch
@@ -399,7 +399,7 @@ cd %{src_dir} # read about "%setup -n"
 # %patch10 -p1
 # %patch13 -p1
 # %patch14 -p1
-%patch16 -p1
+# broken by Dev   %patch16 -p1
 %patch17 -p1
 %patch18 -p1
 %patch19 -p1

No bundle (reason: useless for push emails).