List:Commits« Previous MessageNext Message »
From:Georgi Kodinov Date:March 8 2012 1:28pm
Subject:bzr push into mysql-trunk branch (Georgi.Kodinov:3733 to 3734) Bug#13799126
View as plain text  
 3734 Georgi Kodinov	2012-03-05
      Bug #13799126: VIOSSLFACTORIES DOES NOT COMPILE ON ORACLE LINUX 6.0 
      WITH SSL=SYSTEM
      
      The newer SSL version used in this OS requires that a const predicate is added 
      to one of the internal function signatures.
      It's safe to add a const to this function since the variable is uses as a constant
      and it's safe to convert from a non-const to const.

    modified:
      vio/viosslfactories.c
 3733 Marko Mäkelä	2012-03-08 [merge]
      Merge mysql-5.5 to mysql-trunk.

    modified:
      storage/innobase/btr/btr0pcur.cc
=== modified file 'vio/viosslfactories.c'
--- a/vio/viosslfactories.c	2011-09-07 10:08:09 +0000
+++ b/vio/viosslfactories.c	2012-03-05 17:19:51 +0000
@@ -164,7 +164,7 @@ static void check_ssl_init()
 static struct st_VioSSLFd *
 new_VioSSLFd(const char *key_file, const char *cert_file,
              const char *ca_file, const char *ca_path,
-             const char *cipher, SSL_METHOD *method, 
+             const char *cipher, const SSL_METHOD *method, 
              enum enum_ssl_init_error *error,
              const char *crl_file, const char *crl_path)
 {

No bundle (reason: useless for push emails).
Thread
bzr push into mysql-trunk branch (Georgi.Kodinov:3733 to 3734) Bug#13799126Georgi Kodinov9 Mar