Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-5.1-build

into  trift2.:/MySQL/M51/push-5.1


extra/resolveip.c:
  Auto merged

extra/resolveip.c

@@ -118,13 +118,21 @@ int main(int argc, char **argv)
 
   while (argc--)
   {
+#ifndef WIN32
     struct in_addr addr;
+#endif
     ip = *argv++;    
 
     /* Not compatible with IPv6!  Probably should use getnameinfo(). */
+#ifdef WIN32
+    taddr = inet_addr(ip);
+    if(taddr != INADDR_NONE)
+    {
+#else
     if (inet_aton(ip, &addr) != 0)
     {
       taddr= addr.s_addr;
+#endif
       if (taddr == htonl(INADDR_BROADCAST))
       {	
 	puts("Broadcast");