diff options
| author | unknown <msvensson@neptunus.(none)> | 2006-05-19 13:09:15 +0200 |
|---|---|---|
| committer | unknown <msvensson@neptunus.(none)> | 2006-05-19 13:09:15 +0200 |
| commit | f98e7a9e13a5a66957c21e25da6151d4ee9d9ee8 (patch) | |
| tree | a9c71f208303a5547ad34712ec8eb84720715ff6 /include | |
| parent | 808f77f6b003bbd225c21905b0f204bbcb61d457 (diff) | |
| parent | 5ceb394fe22182055cb16b99bec3c6fe6b1dc3d8 (diff) | |
| download | mariadb-git-f98e7a9e13a5a66957c21e25da6151d4ee9d9ee8.tar.gz | |
Merge neptunus.(none):/home/msvensson/mysql/my41-bug13711
into neptunus.(none):/home/msvensson/mysql/mysql-5.0
include/my_pthread.h:
Auto merged
sql/mysqld.cc:
Auto merged
Diffstat (limited to 'include')
| -rw-r--r-- | include/my_pthread.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/include/my_pthread.h b/include/my_pthread.h index 202e047dc4e..3e4388413e0 100644 --- a/include/my_pthread.h +++ b/include/my_pthread.h @@ -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. */ #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); \ s.sa_handler = (B); \ s.sa_mask = set; \ s.sa_flags = 0; \ - sigaction((A), &s, (struct sigaction *) NULL); \ + rc= sigaction((A), &s, (struct sigaction *) NULL);\ + DBUG_ASSERT(rc == 0); \ } while (0) #elif defined(HAVE_SIGSET) && !defined(my_sigset) #define my_sigset(A,B) sigset((A),(B)) |