← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/locking/global.cc

  • Committer: Brian Aker
  • Date: 2011-02-03 18:12:09 UTC
  • mfrom: (2134.1.9 timestamp)
  • mto: This revision was merged to the branch mainline in revision 2140.
  • Revision ID: brian@tangent.org-20110203181209-xr7i2079pdmu33hd
Merge in table tree.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/locking/global.cc
76
76
  Change to use malloc() ONLY when using LOCK TABLES command or when
77
77
  we are forced to use mysql_lock_merge.
78
78
*/
79
 
#include <config.h>
80
 
 
 
79
#include "config.h"
81
80
#include <fcntl.h>
82
 
 
83
81
#include <drizzled/error.h>
84
82
#include <drizzled/my_hash.h>
85
83
#include <drizzled/thr_lock.h>
86
84
#include <drizzled/session.h>
87
85
#include <drizzled/sql_base.h>
88
86
#include <drizzled/lock.h>
89
 
#include <drizzled/pthread_globals.h>
90
 
#include <drizzled/internal/my_sys.h>
91
 
#include <drizzled/pthread_globals.h>
92
 
#include <drizzled/refresh_version.h>
93
 
#include <drizzled/plugin/storage_engine.h>
 
87
#include "drizzled/pthread_globals.h"
 
88
#include "drizzled/internal/my_sys.h"
 
89
#include "drizzled/pthread_globals.h"
94
90
 
95
91
#include <set>
96
92
#include <vector>