← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/thr_lock.cc

  • Committer: Mark Atwood
  • Date: 2011-08-12 04:08:33 UTC
  • mfrom: (2385.2.17 refactor5)
  • Revision ID: me@mark.atwood.name-20110812040833-u6j85nc6ahuc0dtz
merge lp:~olafvdspek/drizzle/refactor5

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/thr_lock.cc
82
82
 
83
83
using namespace std;
84
84
 
85
 
namespace drizzled
86
 
{
 
85
namespace drizzled {
87
86
 
88
87
uint64_t table_lock_wait_timeout;
89
88
static enum thr_lock_type thr_upgraded_concurrent_insert_lock = TL_WRITE;
106
105
 
107
106
void thr_lock_init(THR_LOCK *lock)
108
107
{
109
 
  lock->init();
110
108
  lock->read.last= &lock->read.data;
111
109
  lock->read_wait.last= &lock->read_wait.data;
112
110
  lock->write_wait.last= &lock->write_wait.data;
612
610
    if ((*pos)->type != TL_UNLOCK)
613
611
      thr_unlock(*pos);
614
612
  }
615
 
  return;
616
613
}
617
614
 
618
615
void DrizzleLock::unlock(uint32_t count)