← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/lock.h

  • Committer: Monty Taylor
  • Date: 2009-12-22 08:05:32 UTC
  • mfrom: (1251 build)
  • mto: This revision was merged to the branch mainline in revision 1253.
  • Revision ID: mordred@inaugust.com-20091222080532-6u7wt6wh2pv1vj9r
Merged trunk. Also renamed thr_lock. Doh. I hate it when I do both.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/lock.h
20
20
#ifndef DRIZZLED_LOCK_H
21
21
#define DRIZZLED_LOCK_H
22
22
 
23
 
#include <mysys/definitions.h>
 
23
#include "drizzled/thr_lock.h"
24
24
 
25
25
class Session;
26
26
class Table;