← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/natural_join_column.h

Merge Stewart's dead code removal

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/natural_join_column.h
1
1
/* -*- mode: c++; c-basic-offset: 2; indent-tabs-mode: nil; -*-
2
2
 *  vim:expandtab:shiftwidth=2:tabstop=2:smarttab:
3
3
 *
4
 
 *  Copyright (C) 2008 Sun Microsystems, Inc.
 
4
 *  Copyright (C) 2008 Sun Microsystems
5
5
 *
6
6
 *  This program is free software; you can redistribute it and/or modify
7
7
 *  it under the terms of the GNU General Public License as published by
20
20
#ifndef DRIZZLED_NATURAL_JOIN_COLUMN_H
21
21
#define DRIZZLED_NATURAL_JOIN_COLUMN_H
22
22
 
23
 
#include "drizzled/memory/sql_alloc.h"
24
 
 
25
 
namespace drizzled
26
 
{
 
23
#include <drizzled/sql_alloc.h>
27
24
 
28
25
class Field;
29
26
class TableList;
30
 
class Item;
31
27
 
32
28
/*
33
29
  Column reference of a NATURAL/USING join. Since column references in
35
31
  Field (for tables).
36
32
*/
37
33
 
38
 
class Natural_join_column: public memory::SqlAlloc
 
34
class Natural_join_column: public Sql_alloc
39
35
{
40
36
public:
41
37
  Field            *table_field; /* Column reference of table or temp view. */
57
53
  const char *db_name();
58
54
};
59
55
 
60
 
} /* namespace drizzled */
 
56
 
61
57
 
62
58
#endif /* DRIZZLED_NATURAL_JOIN_COLUMN_H */