Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
M
MariaDB
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
nexedi
MariaDB
Commits
573c4db5
Commit
573c4db5
authored
Nov 13, 2018
by
Andrei Elkin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
MDEV-17437 followup: fixing compilation on non-HAVE_POLL.
parent
34a39724
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
3 deletions
+4
-3
sql/semisync_master_ack_receiver.cc
sql/semisync_master_ack_receiver.cc
+2
-1
sql/semisync_master_ack_receiver.h
sql/semisync_master_ack_receiver.h
+2
-2
No files found.
sql/semisync_master_ack_receiver.cc
View file @
573c4db5
...
@@ -239,7 +239,8 @@ void Ack_receiver::run()
...
@@ -239,7 +239,8 @@ void Ack_receiver::run()
#ifdef HAVE_POLL
#ifdef HAVE_POLL
DBUG_PRINT
(
"info"
,
(
"fd count %u"
,
slave_count
));
DBUG_PRINT
(
"info"
,
(
"fd count %u"
,
slave_count
));
#else
#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
#endif
}
}
...
...
sql/semisync_master_ack_receiver.h
View file @
573c4db5
...
@@ -187,7 +187,7 @@ class Select_socket_listener
...
@@ -187,7 +187,7 @@ class Select_socket_listener
m_fds
=
m_init_fds
;
m_fds
=
m_init_fds
;
struct
timeval
tv
=
{
1
,
0
};
struct
timeval
tv
=
{
1
,
0
};
/* select requires max fd + 1 for the first argument */
/* 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
)
bool
is_socket_active
(
const
Slave
*
slave
)
...
@@ -202,7 +202,7 @@ class Select_socket_listener
...
@@ -202,7 +202,7 @@ class Select_socket_listener
uint
init_slave_sockets
()
uint
init_slave_sockets
()
{
{
Slave_ilist_iterator
it
(
m_slaves
);
Slave_ilist_iterator
it
(
const_cast
<
Slave_ilist
&>
(
m_slaves
)
);
Slave
*
slave
;
Slave
*
slave
;
uint
fds_index
=
0
;
uint
fds_index
=
0
;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment