← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to mysys/thr_alarm.c

Merged build changes from Antony.

Show diffs side-by-side

added added

removed removed

Lines of Context:
mysys/thr_alarm.c
13
13
   along with this program; if not, write to the Free Software
14
14
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
15
15
 
16
 
#include <my_global.h>
 
16
#include "mysys_priv.h"
17
17
 
18
18
#if !defined(DONT_USE_THR_ALARM)
19
19
#include <errno.h>
20
20
#include <my_pthread.h>
21
21
#include <signal.h>
22
22
#include <my_sys.h>
23
 
#include <m_string.h>
 
23
#include <mystrings/m_string.h>
24
24
#include <queues.h>
25
25
#include "thr_alarm.h"
26
26
 
557
557
    }
558
558
    process_alarm(0);
559
559
  }
560
 
  bzero((char*) &alarm_thread,sizeof(alarm_thread)); /* For easy debugging */
 
560
  memset((char*) &alarm_thread, 0, sizeof(alarm_thread)); /* For easy debugging */
561
561
  alarm_thread_running= 0;
562
562
  pthread_cond_signal(&COND_alarm);
563
563
  pthread_mutex_unlock(&LOCK_alarm);