← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to plugin/myisam/myisam.h

Merge trunk and resolve conflicts

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugin/myisam/myisam.h
18
18
#ifndef PLUGIN_MYISAM_MYISAM_H
19
19
#define PLUGIN_MYISAM_MYISAM_H
20
20
 
21
 
#include "drizzled/identifier.h"
 
21
#include <drizzled/identifier.h>
22
22
 
23
23
#include <drizzled/key_map.h>
24
24
 
25
25
#include <drizzled/base.h>
26
26
#ifndef _m_ctype_h
27
 
#include "drizzled/charset_info.h"
 
27
#include <drizzled/charset_info.h>
28
28
#endif
29
29
#ifndef _keycache_h
30
30
#include "keycache.h"
31
31
#endif
32
32
#include <plugin/myisam/my_handler.h>
33
 
#include "drizzled/internal/iocache.h"
 
33
#include <drizzled/internal/iocache.h>
34
34
 
35
35
/*
36
36
  Limit max keys according to HA_MAX_POSSIBLE_KEY