← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/table.cc

Merged fix-headers work.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/table.cc
397
397
  /* No handling of text based files yet */
398
398
  if (table_type == 1)
399
399
  {
400
 
    root_ptr= (MEM_ROOT **)pthread_getspecific(THR_MALLOC);
 
400
    root_ptr= current_mem_root_ptr();
401
401
    old_root= *root_ptr;
402
402
    *root_ptr= &share->mem_root;
403
403
    error= open_binary_frm(session, share, head, file);
1474
1474
  */
1475
1475
  MEM_ROOT **root_ptr, *old_root;
1476
1476
  Item *backup_free_list= session->free_list;
1477
 
  root_ptr= (MEM_ROOT **)pthread_getspecific(THR_MALLOC);
 
1477
  root_ptr= current_mem_root_ptr();
1478
1478
  old_root= *root_ptr;
1479
1479
  *root_ptr= &table->mem_root;
1480
1480
  session->free_list= NULL;