bk commit into 6.0 tree (kostja:1.2621)

[konstantin]

Below is the list of changes that have just been committed into a local
6.0 repository of kostja.  When kostja 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-19 21:30:03+04:00, kostja@bodhi.(none) +1 -0
  Fix a compilation warning on Windows.

  vio/viosocket.c@stripped, 2008-04-19 21:30:01+04:00, kostja@bodhi.(none) +2 -1
    Fix a compilation warning on Windows. Use my_socket type
    for socket, instead of int.

diff -Nrup a/vio/viosocket.c b/vio/viosocket.c
--- a/vio/viosocket.c	2008-04-07 18:12:15 +04:00
+++ b/vio/viosocket.c	2008-04-19 21:30:01 +04:00
@@ -361,7 +361,8 @@ my_bool vio_peer_addr(Vio *vio, char *bu
 my_bool vio_poll_read(Vio *vio,uint timeout)
 {
 #ifdef __WIN__
-  int res, fd= vio->sd;
+  int res;
+  my_socket fd= vio->sd;
   fd_set readfds, errorfds;
   struct timeval tm;
   DBUG_ENTER("vio_poll");