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

MariaDB · Nov 13, 2018 · 573c4db · 573c4db
1 parent 34a3972
commit 573c4db
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/sql/semisync_master_ack_receiver.cc b/sql/semisync_master_ack_receiver.cc
@@ -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
     }
 

diff --git a/sql/semisync_master_ack_receiver.h b/sql/semisync_master_ack_receiver.h
@@ -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;