← Back to branch summary

~drizzle-trunk/drizzle/development

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to mysys/mysys_priv.h

Committer: Brian Aker
Date: 2008-07-05 19:32:59 UTC
mfrom: (53.2.28 codestyle)
Revision ID: brian@tangent.org-20080705193259-opqzfb0oprfcg8dm

Merge from Monty's tree

files removed:
include/my_alarm.h

mysys/my_alarm.c

files renamed:
mysys/my_lock.c => storage/myisam/my_lock.c

files modified:
Makefile.am

configure.ac

dbug/dbug.c

extra/Makefile.am

extra/innochecksum.c

include/Makefile.am

include/my_base.h

include/mysql_com.h

include/thr_lock.h

libmysql/Makefile.am

libmysql/client_settings.h

libmysql/libmysql.c

mysys/Makefile.am

mysys/default.c

mysys/mf_iocache2.c

mysys/my_getopt.c

mysys/my_memmem.c

mysys/my_static.c

mysys/mysys_priv.h

mysys/tests/Makefile.am

regex/main.c

regex/reginit.c

regex/split.c

sql/Makefile.am

sql/opt_range.cc

sql/sql_select.cc

sql/sql_table.cc

sql/table.cc

storage/archive/Makefile.am

storage/heap/Makefile.am

storage/heap/hp_create.c

storage/heap/hp_rkey.c

storage/myisam/Makefile.am

strings/bzero.c

strings/ctype-bin.c

strings/ctype-latin1.c

strings/ctype-ucs2.c

strings/ctype.c

strings/decimal.c

strings/memset.c

strings/strend.c

strings/tests/Makefile.am

Show diffs side-by-side

added added

removed removed

mysys/mysys_priv.h

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

/*

Older »