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
49eeb1bb
Commit
49eeb1bb
authored
May 19, 2006
by
msvensson@devsrv-b.mysql.com
Browse files
Options
Browse Files
Download
Plain Diff
Merge msvensson@bk-internal.mysql.com:/home/bk/mysql-5.0
into devsrv-b.mysql.com:/users/msvensson/mysql-5.0
parents
710d4224
f186a3f2
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
6 additions
and
3 deletions
+6
-3
include/my_pthread.h
include/my_pthread.h
+4
-2
sql/mysqld.cc
sql/mysqld.cc
+2
-1
No files found.
include/my_pthread.h
View file @
49eeb1bb
...
@@ -332,12 +332,14 @@ int sigwait(sigset_t *setp, int *sigp); /* Use our implemention */
...
@@ -332,12 +332,14 @@ int sigwait(sigset_t *setp, int *sigp); /* Use our implemention */
we want to make sure that no such flags are set.
we want to make sure that no such flags are set.
*/
*/
#if defined(HAVE_SIGACTION) && !defined(my_sigset)
#if defined(HAVE_SIGACTION) && !defined(my_sigset)
#define my_sigset(A,B) do { struct sigaction s; sigset_t set; \
#define my_sigset(A,B) do { struct sigaction s; sigset_t set; int rc; \
DBUG_ASSERT((A) != 0); \
sigemptyset(&set); \
sigemptyset(&set); \
s.sa_handler = (B); \
s.sa_handler = (B); \
s.sa_mask = set; \
s.sa_mask = set; \
s.sa_flags = 0; \
s.sa_flags = 0; \
sigaction((A), &s, (struct sigaction *) NULL); \
rc= sigaction((A), &s, (struct sigaction *) NULL);\
DBUG_ASSERT(rc == 0); \
} while (0)
} while (0)
#elif defined(HAVE_SIGSET) && !defined(my_sigset)
#elif defined(HAVE_SIGSET) && !defined(my_sigset)
#define my_sigset(A,B) sigset((A),(B))
#define my_sigset(A,B) sigset((A),(B))
...
...
sql/mysqld.cc
View file @
49eeb1bb
...
@@ -954,7 +954,8 @@ static void __cdecl kill_server(int sig_ptr)
...
@@ -954,7 +954,8 @@ static void __cdecl kill_server(int sig_ptr)
RETURN_FROM_KILL_SERVER
;
RETURN_FROM_KILL_SERVER
;
kill_in_progress
=
TRUE
;
kill_in_progress
=
TRUE
;
abort_loop
=
1
;
// This should be set
abort_loop
=
1
;
// This should be set
my_sigset
(
sig
,
SIG_IGN
);
if
(
sig
!=
0
)
// 0 is not a valid signal number
my_sigset
(
sig
,
SIG_IGN
);
if
(
sig
==
MYSQL_KILL_SIGNAL
||
sig
==
0
)
if
(
sig
==
MYSQL_KILL_SIGNAL
||
sig
==
0
)
sql_print_information
(
ER
(
ER_NORMAL_SHUTDOWN
),
my_progname
);
sql_print_information
(
ER
(
ER_NORMAL_SHUTDOWN
),
my_progname
);
else
else
...
...
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