Commit 573c4db5 authored by Andrei Elkin's avatar Andrei Elkin

MDEV-17437 followup: fixing compilation on non-HAVE_POLL.

parent 34a39724
......@@ -239,7 +239,8 @@ void Ack_receiver::run()
#ifdef HAVE_POLL
DBUG_PRINT("info", ("fd count %u", slave_count));
#else
DBUG_PRINT("info", ("fd count %u, max_fd %d", slave_count,(int) max_fd));
DBUG_PRINT("info", ("fd count %u, max_fd %d", slave_count,
(int) listener.get_max_fd()));
#endif
}
......
......@@ -187,7 +187,7 @@ class Select_socket_listener
m_fds= m_init_fds;
struct timeval tv= {1,0};
/* select requires max fd + 1 for the first argument */
return select(m_max_fd+1, &m_fds, NULL, NULL, &tv);
return select((int) m_max_fd+1, &m_fds, NULL, NULL, &tv);
}
bool is_socket_active(const Slave *slave)
......@@ -202,7 +202,7 @@ class Select_socket_listener
uint init_slave_sockets()
{
Slave_ilist_iterator it(m_slaves);
Slave_ilist_iterator it(const_cast<Slave_ilist&>(m_slaves));
Slave *slave;
uint fds_index= 0;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment