~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to mysys/mysys_priv.h

Merging trunk changes from over weekend.

Show diffs side-by-side

added added

removed removed

Lines of Context:
25
25
#endif
26
26
 
27
27
#include <my_pthread.h>
 
28
#include <thr_lock.h>
28
29
extern pthread_mutex_t THR_LOCK_malloc, THR_LOCK_open, THR_LOCK_keycache;
29
 
extern pthread_mutex_t THR_LOCK_lock, THR_LOCK_isam, THR_LOCK_net;
 
30
extern pthread_mutex_t THR_LOCK_isam, THR_LOCK_net;
30
31
extern pthread_mutex_t THR_LOCK_charset, THR_LOCK_time;
31
32
 
32
33
/*