← 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-01 14:33:36 UTC
  • mto: (28.1.12 backport_patch)
  • mto: This revision was merged to the branch mainline in revision 34.
  • Revision ID: monty@inaugust.com-20080701143336-8uihm7dhpu92rt0q
Somehow missed moving password.c. Duh.

Show diffs side-by-side

added added

removed removed

Lines of Context:
mysys/mysys_priv.h
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 <drizzled/global.h>
17
 
#include <mysys/my_sys.h>
 
16
#include <my_global.h>
 
17
#include <my_sys.h>
18
18
 
19
19
#ifdef USE_SYSTEM_WRAPPERS
20
20
#include "system_wrappers.h"
24
24
#include <sys/resource.h>
25
25
#endif
26
26
 
27
 
#include <mysys/my_pthread.h>
28
 
#include <mysys/thr_lock.h>
 
27
#ifdef THREAD
 
28
#include <my_pthread.h>
29
29
extern pthread_mutex_t THR_LOCK_malloc, THR_LOCK_open, THR_LOCK_keycache;
30
 
extern pthread_mutex_t THR_LOCK_isam, THR_LOCK_net;
 
30
extern pthread_mutex_t THR_LOCK_lock, THR_LOCK_isam, THR_LOCK_net;
31
31
extern pthread_mutex_t THR_LOCK_charset, THR_LOCK_time;
 
32
#else
 
33
#include <my_no_pthread.h>
 
34
#endif
32
35
 
33
36
/*
34
37
  EDQUOT is used only in 3 C files only in mysys/. If it does not exist on