← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/table/instance/base.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/instance/base.h
170
170
private:
171
171
  memory::Root mem_root;
172
172
 
 
173
  void *alloc(size_t arg)
 
174
  {
 
175
    return mem_root.alloc(arg);
 
176
  }
 
177
 
173
178
  void *alloc_root(size_t arg)
174
179
  {
175
 
    return mem_root.alloc_root(arg);
 
180
    return mem_root.alloc(arg);
176
181
  }
177
182
 
178
183
  char *strmake(const char *str_arg, size_t len_arg)