← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/sql_error.h

Merge Monty

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/sql_error.h
20
20
#ifndef DRIZZLED_SQL_ERROR_H
21
21
#define DRIZZLED_SQL_ERROR_H
22
22
 
23
 
#include <drizzled/sql_alloc.h>
 
23
#include "drizzled/memory/sql_alloc.h"
24
24
#include "drizzled/lex_string.h"
25
25
 
26
26
#include <bitset>
27
27
 
28
 
class DRIZZLE_ERROR: public Sql_alloc
 
28
class DRIZZLE_ERROR: public drizzled::memory::SqlAlloc
29
29
{
30
30
public:
31
31
  static const uint32_t NUM_ERRORS= 4;