Commit fdb423e8 authored by cmiller@zippy.cornsilk.net's avatar cmiller@zippy.cornsilk.net
Browse files

Merge bk-internal.mysql.com:/home/bk/mysql-5.1-maint 

into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-maint
parents 60227047 2d259302

configure.in

+1 −0
Original line number Diff line number Diff line
@@ -837,6 +837,7 @@ AC_CHECK_FUNC(p2open, , AC_CHECK_LIB(gen, p2open)) 
AC_CHECK_FUNC(bind, , AC_CHECK_LIB(bind, bind))

# Check if crypt() exists in libc or libcrypt, sets LIBS if needed

AC_SEARCH_LIBS(crypt, crypt, AC_DEFINE(HAVE_CRYPT, 1, [crypt]))

# See if we need a library for address lookup.

AC_SEARCH_LIBS(inet_aton, [socket nsl resolv])



# For the sched_yield() function on Solaris

extra/resolveip.c

+4 −2
Original line number Diff line number Diff line
@@ -116,11 +116,13 @@ int main(int argc, char **argv) 


  while (argc--)

  {

    struct in_addr addr;

    ip = *argv++;    



    if (my_isdigit(&my_charset_latin1,ip[0]))

    /* Not compatible with IPv6!  Probably should use getnameinfo(). */

    if (inet_aton(ip, &addr) != 0)

    {

      taddr = inet_addr(ip);

      taddr= addr.s_addr;

      if (taddr == htonl(INADDR_BROADCAST))

      {	

	puts("Broadcast");