diff options
| author | Aleksey Midenkov <midenok@gmail.com> | 2018-01-10 12:36:55 +0300 |
|---|---|---|
| committer | Aleksey Midenkov <midenok@gmail.com> | 2018-01-10 12:36:55 +0300 |
| commit | c59c1a0736e36e9c66f798d199a124f362353377 (patch) | |
| tree | 80ee18faad049687b0b4f0e2f147caf870d68390 /sql/semisync_master_ack_receiver.cc | |
| parent | 26971c9aea67a62f348cd105348a8dc4407bcf4a (diff) | |
| parent | 0b597d3ab2494bc1db97cc4a30d697a5fdf48c21 (diff) | |
| download | mariadb-git-c59c1a0736e36e9c66f798d199a124f362353377.tar.gz | |
System Versioning 1.0 pre8
Merge branch '10.3' into trunk
Diffstat (limited to 'sql/semisync_master_ack_receiver.cc')
| -rw-r--r-- | sql/semisync_master_ack_receiver.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/semisync_master_ack_receiver.cc b/sql/semisync_master_ack_receiver.cc index 244e9396889..aa588a5f300 100644 --- a/sql/semisync_master_ack_receiver.cc +++ b/sql/semisync_master_ack_receiver.cc @@ -258,7 +258,7 @@ void Ack_receiver::run() struct timeval tv= {1, 0}; fds= read_fds; /* select requires max fd + 1 for the first argument */ - ret= select(max_fd+1, &fds, NULL, NULL, &tv); + ret= select((int)(max_fd+1), &fds, NULL, NULL, &tv); if (ret <= 0) { mysql_mutex_unlock(&m_mutex); |