bzr push into mysql-trunk branch (tor.didriksen:3140 to 3141) Bug#11762221

[Tor Didriksen]

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

    modified:
      vio/vio.c
 3140 Jon Olav Hauglid	2011-06-01 [merge]
      Merge from mysql-5.5 to mysql-trunk
      Text conflict in mysql-test/r/innodb_mysql_lock.result

    modified:
      mysql-test/r/innodb_mysql_lock.result
      mysql-test/r/innodb_mysql_sync.result
      mysql-test/t/innodb_mysql_lock.test
      mysql-test/t/innodb_mysql_sync.test
=== 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;

No bundle (reason: useless for push emails).