From b9f2fb84f6f6224290fa8d65286a1862448e93b8 Mon Sep 17 00:00:00 2001 From: Vladislav Vaintroub Date: Thu, 29 Dec 2011 12:17:30 +0100 Subject: Fix LP#909414: Valgrind warnings in threadpool code --- sql/net_serv.cc | 2 ++ sql/threadpool_unix.cc | 2 ++ 2 files changed, 4 insertions(+) diff --git a/sql/net_serv.cc b/sql/net_serv.cc index 4a35dc52fa3..d54fe3e0ebf 100644 --- a/sql/net_serv.cc +++ b/sql/net_serv.cc @@ -138,6 +138,8 @@ my_bool my_net_init(NET *net, Vio* vio) net->net_skip_rest_factor= 0; net->last_errno=0; net->unused= 0; + net->read_timeout=0; + net->write_timeout=0; if (vio != 0) /* If real connection */ { diff --git a/sql/threadpool_unix.cc b/sql/threadpool_unix.cc index d421870fcab..c936479a00c 100644 --- a/sql/threadpool_unix.cc +++ b/sql/threadpool_unix.cc @@ -203,6 +203,7 @@ static int io_poll_create() int io_poll_associate_fd(int pollfd, int fd, void *data) { struct epoll_event ev; + ev.data.u64= 0; /* Keep valgrind happy */ ev.data.ptr= data; ev.events= EPOLLIN|EPOLLET|EPOLLERR|EPOLLRDHUP|EPOLLONESHOT; return epoll_ctl(pollfd, EPOLL_CTL_ADD, fd, &ev); @@ -213,6 +214,7 @@ int io_poll_associate_fd(int pollfd, int fd, void *data) int io_poll_start_read(int pollfd, int fd, void *data) { struct epoll_event ev; + ev.data.u64= 0; /* Keep valgrind happy */ ev.data.ptr= data; ev.events= EPOLLIN|EPOLLET|EPOLLERR|EPOLLRDHUP|EPOLLONESHOT; return epoll_ctl(pollfd, EPOLL_CTL_MOD, fd, &ev); -- cgit v1.2.1