diff options
| author | unknown <svoj@june.mysql.com> | 2007-02-05 15:31:20 +0400 |
|---|---|---|
| committer | unknown <svoj@june.mysql.com> | 2007-02-05 15:31:20 +0400 |
| commit | c52165de13ca62c2a596ea05c01e07807432d605 (patch) | |
| tree | 82da2e999c2a32e262b0e683aee6c5f89c9d2789 /include/my_pthread.h | |
| parent | 344143149eb295968a6eb59c7849dad2bfc19169 (diff) | |
| parent | 26f9af9fc8298163349fb20291630aeb35ccb4f0 (diff) | |
| download | mariadb-git-c52165de13ca62c2a596ea05c01e07807432d605.tar.gz | |
Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-5.1
into mysql.com:/home/svoj/devel/mysql/merge/mysql-5.1-engines
BUILD/SETUP.sh:
Auto merged
Makefile.am:
Auto merged
client/mysql.cc:
Auto merged
configure.in:
Auto merged
include/my_global.h:
Auto merged
include/my_pthread.h:
Auto merged
mysql-test/t/myisam.test:
Auto merged
mysys/default.c:
Auto merged
sql/ha_ndbcluster.cc:
Auto merged
sql/handler.cc:
Auto merged
sql/item_func.cc:
Auto merged
sql/mysqld.cc:
Auto merged
storage/myisammrg/ha_myisammrg.cc:
Auto merged
storage/myisam/ha_myisam.cc:
Manually merged.
Diffstat (limited to 'include/my_pthread.h')
| -rw-r--r-- | include/my_pthread.h | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/include/my_pthread.h b/include/my_pthread.h index 6b97d87ab7d..4d9f5350b1e 100644 --- a/include/my_pthread.h +++ b/include/my_pthread.h @@ -269,14 +269,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; int rc; \ - DBUG_ASSERT((A) != 0); \ - sigemptyset(&set); \ - s.sa_handler = (B); \ - s.sa_mask = set; \ - s.sa_flags = 0; \ - rc= sigaction((A), &s, (struct sigaction *) NULL);\ - DBUG_ASSERT(rc == 0); \ +#define my_sigset(A,B) do { struct sigaction l_s; sigset_t l_set; int l_rc; \ + DBUG_ASSERT((A) != 0); \ + sigemptyset(&l_set); \ + l_s.sa_handler = (B); \ + l_s.sa_mask = l_set; \ + l_s.sa_flags = 0; \ + l_rc= sigaction((A), &l_s, (struct sigaction *) NULL);\ + DBUG_ASSERT(l_rc == 0); \ } while (0) #elif defined(HAVE_SIGSET) && !defined(my_sigset) #define my_sigset(A,B) sigset((A),(B)) |