← 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: 2010-04-19 21:42:39 UTC
  • Revision ID: brian@gaz-20100419214239-p8zbi35l1cfpotvy
Updates to remove a fe bits of dead code around C support for plugins
written only in C.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/table.cc
97
97
TableShare *alloc_table_share(TableList *table_list, char *key,
98
98
                               uint32_t key_length)
99
99
{
100
 
  memory::Root mem_root;
 
100
  memory::Root mem_root(TABLE_ALLOC_BLOCK_SIZE);
101
101
  TableShare *share;
102
102
  char *key_buff, *path_buff;
103
103
  std::string path;
104
104
 
105
105
  build_table_filename(path, table_list->db, table_list->table_name, false);
106
106
 
107
 
  memory::init_sql_alloc(&mem_root, TABLE_ALLOC_BLOCK_SIZE, 0);
108
107
  if (multi_alloc_root(&mem_root,
109
108
                       &share, sizeof(*share),
110
109
                       &key_buff, key_length,
2311
2310
                 uint64_t select_options, ha_rows rows_limit,
2312
2311
                 const char *table_alias)
2313
2312
{
2314
 
  memory::Root *mem_root_save, own_root;
 
2313
  memory::Root *mem_root_save, own_root(TABLE_ALLOC_BLOCK_SIZE);
2315
2314
  Table *table;
2316
2315
  TableShare *share;
2317
2316
  uint  i,field_count,null_count,null_pack_length;
2377
2376
  if (param->precomputed_group_by)
2378
2377
    copy_func_count+= param->sum_func_count;
2379
2378
 
2380
 
  memory::init_sql_alloc(&own_root, TABLE_ALLOC_BLOCK_SIZE, 0);
2381
 
 
2382
2379
  if (!multi_alloc_root(&own_root,
2383
2380
                        &table, sizeof(*table),
2384
2381
                        &share, sizeof(*share),