← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/sql_alloc.cc

Merge Monty

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/sql_alloc.cc
16
16
 
17
17
/* Mallocs for used in threads */
18
18
 
19
 
#include <drizzled/server_includes.h>
20
 
#include <drizzled/current_session.h>
21
 
#include <drizzled/error.h>
 
19
#include "config.h"
 
20
 
 
21
#include <string.h>
 
22
 
 
23
#include "drizzled/errmsg_print.h"
 
24
#include "drizzled/sql_alloc.h"
 
25
#include "drizzled/current_session.h"
 
26
#include "drizzled/error.h"
22
27
 
23
28
extern "C" void sql_alloc_error_handler(void);
24
29