← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/optimizer/table_read_plan.h

Merge Monty

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/optimizer/table_read_plan.h
79
79
  }
80
80
 
81
81
  static void operator delete(void *, size_t)
82
 
  { 
83
 
    TRASH(ptr, size); 
84
 
  }
 
82
  { }
85
83
 
86
84
  static void operator delete(void *, MEM_ROOT *)
87
85
    { /* Never called */ }