database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-08 11:22:35 +03:00
Code Activity

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

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


server-tools/instance-manager/listener.cc:
  Auto merged
This commit is contained in:
unknown
2006-11-20 13:01:19 +03:00
parent c95482d453 223a8db08c
commit bc06af9d69
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
server-tools/instance-manager/Makefile.am
View File

@@ -61,7 +61,7 @@ client_settings.h:
libexec_PROGRAMS= mysqlmanager libexec_PROGRAMS= mysqlmanager
mysqlmanager_CXXFLAGS= -Wall -Wextra -Werror mysqlmanager_CXXFLAGS= -Wall -W
mysqlmanager_SOURCES= command.cc command.h mysqlmanager.cc \ mysqlmanager_SOURCES= command.cc command.h mysqlmanager.cc \
manager.h manager.cc log.h log.cc \ manager.h manager.cc log.h log.cc \

2
server-tools/instance-manager/listener.cc
View File

@@ -208,7 +208,7 @@ int Listener::create_tcp_socket()
{ {
im_bind_addr= (ulong) inet_addr(Options::Main::bind_address); 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); im_bind_addr= htonl(INADDR_ANY);
} }
else else