Skip to content

Commit 693cc03

Browse files
WL#7895 - Add systemd support to server.
Post-Push Fix : Fix failing on solaris sparc.
1 parent d62304f commit 693cc03

File tree

2 files changed

+5
-4
lines changed

2 files changed

+5
-4
lines changed

sql/mysqld_daemon.cc

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -51,8 +51,9 @@ int mysqld::runtime::mysqld_daemonize()
5151
close(pipe_fd[1]);
5252

5353
// Wait for first child to fork successfully.
54-
int rc, waitstatus;
55-
while ((rc= waitpid(pid, &waitstatus, 0)) == -1 &&
54+
int rc,status;
55+
char waitstatus;
56+
while ((rc= waitpid(pid, &status, 0)) == -1 &&
5657
errno == EINTR)
5758
{
5859
// Retry if errno is EINTR.
@@ -132,7 +133,7 @@ int mysqld::runtime::mysqld_daemonize()
132133
@note This function writes the status to write end of pipe.
133134
This notifies the parent which is block on read end of pipe.
134135
*/
135-
void mysqld::runtime::signal_parent(int pipe_write_fd, int status)
136+
void mysqld::runtime::signal_parent(int pipe_write_fd, char status)
136137
{
137138
if (pipe_write_fd != -1)
138139
{

sql/mysqld_daemon.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ namespace mysqld
2121
namespace runtime
2222
{
2323
int mysqld_daemonize();
24-
void signal_parent(int pipe_write_fd, int status);
24+
void signal_parent(int pipe_write_fd, char status);
2525
}
2626
}
2727
#endif // MYSQLD_DAEMON_INCLUDED

0 commit comments

Comments
 (0)