← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/join.h

  • Committer: Lee Bieber
  • Date: 2011-03-29 22:31:41 UTC
  • mfrom: (2257.1.3 build)
  • Revision ID: kalebral@gmail.com-20110329223141-yxc22h3l2he58sk0
Merge Andrew - 743842: Build failure using GCC 4.6
Merge Stewart - 738022: CachedDirectory silently fails to add entries if stat() fails
Merge Olaf - Common fwd: add copyright, add more declaration

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/join.h
32
32
#include <drizzled/tmp_table_param.h>
33
33
#include <bitset>
34
34
 
35
 
namespace drizzled
36
 
{
37
 
 
38
 
class DrizzleLock;
39
 
class Session;
40
 
class SortField;
 
35
namespace drizzled {
41
36
 
42
37
class Join :public memory::SqlAlloc
43
38
{