mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-31 02:51:44 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

merge

Browse source
This commit is contained in:
Vladislav Vaintroub 2012-05-07 12:21:59 +02:00
commit 1133297ae0
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
plugin/handler_socket/CMakeLists.txt
View file

@ -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()

2
plugin/handler_socket/libhsclient/auto_addrinfo.hpp
View file

@ -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;