List:Commits« Previous MessageNext Message »
From:Andrei Elkin Date:August 19 2011 11:45pm
Subject:bzr push into mysql-next-mr-wl5569 branch (andrei.elkin:3392 to 3393)
View as plain text  
 3393 Andrei Elkin	2011-08-20
      fixing wrong automatic merge that introduced invocation of get_info() with incorrect signature.

    modified:
      sql/rpl_mi.cc
 3392 Andrei Elkin	2011-08-19 [merge]
      merge wl5569 with mysql-trunk

    added:
      include/mysql/get_password.h
      mysql-test/include/have_openssl.inc
      mysql-test/r/openssl.require
      mysql-test/r/ssl-crl-revoked-crl.result
      mysql-test/r/ssl_crl.result
      mysql-test/r/ssl_crl_clients-valid.result
      mysql-test/r/ssl_crl_clients.result
      mysql-test/r/ssl_crl_clients_valid.result
      mysql-test/r/ssl_crl_clrpath.result
      mysql-test/std_data/crl-ca-cert.pem
      mysql-test/std_data/crl-client-cert.pem
      mysql-test/std_data/crl-client-key.pem
      mysql-test/std_data/crl-client-revoked.crl
      mysql-test/std_data/crl-server-cert.pem
      mysql-test/std_data/crl-server-key.pem
      mysql-test/std_data/crldir/
      mysql-test/std_data/crldir/fc725416.r0
      mysql-test/t/ssl_crl-master.opt
      mysql-test/t/ssl_crl.test
      mysql-test/t/ssl_crl_clients-master.opt
      mysql-test/t/ssl_crl_clients.test
      mysql-test/t/ssl_crl_clients_valid-master.opt
      mysql-test/t/ssl_crl_clients_valid.test
      mysql-test/t/ssl_crl_clrpath-master.opt
      mysql-test/t/ssl_crl_clrpath.test
    modified:
      client/client_priv.h
      client/get_password.c
      client/mysql.cc
      client/mysqladmin.cc
      client/mysqlcheck.c
      client/mysqldump.c
      client/mysqlimport.c
      client/mysqlshow.c
      client/mysqlslap.c
      client/mysqltest.cc
      extra/yassl/CMakeLists.txt
      extra/yassl/src/yassl_int.cpp
      include/mysql.h
      include/mysql.h.pp
      include/sql_common.h
      include/sslopt-case.h
      include/sslopt-longopts.h
      include/sslopt-vars.h
      include/violite.h
      mysql-test/include/check-testcase.test
      mysql-test/lib/mtr_cases.pm
      mysql-test/r/variables.result
      mysql-test/suite/funcs_1/r/is_columns_mysql.result
      scripts/mysql_system_tables.sql
      scripts/mysql_system_tables_fix.sql
      sql-common/client.c
      sql/lex.h
      sql/mysqld.cc
      sql/mysqld.h
      sql/rpl_mi.cc
      sql/rpl_mi.h
      sql/rpl_slave.cc
      sql/sql_lex.h
      sql/sql_yacc.yy
      sql/sys_vars.cc
      storage/innobase/row/row0umod.c
      support-files/mysql.spec.sh
      vio/viosslfactories.c
=== modified file 'sql/rpl_mi.cc'
--- a/sql/rpl_mi.cc	2011-08-19 18:16:46 +0000
+++ b/sql/rpl_mi.cc	2011-08-19 23:44:34 +0000
@@ -439,8 +439,8 @@ bool Master_info::read_info(Rpl_info_han
 
   if (lines >= LINE_FOR_SSL_CRLPATH)
   {
-    if (from->get_info(ssl_crl, sizeof(ssl_crl), 0) ||
-        from->get_info(ssl_crlpath, sizeof(ssl_crlpath), 0))
+    if (from->get_info(ssl_crl, sizeof(ssl_crl), (char *) 0) ||
+        from->get_info(ssl_crlpath, sizeof(ssl_crlpath), (char *) 0))
       DBUG_RETURN(TRUE);
   }
 

No bundle (reason: useless for push emails).
Thread
bzr push into mysql-next-mr-wl5569 branch (andrei.elkin:3392 to 3393) Andrei Elkin22 Aug