← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/table.cc

  • Committer: Brian Aker
  • Date: 2011-01-13 07:03:39 UTC
  • mfrom: (2077.1.3 drizzle)
  • Revision ID: brian@gir-3-20110113070339-bnfp4yvngb6frhru
Merge in all of the fixes for definition to instance.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/table.cc
54
54
#include <drizzled/item/null.h>
55
55
#include <drizzled/temporal.h>
56
56
 
57
 
#include "drizzled/table/instance.h"
 
57
#include "drizzled/table/singular.h"
58
58
 
59
59
#include "drizzled/table_proto.h"
60
60
 
838
838
    copy_func_count+= param->sum_func_count;
839
839
  }
840
840
 
841
 
  table::Instance *table;
 
841
  table::Singular *table;
842
842
  table= session->getInstanceTable(); // This will not go into the tableshare cache, so no key is used.
843
843
 
844
844
  if (not table->getMemRoot()->multi_alloc_root(0,