diff options
| author | kostja@bodhi.local <> | 2006-11-20 13:01:19 +0300 |
|---|---|---|
| committer | kostja@bodhi.local <> | 2006-11-20 13:01:19 +0300 |
| commit | c136e8d52837ab6dc1047f0d861ab5e803aca017 (patch) | |
| tree | d04a3db1fdae12ef80851d1d6d32e24bdc7d7cac /server-tools | |
| parent | 2fc4562d63960efe6c887158b7d4a5a3fb91e053 (diff) | |
| parent | 61e684943b47915012dbe19415d8e2e7d80d90ef (diff) | |
| download | mariadb-git-c136e8d52837ab6dc1047f0d861ab5e803aca017.tar.gz | |
Merge bk-internal.mysql.com:/home/bk/mysql-5.1-runtime
into bodhi.local:/opt/local/work/m51lamp
Diffstat (limited to 'server-tools')
| -rw-r--r-- | server-tools/instance-manager/Makefile.am | 2 | ||||
| -rw-r--r-- | server-tools/instance-manager/listener.cc | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/server-tools/instance-manager/Makefile.am b/server-tools/instance-manager/Makefile.am index 02f09ae5236..2d2365caa44 100644 --- a/server-tools/instance-manager/Makefile.am +++ b/server-tools/instance-manager/Makefile.am @@ -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 \ diff --git a/server-tools/instance-manager/listener.cc b/server-tools/instance-manager/listener.cc index d5271175e9c..d77bd687acf 100644 --- a/server-tools/instance-manager/listener.cc +++ b/server-tools/instance-manager/listener.cc @@ -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 |