← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/natural_join_column.h

Merge Monty

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/natural_join_column.h
20
20
#ifndef DRIZZLED_NATURAL_JOIN_COLUMN_H
21
21
#define DRIZZLED_NATURAL_JOIN_COLUMN_H
22
22
 
23
 
#include "drizzled/sql_alloc.h"
 
23
#include "drizzled/memory/sql_alloc.h"
24
24
 
25
25
class Field;
26
26
class TableList;
32
32
  Field (for tables).
33
33
*/
34
34
 
35
 
class Natural_join_column: public Sql_alloc
 
35
class Natural_join_column: public drizzled::memory::SqlAlloc
36
36
{
37
37
public:
38
38
  Field            *table_field; /* Column reference of table or temp view. */