← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to mysys/thr_lock.cc

  • Committer: Brian Aker
  • Date: 2009-10-12 06:15:02 UTC
  • mfrom: (1165.1.178 static-functions)
  • Revision ID: brian@gaz-20091012061502-cds4m0cya7ow8sj7
Merge Stewart

Show diffs side-by-side

added added

removed removed

Lines of Context:
mysys/thr_lock.cc
90
90
bool thr_lock_inited= false;
91
91
uint32_t locks_immediate = 0L, locks_waited = 0L;
92
92
uint64_t table_lock_wait_timeout;
93
 
enum thr_lock_type thr_upgraded_concurrent_insert_lock = TL_WRITE;
 
93
static enum thr_lock_type thr_upgraded_concurrent_insert_lock = TL_WRITE;
94
94
 
95
95
 
96
96
static list<THR_LOCK *> thr_lock_thread_list;          /* List of threads in use */
264
264
}
265
265
 
266
266
 
267
 
enum enum_thr_lock_result
 
267
static enum enum_thr_lock_result
268
268
thr_lock(THR_LOCK_DATA *data, THR_LOCK_OWNER *owner,
269
269
         enum thr_lock_type lock_type)
270
270
{
477
477
 
478
478
        /* Unlock lock and free next thread on same lock */
479
479
 
480
 
void thr_unlock(THR_LOCK_DATA *data)
 
480
static void thr_unlock(THR_LOCK_DATA *data)
481
481
{
482
482
  THR_LOCK *lock=data->lock;
483
483
  enum thr_lock_type lock_type=data->type;