← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/table.h

  • Committer: Olaf van der Spek
  • Date: 2011-06-22 14:19:44 UTC
  • mto: This revision was merged to the branch mainline in revision 2347.
  • Revision ID: olafvdspek@gmail.com-20110622141944-na0vb0uv30n6u55z
Refactor

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/table.h
321
321
  memory::Root *getMemRoot()
322
322
  {
323
323
    if (not mem_root.alloc_root_inited())
324
 
    {
325
324
      init_mem_root();
326
 
    }
327
 
 
328
325
    return &mem_root;
329
326
  }
330
327
 
331
328
  void *alloc_root(size_t arg)
332
329
  {
333
330
    if (not mem_root.alloc_root_inited())
334
 
    {
335
331
      init_mem_root();
336
 
    }
337
 
 
338
 
    return mem_root.alloc_root(arg);
 
332
    return mem_root.alloc(arg);
339
333
  }
340
334
 
341
335
  char *strmake(const char *str_arg, size_t len_arg)
342
336
  {
343
337
    if (not mem_root.alloc_root_inited())
344
 
    {
345
338
      init_mem_root();
346
 
    }
347
 
 
348
339
    return mem_root.strmake(str_arg, len_arg);
349
340
  }
350
341