diff options
| author | unknown <msvensson@neptunus.(none)> | 2005-05-18 20:52:59 +0200 |
|---|---|---|
| committer | unknown <msvensson@neptunus.(none)> | 2005-05-18 20:52:59 +0200 |
| commit | c05b375e5a1166d284d8fcb2cc1dbe752e96c91a (patch) | |
| tree | dd3922330cb82eca804ec19d4b41333019d561f0 /mysys | |
| parent | 6f7bccd1aca31045e2678159e2e931d2e94f54dd (diff) | |
| parent | 446d4631c7ab899fb7caef68ff260fbc642a4698 (diff) | |
| download | mariadb-git-c05b375e5a1166d284d8fcb2cc1dbe752e96c91a.tar.gz | |
Merge
ndb/include/kernel/ndb_limits.h:
Auto merged
ndb/src/ndbapi/NdbDictionaryImpl.cpp:
Auto merged
sql/ha_ndbcluster.cc:
Auto merged
mysys/thr_alarm.c:
Manual merge
Diffstat (limited to 'mysys')
| -rw-r--r-- | mysys/thr_alarm.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/mysys/thr_alarm.c b/mysys/thr_alarm.c index abb112b83a7..05d14073953 100644 --- a/mysys/thr_alarm.c +++ b/mysys/thr_alarm.c @@ -85,6 +85,7 @@ void init_thr_alarm(uint max_alarms) #else { struct sigaction sact; + sact.sa_flags = 0; bzero((char*) &sact, sizeof(sact)); sact.sa_handler = thread_alarm; sigaction(THR_CLIENT_ALARM, &sact, (struct sigaction*) 0); |