← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to mysys/mysys_priv.h

  • Committer: Monty Taylor
  • Date: 2008-07-05 18:52:36 UTC
  • mto: This revision was merged to the branch mainline in revision 63.
  • Revision ID: monty@inaugust.com-20080705185236-uec8trvu63qcfupa
Gah. For the last time. Fixing the stupid double-declared THR_LOCK_lock.

Show diffs side-by-side

added added

removed removed

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