← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to mysys/thr_lock.cc

  • Committer: Monty Taylor
  • Date: 2008-11-26 09:40:45 UTC
  • mfrom: (622.1.2 drizzle)
  • mto: (612.2.17 devel)
  • mto: This revision was merged to the branch mainline in revision 624.
  • Revision ID: mordred@solanthus.local-20081126094045-w20goow2v1fwnj4t
Merged trunk.

Show diffs side-by-side

added added

removed removed

Lines of Context:
mysys/thr_lock.cc
91
91
 
92
92
bool thr_lock_inited=0;
93
93
uint32_t locks_immediate = 0L, locks_waited = 0L;
94
 
ulong table_lock_wait_timeout;
 
94
uint64_t table_lock_wait_timeout;
95
95
enum thr_lock_type thr_upgraded_concurrent_insert_lock = TL_WRITE;
96
96
 
97
97
 
98
98
LIST *thr_lock_thread_list;                     /* List of threads in use */
99
 
ulong max_write_lock_count= ~(ulong) 0L;
 
99
uint64_t max_write_lock_count= ~(uint64_t) 0L;
100
100
 
101
101
static inline pthread_cond_t *get_cond(void)
102
102
{