← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to plugin/heap/ha_heap.cc

Merged up with trunk properly.

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugin/heap/ha_heap.cc
14
14
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
15
15
 
16
16
#include <drizzled/server_includes.h>
17
 
#include "heap.h"
18
 
 
19
 
#include <storage/heap/ha_heap.h>
20
 
#include <storage/heap/heapdef.h>
21
17
#include <drizzled/error.h>
22
18
#include <drizzled/table.h>
23
19
#include <drizzled/session.h>
25
21
#include <drizzled/field/timestamp.h>
26
22
#include <drizzled/field/varstring.h>
27
23
 
 
24
#include "heap.h"
 
25
#include "ha_heap.h"
 
26
#include "heapdef.h"
 
27
 
28
28
#include <string>
29
29
 
30
30
using namespace std;