← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to plugin/information_engine/information_engine.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:
plugin/information_engine/information_engine.h
21
21
#ifndef PLUGIN_INFORMATION_ENGINE_INFORMATION_ENGINE_H
22
22
#define PLUGIN_INFORMATION_ENGINE_INFORMATION_ENGINE_H
23
23
 
24
 
#include <mysys/thr_lock.h>
 
24
#include <drizzled/thr_lock.h>
25
25
#include <drizzled/plugin/info_schema_table.h>
26
26
#include <drizzled/plugin/storage_engine.h>
27
27