← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/optimizer/table_read_plan.h

  • Committer: mordred
  • Date: 2010-04-20 00:04:22 UTC
  • mfrom: (1491 bad-staging)
  • mto: This revision was merged to the branch mainline in revision 1498.
  • Revision ID: mordred@orisndriz09-20100420000422-if6mil1596804mrj
Merged up with build.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/optimizer/table_read_plan.h
78
78
  /* Table read plans are allocated on memory::Root and are never deleted */
79
79
  static void *operator new(size_t size, memory::Root *mem_root)
80
80
  { 
81
 
    return (void*) alloc_root(mem_root, (uint32_t) size); 
 
81
    return (void*) mem_root->alloc_root((uint32_t) size); 
82
82
  }
83
83
 
84
84
  static void operator delete(void *, size_t)