bk commit into 6.0 tree (davi:1.2621)

[Davi Arnaut]

Below is the list of changes that have just been committed into a local
6.0 repository of davi.  When davi does a push these changes
will be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet@stripped, 2008-04-07 11:12:20-03:00, davi@stripped +1 -0
  The FIONREAD macro could expand to a expression which
  is invalid to preporcessor conditionals. Instead use
  the autoconf generated macro to test the presence.

  vio/viosocket.c@stripped, 2008-04-07 11:12:15-03:00, davi@stripped +1 -1
    Use local autoconf generated macro to test for FIONREAD presence.

diff -Nrup a/vio/viosocket.c b/vio/viosocket.c
--- a/vio/viosocket.c	2008-03-28 09:36:24 -03:00
+++ b/vio/viosocket.c	2008-04-07 11:12:15 -03:00
@@ -403,7 +403,7 @@ my_bool vio_peek_read(Vio *vio, uint *by
     return TRUE;
   *bytes= len;
   return FALSE;
-#elif FIONREAD
+#elif FIONREAD_IN_SYS_IOCTL
   int len;
   if (ioctl(vio->sd, FIONREAD, &len) < 0)
     return TRUE;