bzr commit into mysql-trunk branch (tatjana.nuernberg:3121)

[Tatjana Azundris Nuernberg]

#At file:///Users/tnurnberg/forest/11745920/56-11745920/ based on revid:anitha.gopi@stripped

 3121 Tatjana Azundris Nuernberg	2011-05-27 [merge]
      -Werror fixes for 11745920 via 5.5

    modified:
      vio/viossl.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: revision is a merge (you can force generation of a bundle with env var BZR_FORCE_BUNDLE=1)).