← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to plugin/catalog/engine.cc

  • Committer: Lee Bieber
  • Date: 2011-02-19 18:28:30 UTC
  • mfrom: (1994.4.78 drizzle)
  • mto: This revision was merged to the branch mainline in revision 2185.
  • Revision ID: kalebral@gmail.com-20110219182830-kb8m3ali4yjmcg0s
Merge Marisa - adds logo references to the include file

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugin/catalog/engine.cc
18
18
 *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
19
19
 */
20
20
 
21
 
#include "config.h"
 
21
#include <config.h>
22
22
 
23
23
#include <fcntl.h>
24
24
#include <sys/stat.h>
25
25
#include <sys/types.h>
26
26
 
27
 
#include "drizzled/display.h"
 
27
#include <drizzled/display.h>
28
28
#include <google/protobuf/io/zero_copy_stream.h>
29
29
#include <google/protobuf/io/zero_copy_stream_impl.h>
30
30
 
32
32
#include <fstream>
33
33
#include <string>
34
34
 
35
 
#include "drizzled/data_home.h"
36
 
#include "drizzled/cached_directory.h"
 
35
#include <drizzled/data_home.h>
 
36
#include <drizzled/cached_directory.h>
37
37
#include <drizzled/catalog/local.h>
38
 
#include "plugin/catalog/module.h"
 
38
#include <plugin/catalog/module.h>
39
39
 
40
40
namespace plugin {
41
41
namespace catalog {