Dep/MySQL: Updated MySQL sources to version 5.5.9 (current GA)

dep/mysqllite/vio/viossl.c

@@ -24,36 +24,6 @@
 
 #ifdef HAVE_OPENSSL
 
-#ifdef __NETWARE__
-
-/* yaSSL already uses BSD sockets */
-#ifndef HAVE_YASSL
-
-/*
-  The default OpenSSL implementation on NetWare uses WinSock.
-  This code allows us to use the BSD sockets.
-*/
-
-static int SSL_set_fd_bsd(SSL *s, int fd)
-{
-  int result= -1;
-  BIO_METHOD *BIO_s_bsdsocket();
-  BIO *bio;
-
-  if ((bio= BIO_new(BIO_s_bsdsocket())))
-  {
-    result= BIO_set_fd(bio, fd, BIO_NOCLOSE);
-    SSL_set_bio(s, bio, bio);
-  }
-  return result;
-}
-
-#define SSL_set_fd(A, B)  SSL_set_fd_bsd((A), (B))
-
-#endif /* HAVE_YASSL */
-#endif /* __NETWARE__ */
-
-
 static void
 report_errors(SSL* ssl)
 {
@@ -274,6 +244,9 @@ int vio_ssl_blocking(Vio *vio __attribute__((unused)),
   return (set_blocking_mode ? 0 : 1);
 }
 
-
+my_bool vio_ssl_has_data(Vio *vio)
+{
+  return SSL_pending(vio->ssl_arg) > 0 ? TRUE : FALSE;
+}
 
 #endif /* HAVE_OPENSSL */