← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/table.h

  • Committer: Mark Atwood
  • Date: 2011-06-22 20:04:22 UTC
  • mfrom: (2318.6.39 rf)
  • Revision ID: me@mark.atwood.name-20110622200422-609npl456o0e5p32
merge lp:~olafvdspek/drizzle/refactor13

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/table.h
315
315
 
316
316
  void init_mem_root()
317
317
  {
318
 
    init_sql_alloc(&mem_root, TABLE_ALLOC_BLOCK_SIZE, 0);
 
318
    mem_root.init(TABLE_ALLOC_BLOCK_SIZE);
319
319
  }
320
320
public:
321
321
  memory::Root *getMemRoot()
338
338
    return mem_root.alloc_root(arg);
339
339
  }
340
340
 
341
 
  char *strmake_root(const char *str_arg, size_t len_arg)
 
341
  char *strmake(const char *str_arg, size_t len_arg)
342
342
  {
343
343
    if (not mem_root.alloc_root_inited())
344
344
    {
345
345
      init_mem_root();
346
346
    }
347
347
 
348
 
    return mem_root.strmake_root(str_arg, len_arg);
 
348
    return mem_root.strmake(str_arg, len_arg);
349
349
  }
350
350
 
351
351
  filesort_info sort;