← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/table.cc

  • Committer: Lee Bieber
  • Date: 2011-03-23 00:09:31 UTC
  • mfrom: (2241.3.9 refactor3)
  • mto: This revision was merged to the branch mainline in revision 2246.
  • Revision ID: kalebral@gmail.com-20110323000931-t13v9s8a91en53de
Merge Olaf - more code refactoring

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/table.cc
47
47
#include <drizzled/internal/m_string.h>
48
48
#include <plugin/myisam/myisam.h>
49
49
#include <drizzled/plugin/storage_engine.h>
50
 
 
51
50
#include <drizzled/item/string.h>
52
51
#include <drizzled/item/int.h>
53
52
#include <drizzled/item/decimal.h>
59
58
#include <drizzled/table_proto.h>
60
59
#include <drizzled/typelib.h>
61
60
#include <drizzled/sql_lex.h>
 
61
#include <drizzled/statistics_variables.h>
 
62
#include <drizzled/system_variables.h>
62
63
 
63
64
using namespace std;
64
65
 
814
815
    copy_func_count+= param->sum_func_count;
815
816
  }
816
817
 
817
 
  table::Singular *table;
818
 
  table= session->getInstanceTable(); // This will not go into the tableshare cache, so no key is used.
 
818
  table::Singular* table= &session->getInstanceTable(); // This will not go into the tableshare cache, so no key is used.
819
819
 
820
820
  if (not table->getMemRoot()->multi_alloc_root(0,
821
821
                                                &default_field, sizeof(Field*) * (field_count),