← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/table.cc

  • Committer: Monty Taylor
  • Date: 2009-12-25 08:50:15 UTC
  • mto: This revision was merged to the branch mainline in revision 1255.
  • Revision ID: mordred@inaugust.com-20091225085015-83sux5qsvy312gew
MEM_ROOT == memory::Root

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/table.cc
110
110
TableShare *alloc_table_share(TableList *table_list, char *key,
111
111
                               uint32_t key_length)
112
112
{
113
 
  MEM_ROOT mem_root;
 
113
  memory::Root mem_root;
114
114
  TableShare *share;
115
115
  char *key_buff, *path_buff;
116
116
  char path[FN_REFLEN];
1754
1754
} /* open_table_error */
1755
1755
 
1756
1756
 
1757
 
TYPELIB *typelib(MEM_ROOT *mem_root, List<String> &strings)
 
1757
TYPELIB *typelib(memory::Root *mem_root, List<String> &strings)
1758
1758
{
1759
1759
  TYPELIB *result= (TYPELIB*) alloc_root(mem_root, sizeof(TYPELIB));
1760
1760
  if (!result)
2351
2351
                 uint64_t select_options, ha_rows rows_limit,
2352
2352
                 const char *table_alias)
2353
2353
{
2354
 
  MEM_ROOT *mem_root_save, own_root;
 
2354
  memory::Root *mem_root_save, own_root;
2355
2355
  Table *table;
2356
2356
  TableShare *share;
2357
2357
  uint  i,field_count,null_count,null_pack_length;
3290
3290
 
3291
3291
void Table::free_tmp_table(Session *session)
3292
3292
{
3293
 
  MEM_ROOT own_root= mem_root;
 
3293
  memory::Root own_root= mem_root;
3294
3294
  const char *save_proc_info;
3295
3295
 
3296
3296
  save_proc_info=session->get_proc_info();