From: Tor Didriksen
Date: June 1 2011 12:43pm
Subject: bzr commit into mysql-trunk branch (tor.didriksen:3141) Bug#11762221
List-Archive: http://lists.mysql.com/commits/138536
X-Bug: 11762221
Message-Id: <20110601124350.ED0E3270@atum07.norway.sun.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============1404293580998853277=="

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

#At file:///export/home/didrik/repo/trunk-bug12532830-decimal/ based on revid:jon.hauglid@stripped

 3141 Tor Didriksen	2011-06-01
      Bug#11762221 post-push fix: build broken unless HAVE_OPENSSL

    modified:
      vio/vio.c
=== modified file 'vio/vio.c'
--- a/vio/vio.c	2011-05-31 13:52:09 +0000
+++ b/vio/vio.c	2011-06-01 12:43:46 +0000
@@ -166,7 +166,7 @@ static void vio_init(Vio *vio, enum enum
 */
 
 my_bool vio_reset(Vio* vio, enum enum_vio_type type,
-                  my_socket sd, void *ssl, uint flags)
+                  my_socket sd, void *ssl __attribute__((unused)), uint flags)
 {
   int ret= FALSE;
   Vio old_vio= *vio;


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

# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: tor.didriksen@stripped\
#   ay5pikeas9qu2rl0
# target_branch: file:///export/home/didrik/repo/trunk-bug12532830-\
#   decimal/
# testament_sha1: c851ad1a46a0c0f9720a7392399f3bece6269eec
# timestamp: 2011-06-01 14:43:50 +0200
# base_revision_id: jon.hauglid@stripped\
#   ivwiuys5oku9tb41
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWRL12wQAAXbfgAARWHf/93ZF
zQC////wUAOUwNPbqHPXOwyKMpgEwTAE01J+kTT1MjIPQQYZSepiNNGhNPSjJiAaNNqGgA9IaCSS
bSMpiGjSbQk9NCHohoAaaaAGSkaDTINDamQANGjRoxDQB6g1U9T0nqZMRppkwTI0MTIaaaMIyekK
uMTe2NYsyKN7LnAB0rEjLJGoCSfCvClQUr38zjK0KfoVEVvr7dYtPP9Rdf82aBJUDUGkaW309aBb
2lUIc/N2teU+bEWEeoIwiGANi0VcDatsPoOUD+bhxJGJMRnasDMwwK+BwVUN5gc4OUICL0DFmJE6
4kIiqGQSj1cuwmxJTGm1sCy4TZlSkU5WIrMfLFxHvZBho512TkMg62hney5/JZjzpnB9JjlbEnvN
lGNTQHgavaeDCLRxnpJjIg6q1cTsKOJ03KGzhOslgwSkdvDccxOaOLFHJ4SJQJCjHPhG+Fki9p2q
Bv3SMwtrKgn013sygZFmr+/6+K0qBAzNbDpCwyk9p1m1MLFwoBZIQIX3xZclwDa4GprD/aX1Oqq4
CR7ysKgviEwdzaWbM0Xpx5VdVDXea6p43HbouJmjKWzIXFdNb7oLCyqrPtaoKQIwTSaJWEq2r0+B
xnzyxPW0Mfl3ydSS8ayhAQWvqIX4FOak5TpX5DZkS6C5yAQdkBzxgLjgDdX3BynxELShAOvNthBe
txEw8aAYONtho3L2iRQPdhPAsTINY6CaHC6JKuQFB2Dw59vcMukrskNL6+VThIjJEzMtwwznWAY8
ylNoS1YMRne2+ECdQmIFuq0g5ba8A/PLDcvodurSxUieAy0+4MGkWEn8mVIcFk4o91UchBGhOw8y
hk4Usvv32CBr4DApdnEw33i43Y66aZsCRj27Njig3DhsMuP/lIsYVbRzCKBsYLxIc7xpiZ7ufcXz
/dSXX6Q4OQMAApwNG4W1gTt9L6nagKyEA1/ZnMjKXj377EzBtVtoIYOB4kl2ZugXAIBSAX2FEhjj
duM6q3bMqGbOkUvXKeuJ0SjEkfqUyQmSbg+yyQO224tqmhmVUDeQC+0ggYiKgCysodzIWolZIQCw
YGClxVk4XsCMoj6BWlksK8e7cdwqZMltTJJ6kV8KEtPV2gd4nGcrcyGwTtYo5o82zyLwWrMJ8vOA
MjUkiqukDVI6g3IgxxVSIjhoGWWkivSinJYnYJeQxRdiRGid+mkU2i0Kc+coG8xo68prh8hcOgKG
38aNKUdkK/WWPV56Qq6U40oMQpJOR71Cp0aLlrHF071HVweZP/i7kinChICXrtgg


--===============1404293580998853277==--