From: Tatjana Azundris Nuernberg
Date: May 27 2011 10:02am
Subject: bzr commit into mysql-5.5 branch (tatjana.nuernberg:3407)
List-Archive: http://lists.mysql.com/commits/138300
Message-Id: <201105271002.p4RA2SFb008290@acsmt356.oracle.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============3986437030300348371=="

--===============3986437030300348371==
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

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

 3407 Tatjana Azundris Nuernberg	2011-05-27
      build fixes for -Werror (11745920)

    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)
 {


--===============3986437030300348371==
MIME-Version: 1.0
Content-Type: text/bzr-bundle; charset="us-ascii";
 name="bzr/tatjana.nuernberg@stripped"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: tatjana.nuernberg@stripped\
#   ocwi9edbdrlujdwc
# target_branch: file:///Users/tnurnberg/forest/11745920/55-11745920/
# testament_sha1: 4a93c92c5a9cef16e92e28aab0cf4aad80d9536a
# timestamp: 2011-05-27 11:02:23 +0100
# base_revision_id: anitha.gopi@stripped\
#   w1k1k8ajiv23yk2a
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWVzVwQUAAXdfgAAQWGP/93eB
hoC////wUAOZXtzqY0O6u3gkkk0yZGEYJkJk2UyaanpGJ5JjUGU1GjRmpiFNNPUYT1GgAADQDIIJ
MmJtTCmEQNGQPKPU09EaBlImT2qGT1DRiaBpoGgxANACSRNNNJpP0oeRD1BtE0AMg0AOHjTRwn58
BjhigoKX6tRygoLTV1Emn5SS+utEQjpyEusJ1wEHDJuVbU3LJG5fXHrz5r09WptQi67bZrWXeVQi
o1k+OjGdRD9BTZZ8ZBaJKx5a2Oq0pFqRmlyxPwPoC3ggLFrnBcHKAYAt5MDSYsiO0yAPy1YTYbjB
WFtjPrzkxZDCgWUXZGQyC4nooEa+rGFMAdfK9cztBITyEvnfpsfUb0VclhTiPtUKyUy2ujVYJiQx
VhgPw0ViXIHEDGnC0DaInBZWSZWhtWYhYxWDBEaJiAgfscJSClrFQcWtjaDSLasQ9Jm1JCuH71we
6wZPXjIqSME4lXqPZEXdtkKxVXckFRkSOAgBrjbTABR7LLDUMRexCBF2ybRGIfhTG664reNGW7MU
3R4HMWgJe97OJ4Se+8f5sg+mhz7g1gjGruB2WPWl7Fko+GaPFQ6lIo4kBFhJfAX566sR3o2/l4/T
AoTqrkUCdP07c+vo/3fq5/NMVDBy/mIxOTAcnA/wNZtLbsId5h680iOI4NwnfD0L1uzmiio6IIdK
mmRTvX1kAv1Z7hsnHjEKZBiGzFB5JdHDDemmDnqOfhmlITvF3l15WqckSpE/wLOUecY50aIKWliG
rJwL3CpdwTWKwmkG2I2g7JkGRHvtjefbVsLsIqMLWdkiB2FhXIJ3WHxmZZ64Ys7HZj54HVMoaNFy
Dbeg7+HbbcQxgyc9JWUEhrrK4D6v9R5WuWBdNSwG7h2MqG4qApUIeRF0lB8q5CtUpPB+00FaNz5s
sT5VoCT/aZ3vG0pByadwZlsqUmPztJkE4tI9duBivpMsSWAQz+BlXQDKY0XhWXlSQ2xrdmeFWYMB
rJCmbaVDKLuEDsApA3yIGxoAbL7J0c9xFUooZYgOVTUi0ZHnCCYOt5xpo/iRmBympkbaaGm1ELBw
PtPbDLhEY4lSSzEQ7KxEEb/eS40ECVMMKQ0CYTorvogrBpe4DYlZcFZv3sepY8iGmpzu4rhIkM7X
qpsdcat9WTurHoLd4JhBlG3+eBFbBy6EWXTDhULgCjEFXw8DKCxLJYXxMdQbXKLyIE/fxdyRThQk
FzVwQUA=


--===============3986437030300348371==--