← Back to branch summary

~mordred/drizzle/fix-bell-bugs

« back to all changes in this revision

Viewing changes to drizzled/table_share.h

Merge Monty

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/table_share.h
169
169
 
170
170
  /* hash of field names (contains pointers to elements of field array) */
171
171
  HASH  name_hash;                      /* hash of field names */
172
 
  MEM_ROOT mem_root;
 
172
  drizzled::memory::Root mem_root;
173
173
  TYPELIB keynames;                     /* Pointers to keynames */
174
174
  TYPELIB fieldnames;                   /* Pointer to fieldnames */
175
175
  TYPELIB *intervals;                   /* pointer to interval info */
405
405
            const char *new_path)
406
406
  {
407
407
    memset(this, 0, sizeof(TableShare));
408
 
    init_sql_alloc(&mem_root, TABLE_ALLOC_BLOCK_SIZE, 0);
 
408
    drizzled::memory::init_sql_alloc(&mem_root, TABLE_ALLOC_BLOCK_SIZE, 0);
409
409
    table_category=         TABLE_CATEGORY_TEMPORARY;
410
410
    tmp_table=              INTERNAL_TMP_TABLE;
411
411
    db.str=                 (char*) key;
434
434
 
435
435
  void free_table_share()
436
436
  {
437
 
    MEM_ROOT new_mem_root;
 
437
    drizzled::memory::Root new_mem_root;
438
438
    assert(ref_count == 0);
439
439
 
440
440
    /*