← 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-08-04 16:21:21 UTC
  • mfrom: (2318.9.14 refactor3)
  • Revision ID: me@mark.atwood.name-20110804162121-6b9ay1b1de3yfgvl
merge lp:~olafvdspek/drizzle/refactor3

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/table.h
331
331
    return mem_root.alloc(arg);
332
332
  }
333
333
 
334
 
  char* strmake(const char* str_arg, size_t len_arg)
 
334
  char* strdup(const char* str_arg, size_t len_arg)
335
335
  {
336
336
    init_mem_root();
337
 
    return mem_root.strmake(str_arg, len_arg);
 
337
    return mem_root.strdup(str_arg, len_arg);
338
338
  }
339
339
 
340
340
  filesort_info sort;