diff options
| author | Vladislav Vaintroub <wlad@montyprogram.com> | 2012-05-07 12:21:59 +0200 |
|---|---|---|
| committer | Vladislav Vaintroub <wlad@montyprogram.com> | 2012-05-07 12:21:59 +0200 |
| commit | 1133297ae0fe7c35d64049198878697dc3a22a57 (patch) | |
| tree | 805976c267597363c5c49275474b15cd3cfae3ec | |
| parent | 867ce618cbf4880b92a98022c7de813a0e5d8b28 (diff) | |
| parent | 57c2ea188cee014b7cbad32dbd249f5147f884b3 (diff) | |
| download | mariadb-git-1133297ae0fe7c35d64049198878697dc3a22a57.tar.gz | |
merge
| -rw-r--r-- | plugin/handler_socket/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | plugin/handler_socket/libhsclient/auto_addrinfo.hpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/plugin/handler_socket/CMakeLists.txt b/plugin/handler_socket/CMakeLists.txt index db232ced7ae..358139eda1e 100644 --- a/plugin/handler_socket/CMakeLists.txt +++ b/plugin/handler_socket/CMakeLists.txt @@ -1,5 +1,5 @@ -IF(WIN32 OR CMAKE_SYSTEM_NAME MATCHES "FreeBSD") +IF(WIN32) # Handlersocket does not compile on Windows, compiles but does # not start on FreeBSD. RETURN() diff --git a/plugin/handler_socket/libhsclient/auto_addrinfo.hpp b/plugin/handler_socket/libhsclient/auto_addrinfo.hpp index f0c07060be1..6a807a6fcc7 100644 --- a/plugin/handler_socket/libhsclient/auto_addrinfo.hpp +++ b/plugin/handler_socket/libhsclient/auto_addrinfo.hpp @@ -35,7 +35,7 @@ struct auto_addrinfo : private noncopyable { int resolve(const char *node, const char *service, int flags = 0, int family = AF_UNSPEC, int socktype = SOCK_STREAM, int protocol = 0) { reset(); - addrinfo hints; + addrinfo hints = { }; hints.ai_flags = flags; hints.ai_family = family; hints.ai_socktype = socktype; |