List:Commits« Previous MessageNext Message »
From:Tatjana Azundris Nuernberg Date:May 27 2011 10:26am
Subject:bzr push into mysql-5.5 branch (tatjana.nuernberg:3406 to 3407)
View as plain text  
 3407 Tatjana Azundris Nuernberg	2011-05-27
      build fixes for -Werror (11745920)

    modified:
      vio/viossl.c
 3406 Anitha Gopi	2011-05-27 [merge]
      Automerge : Updating local tree

    added:
      mysql-test/suite/binlog/r/binlog_reset_master.result
      mysql-test/suite/binlog/t/binlog_reset_master.test
      mysql-test/suite/rpl/t/rpl_typeconv-master.opt
    modified:
      BUILD/SETUP.sh
      cmake/configure.pl
      cmake/os/WindowsCache.cmake
      include/violite.h
      libmysql/errmsg.c
      mysql-test/lib/mtr_cases.pm
      mysql-test/lib/mtr_misc.pl
      mysql-test/mysql-test-run.pl
      mysql-test/r/func_math.result
      mysql-test/r/openssl_1.result
      mysql-test/suite/innodb/r/innodb_mysql.result
      mysql-test/suite/innodb/t/innodb_mysql.test
      mysql-test/t/func_math.test
      sql-common/client.c
      sql/item_func.cc
      sql/log.cc
      sql/mysqld.cc
      sql/sql_acl.cc
      sql/sql_parse.cc
      vio/test-ssl.c
      vio/test-sslclient.c
      vio/test-sslserver.c
      vio/viossl.c
      vio/viosslfactories.c
      vio/viotest-ssl.c
=== modified file 'vio/viossl.c'
--- a/vio/viossl.c	2011-05-19 09:47:43 +0000
+++ b/vio/viossl.c	2011-05-27 10:02:10 +0000
@@ -24,6 +24,8 @@
 
 #ifdef HAVE_OPENSSL
 
+#ifndef DBUG_OFF
+
 static void
 report_errors(SSL* ssl)
 {
@@ -31,9 +33,7 @@ report_errors(SSL* ssl)
   const char *file;
   const char *data;
   int line, flags;
-#ifndef DBUG_OFF
   char buf[512];
-#endif
 
   DBUG_ENTER("report_errors");
 
@@ -51,6 +51,8 @@ report_errors(SSL* ssl)
   DBUG_VOID_RETURN;
 }
 
+#endif
+
 
 size_t vio_ssl_read(Vio *vio, uchar* buf, size_t size)
 {

No bundle (reason: useless for push emails).
Thread
bzr push into mysql-5.5 branch (tatjana.nuernberg:3406 to 3407) Tatjana Azundris Nuernberg27 May