From: Georgi Kodinov
Date: August 21 2012 2:25pm
Subject: bzr push into mysql-trunk branch (Georgi.Kodinov:4266 to 4267)
List-Archive: http://lists.mysql.com/commits/144590
Message-Id: <20120821142525.2533.48274.4267@dhcp-uk-twvpn-2-vpnpool-10-175-55-24.vpn.oracle.com>
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit

 4267 Georgi Kodinov	2012-08-21 [merge]
      merge

    modified:
      include/sslopt-longopts.h
 4266 Vasil Dimov	2012-08-21
      Register the mutex which protects "recalc_pool" in dict0stats_bg.cc
      with all_innodb_mutexes[].
      
      Spotted by:	Sunny

    modified:
      storage/innobase/dict/dict0stats_bg.cc
      storage/innobase/handler/ha_innodb.cc
      storage/innobase/include/dict0stats_bg.h
=== modified file 'include/sslopt-longopts.h'
--- a/include/sslopt-longopts.h	2012-03-06 14:29:42 +0000
+++ b/include/sslopt-longopts.h	2012-08-16 15:00:09 +0000
@@ -38,10 +38,10 @@
   {"ssl-key", OPT_SSL_KEY, "X509 key in PEM format (implies --ssl).",
    &opt_ssl_key, &opt_ssl_key, 0, GET_STR, REQUIRED_ARG,
    0, 0, 0, 0, 0, 0},
-  {"ssl-crl", OPT_SSL_KEY, "Certificate revocation list (implies --ssl).",
+  {"ssl-crl", OPT_SSL_CRL, "Certificate revocation list (implies --ssl).",
    &opt_ssl_crl, &opt_ssl_crl, 0, GET_STR, REQUIRED_ARG,
    0, 0, 0, 0, 0, 0},
-  {"ssl-crlpath", OPT_SSL_KEY, 
+  {"ssl-crlpath", OPT_SSL_CRLPATH, 
     "Certificate revocation list path (implies --ssl).",
    &opt_ssl_crlpath, &opt_ssl_crlpath, 0, GET_STR, REQUIRED_ARG,
    0, 0, 0, 0, 0, 0},

No bundle (reason: useless for push emails).