From: Georgi Kodinov
Date: August 21 2012 2:25pm
Subject: bzr push into mysql-5.6 branch (Georgi.Kodinov:4138 to 4139) Bug#14503692
List-Archive: http://lists.mysql.com/commits/144589
X-Bug: 14503692
Message-Id: <20120821142526.2537.87116.4139@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

 4139 Georgi Kodinov	2012-08-16
      Bug #14503692: -SSL-CRL AND --SSL-CRLPATH HAVE A WRONG OPTION ID
      
      Fixed the ids of the command line options to use the correct option ids.

    modified:
      include/sslopt-longopts.h
 4138 Jimmy Yang	2012-08-21
      Fix Bug #14156259 - BROKEN ERROR HANDLING IN ALTER TABLE...ADD FOREIGN
            
      rb://1119 Approved by Marko

    modified:
      mysql-test/suite/innodb/r/innodb-index-online-fk.result
      mysql-test/suite/innodb/r/innodb-index.result
      mysql-test/suite/innodb/t/innodb-index-online-fk.test
      mysql-test/suite/innodb/t/innodb-index.test
      storage/innobase/dict/dict0dict.cc
      storage/innobase/handler/handler0alter.cc
=== 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).