Commit bc06af9d authored by unknown's avatar unknown
Browse files

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

into  bodhi.local:/opt/local/work/m51lamp


server-tools/instance-manager/listener.cc:
  Auto merged
parents c95482d4 223a8db0

server-tools/instance-manager/Makefile.am

+1 −1
Original line number Diff line number Diff line
@@ -61,7 +61,7 @@ client_settings.h: 


libexec_PROGRAMS= mysqlmanager



mysqlmanager_CXXFLAGS=  -Wall -Wextra -Werror

mysqlmanager_CXXFLAGS=  -Wall -W



mysqlmanager_SOURCES=	command.cc command.h mysqlmanager.cc \

			manager.h manager.cc log.h log.cc \

server-tools/instance-manager/listener.cc

+1 −1
Original line number Diff line number Diff line
@@ -208,7 +208,7 @@ int Listener::create_tcp_socket() 
  {

    im_bind_addr= (ulong) inet_addr(Options::Main::bind_address);



    if (im_bind_addr == INADDR_NONE)

    if (im_bind_addr == (ulong) INADDR_NONE)

      im_bind_addr= htonl(INADDR_ANY);

  }

  else