← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to mysys/thr_lock.c

  • Committer: Brian Aker
  • Date: 2008-10-07 15:13:28 UTC
  • mfrom: (481.1.19 codestyle)
  • Revision ID: brian@tangent.org-20081007151328-m49yev7qggqmzxg1
Mergining Monty's work

Show diffs side-by-side

added added

removed removed

Lines of Context:
mysys/thr_lock.c
76
76
#include <mystrings/m_string.h>
77
77
#include <errno.h>
78
78
 
 
79
#if TIME_WITH_SYS_TIME
 
80
# include <sys/time.h>
 
81
# include <time.h>
 
82
#else
 
83
# if HAVE_SYS_TIME_H
 
84
#  include <sys/time.h>
 
85
# else
 
86
#  include <time.h>
 
87
# endif
 
88
#endif  
 
89
 
 
90
 
79
91
bool thr_lock_inited=0;
80
92
uint32_t locks_immediate = 0L, locks_waited = 0L;
81
93
ulong table_lock_wait_timeout;