database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-01-06 05:22:24 +03:00
Code Activity

Fix LP#909414: Valgrind warnings in threadpool code

Browse Source
This commit is contained in:
Vladislav Vaintroub
2011-12-29 12:17:30 +01:00
parent 54b61b8b44
commit b9f2fb84f6
2 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
sql/net_serv.cc
View File

@@ -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 */
{

2
sql/threadpool_unix.cc
View File

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