~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/table.cc

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

Show diffs side-by-side

added added

removed removed

Lines of Context:
208
208
 
209
209
TYPELIB *typelib(memory::Root *mem_root, List<String> &strings)
210
210
{
211
 
  TYPELIB *result= (TYPELIB*) mem_root->alloc(sizeof(TYPELIB));
212
 
  // TYPELIB *result= new (mem_root) TYPELIB;
 
211
  TYPELIB *result= new (*mem_root) TYPELIB;
213
212
  result->count= strings.size();
214
213
  result->name= "";
215
214
  result->type_names= (const char**) mem_root->alloc((sizeof(char*) + sizeof(uint32_t)) * (result->count + 1));